Merge branch 'main' into serverless-role-selector

.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml

@@ -46,13 +46,3 @@ steps:
           USE_GROUP_LABEL: true
         agents:
           image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"
-
-  - group: "Observability"
-    steps:
-      - label: ":judge::seedling: Trigger Manual Tests Phase - Observability"
-        command: "make -C /agent trigger-manual-verification-phase"
-        env:
-          NOTIFICATION_APPENDIX: "<!subteam^S896GM05A> please execute your manual testing plan."
-          USE_GROUP_LABEL: true
-        agents:
-          image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"

.buildkite/pull_requests.json

@@ -55,14 +55,14 @@
       "repoName": "kibana",
       "pipelineSlug": "kibana-kme-test",
 
-      "enabled": false,
+      "enabled": true,
       "allow_org_users": true,
       "allowed_repo_permissions": ["admin", "write"],
       "allowed_list": ["barlowm", "renovate[bot]"],
       "set_commit_status": true,
-      "commit_status_context": "kibana-ci",
+      "commit_status_context": "kibana-ci-test",
       "build_on_commit": true,
-      "build_on_comment": true,
+      "build_on_comment": false,
       "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
       "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
       "skip_ci_labels": [],

.github/CODEOWNERS

@@ -302,6 +302,7 @@ x-pack/plugins/cross_cluster_replication @elastic/platform-deployment-management
 packages/kbn-crypto @elastic/kibana-security
 packages/kbn-crypto-browser @elastic/kibana-core
 x-pack/plugins/custom_branding @elastic/appex-sharedux
+packages/kbn-custom-icons @elastic/obs-ux-logs-team
 packages/kbn-custom-integrations @elastic/obs-ux-logs-team
 src/plugins/custom_integrations @elastic/fleet
 packages/kbn-cypress-config @elastic/kibana-operations
@@ -345,6 +346,7 @@ packages/kbn-ebt-tools @elastic/kibana-core
 packages/kbn-ecs @elastic/kibana-core @elastic/security-threat-hunting-investigations
 x-pack/packages/security-solution/ecs_data_quality_dashboard @elastic/security-threat-hunting-investigations
 x-pack/plugins/ecs_data_quality_dashboard @elastic/security-threat-hunting-investigations
+packages/kbn-elastic-agent-utils @elastic/obs-ux-logs-team
 x-pack/packages/kbn-elastic-assistant @elastic/security-solution
 x-pack/plugins/elastic_assistant @elastic/security-solution
 test/plugin_functional/plugins/elasticsearch_client_plugin @elastic/kibana-core

catalog-info.yaml

@@ -54,6 +54,8 @@ spec:
       provider_settings:
         trigger_mode: none
       teams:
+        kibana-release-operators:
+          access_level: MANAGE_BUILD_AND_READ
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ
         appex-qa:

package.json

@@ -353,6 +353,7 @@
     "@kbn/crypto": "link:packages/kbn-crypto",
     "@kbn/crypto-browser": "link:packages/kbn-crypto-browser",
     "@kbn/custom-branding-plugin": "link:x-pack/plugins/custom_branding",
+    "@kbn/custom-icons": "link:packages/kbn-custom-icons",
     "@kbn/custom-integrations": "link:packages/kbn-custom-integrations",
     "@kbn/custom-integrations-plugin": "link:src/plugins/custom_integrations",
     "@kbn/dashboard-enhanced-plugin": "link:x-pack/plugins/dashboard_enhanced",
@@ -390,6 +391,7 @@
     "@kbn/ecs": "link:packages/kbn-ecs",
     "@kbn/ecs-data-quality-dashboard": "link:x-pack/packages/security-solution/ecs_data_quality_dashboard",
     "@kbn/ecs-data-quality-dashboard-plugin": "link:x-pack/plugins/ecs_data_quality_dashboard",
+    "@kbn/elastic-agent-utils": "link:packages/kbn-elastic-agent-utils",
     "@kbn/elastic-assistant": "link:x-pack/packages/kbn-elastic-assistant",
     "@kbn/elastic-assistant-plugin": "link:x-pack/plugins/elastic_assistant",
     "@kbn/elasticsearch-client-plugin": "link:test/plugin_functional/plugins/elasticsearch_client_plugin",
