Merge branch 'main' into serverless-chrome/grouping-and-spacing

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -13,7 +13,8 @@ else
   KIBANA_IMAGE_TAG="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT"
 fi
 
-KIBANA_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless:$KIBANA_IMAGE_TAG"
+KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless"
+KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
 echo "--- Verify manifest does not already exist"
 echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
@@ -51,14 +52,21 @@ echo "--- Push images"
 docker image push "$KIBANA_IMAGE-arm64"
 docker image push "$KIBANA_IMAGE-amd64"
 
-echo "--- Create manifest"
+echo "--- Create and push manifests"
 docker manifest create \
   "$KIBANA_IMAGE" \
   --amend "$KIBANA_IMAGE-arm64" \
   --amend "$KIBANA_IMAGE-amd64"
-
-echo "--- Push manifest"
 docker manifest push "$KIBANA_IMAGE"
+
+if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+  docker manifest create \
+    "$KIBANA_BASE_IMAGE:latest" \
+    --amend "$KIBANA_IMAGE-arm64" \
+    --amend "$KIBANA_IMAGE-amd64"
+  docker manifest push "$KIBANA_BASE_IMAGE:latest"
+fi
+
 docker logout docker.elastic.co
 
 cat << EOF | buildkite-agent annotate --style "info" --context image

.eslintrc.js

@@ -910,35 +910,35 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/aiops/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/infra/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_ai_assistant/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_onboarding/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_shared/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/synthetics/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/ux/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/aiops/**/*.tsx',
+        'x-pack/plugins/apm/**/*.tsx',
+        'x-pack/plugins/exploratory_view/**/*.tsx',
+        'x-pack/plugins/infra/**/*.tsx',
+        'x-pack/plugins/observability/**/*.tsx',
+        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_shared/**/*.tsx',
+        'x-pack/plugins/profiling/**/*.tsx',
+        'x-pack/plugins/synthetics/**/*.tsx',
+        'x-pack/plugins/ux/**/*.tsx',
       ],
       rules: {
         '@kbn/telemetry/event_generating_elements_should_be_instrumented': 'error',
       },
     },
     {
       files: [
-        'x-pack/plugins/aiops/**/*.{tsx}',
-        'x-pack/plugins/apm/**/*.{tsx}',
-        'x-pack/plugins/exploratory_view/**/*.{tsx}',
-        'x-pack/plugins/infra/**/*.{tsx}',
-        'x-pack/plugins/observability/**/*.{tsx}',
-        'x-pack/plugins/observability_ai_assistant/**/*.{tsx}',
-        'x-pack/plugins/observability_onboarding/**/*.{tsx}',
-        'x-pack/plugins/observability_shared/**/*.{tsx}',
-        'x-pack/plugins/profiling/**/*.{tsx}',
-        'x-pack/plugins/synthetics/**/*.{tsx}',
-        'x-pack/plugins/ux/**/*.{tsx}',
+        'x-pack/plugins/aiops/**/*.tsx',
+        'x-pack/plugins/apm/**/*.tsx',
+        'x-pack/plugins/exploratory_view/**/*.tsx',
+        'x-pack/plugins/infra/**/*.tsx',
+        'x-pack/plugins/observability/**/*.tsx',
+        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_shared/**/*.tsx',
+        'x-pack/plugins/profiling/**/*.tsx',
+        'x-pack/plugins/synthetics/**/*.tsx',
+        'x-pack/plugins/ux/**/*.tsx',
       ],
       rules: {
         '@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',

docs/apm/infrastructure.asciidoc

@@ -2,6 +2,8 @@
 [[infrastructure]]
 === Infrastructure
 
+beta::[]
+
 The *Infrastructure* tab provides information about the containers, pods, and hosts,
 that the selected service is linked to.
 

docs/apm/spans.asciidoc

@@ -43,8 +43,9 @@ For example, quickly view:
 [[distributed-tracing]]
 ==== Distributed tracing
 
-If your trace sample timeline is colorful, it's indicative of a distributed trace.
-Services in a distributed trace are separated by color and listed in the order they occur.
+When a trace travels through multiple services it is known as a _distributed trace_.
+In APM, the colors in a distributed trace represent different services and
+are listed in the order they occur.
 
 [role="screenshot"]
 image::apm/images/apm-services-trace.png[Example of distributed trace colors in the APM app in Kibana]

docs/apm/traces.asciidoc

@@ -17,6 +17,10 @@ it's the collective amount of pain a specific endpoint is causing your users.
 If there's a particular endpoint you're worried about, select it to view its
 <<transaction-details,transaction details>>.
 
+You can also use queries to filter and search the transactions shown on this page.
+Note that only properties available on root transactions are searchable.
+For example, you can't search for `label.tier: 'high'`, as that field is only available on non-root transactions.
+
 [role="screenshot"]
 image::apm/images/apm-traces.png[Example view of the Traces overview in APM app in Kibana]
 

packages/kbn-es/src/utils/wait_until_cluster_ready.ts

@@ -9,7 +9,7 @@
 import { Client } from '@elastic/elasticsearch';
 import { HealthStatus } from '@elastic/elasticsearch/lib/api/types';
 import { ToolingLog } from '@kbn/tooling-log';
-const DEFAULT_READY_TIMEOUT = 60 * 1000; // 1 minute
+const DEFAULT_READY_TIMEOUT = 120 * 1000; // 2 minutes
 
 export type ClusterReadyStatus = 'green' | 'yellow';
 export interface WaitOptions {

src/plugins/data_view_management/public/components/field_editor/field_editor.test.tsx

@@ -119,6 +119,10 @@ describe('FieldEditor', () => {
       fields,
       getFormatterForField: () => ({ params: () => ({}) }),
       getFormatterForFieldNoDefault: () => ({ params: () => ({}) }),
+      upsertScriptedField: () => undefined,
+      setFieldCustomLabel: (name: string, label: string) => {
+        indexPattern.fields.getByName(name)!.customLabel = label;
+      },
     } as unknown as DataView;
   });
 

src/plugins/data_view_management/public/components/field_editor/field_editor.tsx

@@ -822,16 +822,9 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
     }
 
     const { redirectAway, indexPatternService } = this.props.services;
-    const fieldExists = !!indexPattern.fields.getByName(field.name);
 
     let oldField: DataViewField['spec'];
-
-    if (fieldExists) {
-      oldField = indexPattern.fields.getByName(field.name)!.spec;
-      indexPattern.fields.update(field);
-    } else {
-      indexPattern.fields.add(field);
-    }
+    indexPattern.upsertScriptedField(field);
 
     if (fieldFormatId) {
       indexPattern.setFieldFormat(field.name, { id: fieldFormatId, params: fieldFormatParams });
@@ -841,7 +834,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
 
     if (field.customLabel !== customLabel) {
       field.customLabel = customLabel;
-      indexPattern.fields.update(field);
+      indexPattern.setFieldCustomLabel(field.name, customLabel);
     }
 
     return indexPatternService