Skip to content

Commit

Permalink
Merge branch 'main' into fix/add-field-popover-field-width
Browse files Browse the repository at this point in the history
  • Loading branch information
logeekal authored Sep 20, 2022
2 parents 30e2b81 + 36a9aa5 commit fbb3097
Show file tree
Hide file tree
Showing 5,584 changed files with 212,665 additions and 87,790 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 6 additions & 4 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,9 @@ disabled:
- x-pack/plugins/observability/e2e/synthetics_run.ts

# Configs that exist but weren't running in CI when this file was introduced
- test/visual_regression/config.ts
- x-pack/test/visual_regression/config.ts
- x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
- x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
- x-pack/test/alerting_api_integration/spaces_only_legacy/config.ts
- x-pack/test/banners_functional/config.ts
- x-pack/test/cloud_integration/config.ts
- x-pack/test/performance/config.playwright.ts
- x-pack/test/load/config.ts
Expand Down Expand Up @@ -129,6 +126,7 @@ enabled:
- x-pack/test/apm_api_integration/basic/config.ts
- x-pack/test/apm_api_integration/rules/config.ts
- x-pack/test/apm_api_integration/trial/config.ts
- x-pack/test/banners_functional/config.ts
- x-pack/test/cases_api_integration/security_and_spaces/config_basic.ts
- x-pack/test/cases_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/cases_api_integration/spaces_only/config.ts
Expand All @@ -142,6 +140,7 @@ enabled:
- x-pack/test/detection_engine_api_integration/security_and_spaces/group7/config.ts
- x-pack/test/detection_engine_api_integration/security_and_spaces/group8/config.ts
- x-pack/test/detection_engine_api_integration/security_and_spaces/group9/config.ts
- x-pack/test/detection_engine_api_integration/security_and_spaces/group10/config.ts
- x-pack/test/encrypted_saved_objects_api_integration/config.ts
- x-pack/test/endpoint_api_integration_no_ingest/config.ts
- x-pack/test/examples/config.ts
Expand Down Expand Up @@ -183,7 +182,9 @@ enabled:
- x-pack/test/functional/apps/maps/group2/config.ts
- x-pack/test/functional/apps/maps/group3/config.ts
- x-pack/test/functional/apps/maps/group4/config.ts
- x-pack/test/functional/apps/ml/anomaly_detection/config.ts
- x-pack/test/functional/apps/ml/anomaly_detection_jobs/config.ts
- x-pack/test/functional/apps/ml/anomaly_detection_integrations/config.ts
- x-pack/test/functional/apps/ml/anomaly_detection_result_views/config.ts
- x-pack/test/functional/apps/ml/data_frame_analytics/config.ts
- x-pack/test/functional/apps/ml/data_visualizer/config.ts
- x-pack/test/functional/apps/ml/permissions/config.ts
Expand Down Expand Up @@ -272,3 +273,4 @@ enabled:
- x-pack/test/performance/journeys/many_fields_discover/config.ts
- x-pack/test/performance/journeys/promotion_tracking_dashboard/config.ts
- x-pack/test/performance/journeys/web_logs_dashboard/config.ts
- x-pack/test/performance/journeys/data_stress_test_lens/config.ts
41 changes: 15 additions & 26 deletions .buildkite/scripts/steps/cloud/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"instance_configuration_id": "gcp.integrationsserver.1",
"zone_count": 1,
"size": {
"value": 512,
"resource": "memory"
"resource": "memory",
"value": 1024
}
}
],
Expand All @@ -32,7 +32,7 @@
"autoscaling_enabled": false,
"cluster_topology": [
{
"zone_count": 2,
"zone_count": 1,
"instance_configuration_id": "gcp.coordinating.1",
"node_roles": [
"ingest",
Expand All @@ -42,18 +42,14 @@
"size": {
"resource": "memory",
"value": 0
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
},
{
"zone_count": 1,
"elasticsearch": {
"node_attributes": {
"data": "hot"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highio.1",
"node_roles": [
Expand All @@ -66,17 +62,16 @@
],
"id": "hot_content",
"size": {
"value": 1024,
"value": 2048,
"resource": "memory"
}
},
{
"zone_count": 2,
"zone_count": 1,
"elasticsearch": {
"node_attributes": {
"data": "warm"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": [
Expand All @@ -94,8 +89,7 @@
"elasticsearch": {
"node_attributes": {
"data": "cold"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"node_roles": [
Expand All @@ -113,8 +107,7 @@
"elasticsearch": {
"node_attributes": {
"data": "frozen"
},
"enabled_built_in_plugins": []
}
},
"instance_configuration_id": "gcp.es.datafrozen.n1.64x10x95",
"node_roles": [
Expand All @@ -127,7 +120,7 @@
}
},
{
"zone_count": 3,
"zone_count": 1,
"instance_configuration_id": "gcp.master.1",
"node_roles": [
"master",
Expand All @@ -137,9 +130,6 @@
"size": {
"resource": "memory",
"value": 0
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
},
{
Expand All @@ -153,14 +143,12 @@
"size": {
"value": 1024,
"resource": "memory"
},
"elasticsearch": {
"enabled_built_in_plugins": []
}
}
],
"elasticsearch": {
"version": null
"version": null,
"enabled_built_in_plugins": []
},
"deployment_template": {
"id": "gcp-io-optimized-v2"
Expand Down Expand Up @@ -206,8 +194,8 @@
"instance_configuration_id": "gcp.kibana.1",
"zone_count": 1,
"size": {
"resource": "memory",
"value": 2048
"value": 2048,
"resource": "memory"
}
}
],
Expand All @@ -220,6 +208,7 @@
}
]
},
"settings": {},
"name": null,
"metadata": {
"system_owned": false
Expand Down
7 changes: 4 additions & 3 deletions .buildkite/scripts/steps/cloud/purge_deployments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const prDeployments = deployments.filter((deployment: any) =>
const deploymentsToPurge = [];

const NOW = new Date().getTime() / 1000;
const DAY_IN_SECONDS = 60 * 60 * 24;

for (const deployment of prDeployments) {
try {
Expand All @@ -37,12 +38,12 @@ for (const deployment of prDeployments) {
)
) {
console.log(
`Pull Request #${prNumber} no longer has the a cloud deployment label, will delete associated deployment`
`Pull Request #${prNumber} no longer has a cloud deployment label, will delete associated deployment`
);
deploymentsToPurge.push(deployment);
} else if (lastCommitTimestamp < NOW - 60 * 60 * 24 * 7) {
} else if (lastCommitTimestamp < NOW - DAY_IN_SECONDS * 2) {
console.log(
`Pull Request #${prNumber} has not been updated in more than 7 days, will delete associated deployment`
`Pull Request #${prNumber} has not been updated in more than 2 days, will delete associated deployment`
);
deploymentsToPurge.push(deployment);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ curl --retry 120 \
--retry-all-errors \
-I -XGET "${TEST_ES_URL}/_cluster/health?wait_for_nodes=>=1&wait_for_status=yellow"

journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover")
journeys=("login" "ecommerce_dashboard" "flight_dashboard" "web_logs_dashboard" "promotion_tracking_dashboard" "many_fields_discover" "data_stress_test_lens")

for i in "${journeys[@]}"; do
echo "JOURNEY[${i}] is running"
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/scripts/steps/scalability/benchmarking.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ checkout_and_compile_load_runner() {

upload_test_results() {
cd "${KIBANA_DIR}"
echo "--- Archive Gatling reports and upload as build artifacts"
echo "Upload server logs as build artifacts"
tar -czf server-logs.tar.gz data/ftr_servers_logs/**/*
buildkite-agent artifact upload server-logs.tar.gz
echo "--- Upload Gatling reports as build artifacts"
tar -czf "scalability_test_report.tar.gz" --exclude=simulation.log -C kibana-load-testing/target gatling
buildkite-agent artifact upload "scalability_test_report.tar.gz"
cd "${LATEST_RUN_ARTIFACTS_DIR}"
Expand Down Expand Up @@ -115,6 +118,7 @@ for journey in scalability_traces/server/*; do
node scripts/functional_tests \
--config x-pack/test/performance/scalability/config.ts \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
--logToFile \
--debug
done

Expand Down
12 changes: 9 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ module.exports = {
'test/*/config_open.ts',
'test/*/*.config.ts',
'test/*/{tests,test_suites,apis,apps}/**/*',
'test/visual_regression/tests/**/*',
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
'x-pack/test/*/*config.*ts',
'x-pack/test/saved_object_api_integration/*/apis/**/*',
Expand Down Expand Up @@ -898,7 +897,14 @@ module.exports = {
],
},
},

// Profiling
{
files: ['x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}'],
rules: {
'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^(useAsync)$' }],
},
},
{
// disable imports from legacy uptime plugin
files: ['x-pack/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}'],
Expand Down Expand Up @@ -1307,7 +1313,7 @@ module.exports = {
{
// typescript for front and back end
files: [
'x-pack/plugins/{alerting,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}',
'x-pack/plugins/{alerting,stack_alerts,stack_connectors,actions,task_manager,event_log}/**/*.{ts,tsx}',
],
rules: {
'@typescript-eslint/no-explicit-any': 'error',
Expand Down
Loading

0 comments on commit fbb3097

Please sign in to comment.