@@ -922,7 +924,7 @@
     "getos": "^3.1.0",
     "globby": "^11.1.0",
     "gpt-tokenizer": "^2.1.2",
-    "handlebars": "4.7.7",
+    "handlebars": "4.7.8",
     "he": "^1.2.0",
     "history": "^4.9.0",
     "hjson": "3.2.1",

packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts

@@ -22,6 +22,7 @@ export type LogDocument = Fields &
     'log.level'?: string;
     'host.name'?: string;
     'trace.id'?: string;
+    'agent.id'?: string;
     'agent.name'?: string;
     'orchestrator.cluster.name'?: string;
     'orchestrator.cluster.id'?: string;

packages/kbn-apm-synthtrace/src/scenarios/trace_with_orphan_items.ts

@@ -0,0 +1,153 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { apm, ApmFields, httpExitSpan, Serializable } from '@kbn/apm-synthtrace-client';
+import { Readable } from 'stream';
+import { Scenario } from '../cli/scenario';
+
+import { RunOptions } from '../cli/utils/parse_run_cli_flags';
+import { getSynthtraceEnvironment } from '../lib/utils/get_synthtrace_environment';
+import { withClient } from '../lib/utils/with_client';
+
+const ENVIRONMENT = getSynthtraceEnvironment(__filename);
+
+const scenario: Scenario<ApmFields> = async (runOptions: RunOptions) => {
+  return {
+    generate: ({ range, clients: { apmEsClient } }) => {
+      const transactionName = 'trace with orphans';
+      const successfulTimestamps = range.interval('1s').rate(3);
+
+      const synthRum = apm
+        .service({ name: 'synth-rum', environment: ENVIRONMENT, agentName: 'rum-js' })
+        .instance('my-instance');
+      const synthNode = apm
+        .service({ name: 'synth-node', environment: ENVIRONMENT, agentName: 'nodejs' })
+        .instance('my-instance');
+      const synthGo = apm
+        .service({ name: 'synth-go', environment: ENVIRONMENT, agentName: 'go' })
+        .instance('my-instance');
+
+      const traces = successfulTimestamps.generator((timestamp) => {
+        // synth-rum
+        return synthGo
+          .transaction({ transactionName })
+          .duration(400)
+          .timestamp(timestamp)
+          .children(
+            // synth-rum -> synth-node
+            synthRum
+              .span(
+                httpExitSpan({
+                  spanName: 'GET /api/products/top',
+                  destinationUrl: 'http://synth-node:3000',
+                })
+              )
+              .duration(300)
+              .timestamp(timestamp)
+              .children(
+                synthRum
+                  .transaction({ transactionName: 'Child Transaction' })
+                  .timestamp(timestamp)
+                  .duration(200)
+                  .children(
+                    synthGo
+                      .span({ spanName: 'custom_operation', spanType: 'custom' })
+                      .timestamp(timestamp)
+                      .duration(100)
+                      .success()
+                  ),
+                // synth-node
+                synthNode
+                  .transaction({ transactionName: 'Initial transaction in synth-node' })
+                  .duration(300)
+                  .timestamp(timestamp)
+                  .children(
+                    synthNode
+                      // synth-node -> synth-go
+                      .span(
+                        httpExitSpan({
+                          spanName: 'GET synth-go:3000',
+                          destinationUrl: 'http://synth-go:3000',
+                        })
+                      )
+                      .timestamp(timestamp)
+                      .duration(400)
+
+                      .children(
+                        // synth-go
+                        synthGo
+                          .transaction({ transactionName: 'Child Transaction' })
+                          .timestamp(timestamp)
+                          .duration(200)
+                          .children(
+                            synthGo
+                              .span({ spanName: 'custom_operation', spanType: 'custom' })
+                              .timestamp(timestamp)
+                              .duration(100)
+                              .success(),
+                            synthGo
+                              .span({ spanName: 'custom_new_operation', spanType: 'custom' })
+                              .timestamp(timestamp)
+                              .duration(100)
+                              .success()
+                          )
+                      )
+                  )
+              )
+          );
+      });
+
+      const successfulTraceEvents = Array.from(
+        successfulTimestamps.generator((timestamp) =>
+          synthNode
+            .transaction({ transactionName: 'successful trace' })
+            .timestamp(timestamp)
+            .duration(1000)
+            .success()
+            .children(
+              synthNode
+                .span({
+                  spanName: 'GET apm-*/_search',
+                  spanType: 'db',
+                  spanSubtype: 'elasticsearch',
+                })
+                .duration(1000)
+                .success()
+                .destination('elasticsearch')
+                .timestamp(timestamp),
+              synthNode
+                .span({ spanName: 'custom_operation', spanType: 'custom' })
+                .duration(100)
+                .success()
+                .timestamp(timestamp)
+            )
+        )
+      );
+
+      const unserialized = Array.from(traces);
+
+      const serialized = unserialized
+        .flatMap((event) => event.serialize())
+        .filter((trace) => trace['transaction.name'] !== 'Child Transaction');
+
+      const unserializedChanged = serialized.map((event) => ({
+        fields: event,
+        serialize: () => {
+          return [event];
+        },
+      })) as Array<Serializable<ApmFields>>;
+
+      return withClient(
+        apmEsClient,
+        Readable.from([...unserializedChanged, ...successfulTraceEvents])
+      );
+    },
+  };
+};
+
+export default scenario;

