Merge branch 'main' into fix/synthetics-script-type-telemetry

elastic · May 11, 2022 · ed27f35 · ed27f35
2 parents 5fa8d3e + edb001d
commit ed27f35
Show file tree

Hide file tree

Showing 552 changed files with 12,908 additions and 6,877 deletions.
diff --git a/.buildkite/package-lock.json b/.buildkite/package-lock.json
diff --git a/.buildkite/package.json b/.buildkite/package.json
@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "kibana-buildkite-library": "git+https://git@github.com/elastic/kibana-buildkite-library#b9f6b423059cac7554a7402277f2ad3ecfe132a4"
+    "kibana-buildkite-library": "git+https://git@github.com/elastic/kibana-buildkite-library#a0037514b7650296a23dbad99b165601d4eab1be"
   }
 }
diff --git a/.buildkite/scripts/steps/package_testing/test.sh b/.buildkite/scripts/steps/package_testing/test.sh
@@ -41,9 +41,9 @@ trap "echoKibanaLogs" EXIT
 
 vagrant provision "$TEST_PACKAGE"
 
-export TEST_BROWSER_HEADLESS=1
-export TEST_KIBANA_URL="http://elastic:changeme@$KIBANA_IP_ADDRESS:5601"
-export TEST_ES_URL=http://elastic:changeme@192.168.56.1:9200
+# export TEST_BROWSER_HEADLESS=1
+# export TEST_KIBANA_URL="http://elastic:changeme@$KIBANA_IP_ADDRESS:5601"
+# export TEST_ES_URL=http://elastic:changeme@192.168.56.1:9200
 
-cd x-pack
-node scripts/functional_test_runner.js --include-tag=smoke
+# cd x-pack
+# node scripts/functional_test_runner.js --include-tag=smoke
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -83,6 +83,7 @@
 /x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/runtime_fields @elastic/kibana-app-services
 /x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
+/src/plugins/dashboard/public/application/embeddable/viewport/print_media @elastic/kibana-app-services
 
 ### Observability Plugins
 

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -222,7 +222,7 @@ It also provides a stateful version of it on the start contract.
 
 |{kib-repo}blob/{branch}/src/plugins/newsfeed/README.md[newsfeed]
 |The newsfeed plugin adds a NewsfeedNavButton to the top navigation bar and renders the content in the flyout.
-Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
+Content is fetched from the remote (https://feeds.elastic.co) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
 
 
 |{kib-repo}blob/{branch}/src/plugins/presentation_util/README.mdx[presentationUtil]

diff --git a/docs/maps/asset-tracking-tutorial.asciidoc b/docs/maps/asset-tracking-tutorial.asciidoc
@@ -112,7 +112,7 @@ filter {
       "type" => "%{[resultSet][vehicle][type]}"
       "vehicle_id" => "%{[resultSet][vehicle][vehicleID]}"
     }
-    remove_field => [ "resultSet", "@version", "@timestamp" ]
+    remove_field => [ "resultSet", "@version", "@timestamp", "[event][original]" ]
   }
 
   mutate {

diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -38,71 +38,69 @@ If you'd like to change any of the default values,
 copy and paste the relevant settings into your `kibana.yml` configuration file.
 Changing these settings may disable features of the APM App.
 
-[cols="2*<"]
-|===
-| `xpack.apm.maxServiceEnvironments` {ess-icon}
-  | Maximum number of unique service environments recognized by the UI. Defaults to `100`.
+`xpack.apm.maxServiceEnvironments` {ess-icon}::
+Maximum number of unique service environments recognized by the UI. Defaults to `100`.
 
-| `xpack.apm.serviceMapFingerprintBucketSize` {ess-icon}
-  | Maximum number of unique transaction combinations sampled for generating service map focused on a specific service. Defaults to `100`.
+`xpack.apm.serviceMapFingerprintBucketSize` {ess-icon}::
+Maximum number of unique transaction combinations sampled for generating service map focused on a specific service. Defaults to `100`.
 
-| `xpack.apm.serviceMapFingerprintGlobalBucketSize` {ess-icon}
-  | Maximum number of unique transaction combinations sampled for generating the global service map. Defaults to `100`.
+`xpack.apm.serviceMapFingerprintGlobalBucketSize` {ess-icon}::
+Maximum number of unique transaction combinations sampled for generating the global service map. Defaults to `100`.
 
-| `xpack.apm.serviceMapEnabled` {ess-icon}
-  | Set to `false` to disable service maps. Defaults to `true`.
+`xpack.apm.serviceMapEnabled` {ess-icon}::
+Set to `false` to disable service maps. Defaults to `true`.
 
-| `xpack.apm.serviceMapTraceIdBucketSize` {ess-icon}
-  | Maximum number of trace IDs sampled for generating service map focused on a specific service. Defaults to `65`.
+`xpack.apm.serviceMapTraceIdBucketSize` {ess-icon}::
+Maximum number of trace IDs sampled for generating service map focused on a specific service. Defaults to `65`.
 
-| `xpack.apm.serviceMapTraceIdGlobalBucketSize` {ess-icon}
-  | Maximum number of trace IDs sampled for generating the global service map. Defaults to `6`.
+`xpack.apm.serviceMapTraceIdGlobalBucketSize` {ess-icon}::
+Maximum number of trace IDs sampled for generating the global service map. Defaults to `6`.
 
-| `xpack.apm.serviceMapMaxTracesPerRequest` {ess-icon}
-  | Maximum number of traces per request for generating the global service map. Defaults to `50`.
+`xpack.apm.serviceMapMaxTracesPerRequest` {ess-icon}::
+Maximum number of traces per request for generating the global service map. Defaults to `50`.
 
-| `xpack.apm.ui.enabled` {ess-icon}
-  | Set to `false` to hide the APM app from the main menu. Defaults to `true`.
+`xpack.apm.ui.enabled` {ess-icon}::
+Set to `false` to hide the APM app from the main menu. Defaults to `true`.
 
-| `xpack.apm.ui.transactionGroupBucketSize` {ess-icon}
-  | Number of top transaction groups displayed in the APM app. Defaults to `1000`.
+`xpack.apm.ui.transactionGroupBucketSize` {ess-icon}::
+Number of top transaction groups displayed in the APM app. Defaults to `1000`.
 
-| `xpack.apm.ui.maxTraceItems` {ess-icon}
-  | Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
+`xpack.apm.ui.maxTraceItems` {ess-icon}::
+Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
 
-| `xpack.observability.annotations.index` {ess-icon}
-  | Index name where Observability annotations are stored. Defaults to `observability-annotations`.
+`xpack.observability.annotations.index` {ess-icon}::
+Index name where Observability annotations are stored. Defaults to `observability-annotations`.
 
-| `xpack.apm.searchAggregatedTransactions` {ess-icon}
-  | Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used.
-    See {apm-guide-ref}/transaction-metrics.html[Configure transaction metrics] for more information.
+`xpack.apm.searchAggregatedTransactions` {ess-icon}::
+Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used. 
++
+See {apm-guide-ref}/transaction-metrics.html[Configure transaction metrics] for more information.
 
-| `xpack.apm.metricsInterval` {ess-icon}
-  | Sets a `fixed_interval` for date histograms in metrics aggregations. Defaults to `30`.
+`xpack.apm.metricsInterval` {ess-icon}::
+Sets a `fixed_interval` for date histograms in metrics aggregations. Defaults to `30`.
 
-| `xpack.apm.agent.migrations.enabled` {ess-icon}
-  | Set to `false` to disable cloud APM migrations. Defaults to `true`.
+`xpack.apm.agent.migrations.enabled` {ess-icon}::
+Set to `false` to disable cloud APM migrations. Defaults to `true`.
 
-| `xpack.apm.indices.error` {ess-icon}
-  | Matcher for all error indices. Defaults to `logs-apm*,apm-*`.
+`xpack.apm.indices.error` {ess-icon}::
+Matcher for all error indices. Defaults to `logs-apm*,apm-*`.
 
-| `xpack.apm.indices.onboarding` {ess-icon}
-  | Matcher for all onboarding indices. Defaults to `apm-*`.
+`xpack.apm.indices.onboarding` {ess-icon}::
+Matcher for all onboarding indices. Defaults to `apm-*`.
 
-| `xpack.apm.indices.span` {ess-icon}
-  | Matcher for all span indices. Defaults to `traces-apm*,apm-*`.
+`xpack.apm.indices.span` {ess-icon}::
+Matcher for all span indices. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.indices.transaction` {ess-icon}
-  | Matcher for all transaction indices. Defaults to `traces-apm*,apm-*`.
+`xpack.apm.indices.transaction` {ess-icon}::
+Matcher for all transaction indices. Defaults to `traces-apm*,apm-*`.
 
-| `xpack.apm.indices.metric` {ess-icon}
-  | Matcher for all metrics indices. Defaults to `metrics-apm*,apm-*`.
+`xpack.apm.indices.metric` {ess-icon}::
+Matcher for all metrics indices. Defaults to `metrics-apm*,apm-*`.
 
-| `xpack.apm.indices.sourcemap` {ess-icon}
-  | Matcher for all source map indices. Defaults to `apm-*`.
+`xpack.apm.indices.sourcemap` {ess-icon}::
+Matcher for all source map indices. Defaults to `apm-*`.
 
-| `xpack.apm.autoCreateApmDataView` {ess-icon}
-  | Set to `false` to disable the automatic creation of the APM data view when the APM app is opened. Defaults to `true`.
-|===
+`xpack.apm.autoCreateApmDataView` {ess-icon}::
+Set to `false` to disable the automatic creation of the APM data view when the APM app is opened. Defaults to `true`.
 
 // end::general-apm-settings[]