packages/kbn-cell-actions/constants.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './src/constants';

packages/kbn-cell-actions/src/index.ts

@@ -20,7 +20,7 @@ export type {
 export type { UseDataGridColumnsCellActions, UseDataGridColumnsCellActionsProps } from './hooks';
 
 // Constants
-export { CellActionsMode, FILTER_CELL_ACTION_TYPE, COPY_CELL_ACTION_TYPE } from './constants';
+export { CellActionsMode } from './constants';
 
 // Components and hooks
 export { CellActionsProvider } from './context';

packages/kbn-custom-icons/.storybook/main.js

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = require('@kbn/storybook').defaultConfig;

packages/kbn-custom-icons/README.md

@@ -0,0 +1,29 @@
+# @kbn/custom-icons
+
+A utility package, `@kbn/custom-icons`, that provides components for rendering icons related to Elastic Agents, Cloud Providers and more.
+
+## Components
+
+### `<AgentIcon />`
+
+```jsx
+<AgentIcon agentName={agentName} />
+```
+
+This component renders an icon corresponding to the specified Elastic Agent name (`agentName`).
+
+#### Props
+
+- **`agentName`**: The name of the Elastic Agent for which the icon should be rendered.
+
+### `<CloudProviderIcon />`
+
+```jsx
+<CloudProviderIcon cloudProvider={cloudProvider} />
+```
+
+This component renders an icon associated with the specified Cloud Provider (`cloudProvider`).
+
+#### Props
+
+- **`cloudProvider`**: The name of the Cloud Provider for which the icon should be rendered.

packages/kbn-custom-icons/index.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+export { getAgentIcon } from './src/components/agent_icon/get_agent_icon';
+export { getServerlessIcon } from './src/components/agent_icon/get_serverless_icon';
+export { AgentIcon } from './src/components/agent_icon';
+export type { AgentIconProps } from './src/components/agent_icon';
+
+export { getCloudProviderIcon } from './src/components/cloud_provider_icon/get_cloud_provider_icon';
+export type { CloudProvider } from './src/components/cloud_provider_icon/get_cloud_provider_icon';
+export { CloudProviderIcon } from './src/components/cloud_provider_icon';
+export type { CloudProviderIconProps } from './src/components/cloud_provider_icon';

packages/kbn-custom-icons/jest.config.js

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-custom-icons'],
+};

packages/kbn-custom-icons/kibana.jsonc

@@ -0,0 +1,5 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/custom-icons",
+  "owner": "@elastic/obs-ux-logs-team"
+}

packages/kbn-custom-icons/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/custom-icons",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "sideEffects": false
+}