Merge branch 'main' into 193320-advance-setting-to-show-logs-ui

docs/search/search-connection-details.asciidoc

@@ -5,3 +5,72 @@
 <titleabbrev>Connection details</titleabbrev>
 ++++
 
+To connect to your {es} deployment, you need either a Cloud ID or an {es} endpoint, depending on the
+deployment type you use. For secure connections, it’s recommended to use an API key for authentication.
+
+* Learn how to <<find-cloud-id-cloud-self-managed, find your Cloud ID>> for Elastic Cloud or self-hosted deployments.
+* Learn how to <<create-an-api-key-cloud-self-managed, create an API key>> for Elastic Cloud or self-hosted deployments.  
+* Learn how to <<find-cloud-id-serverless, find your {es} endpoint or Cloud ID>> for a serverless deployment.  
+* Learn how to <<create-an-api-key-serverless, create an API key>> for a serverless deployment.
+
+[float]
+=== Elastic Cloud and self-hosted deployments
+
+[float]
+[[find-cloud-id-cloud-self-managed]]
+==== Find your Cloud ID
+
+. Navigate to the Elastic Cloud home page.
+. In the main menu, click *Manage this deployment*.
++
+[.screenshot]
+image::manage-deployment.png[width=750]
+. The Cloud ID is displayed on the right side of the page.
++
+[.screenshot]
+image::cloud-id.png[width=750]
+
+[float]
+[[create-an-api-key-cloud-self-managed]]
+==== Create an API key
+
+. To navigate to *API keys*, use the <<kibana-navigation-search,*global search bar*>>.
++
+[.screenshot]
+image::api-keys-search-bar.png[width=750]
+. Click *Create API key*.
++
+[.screenshot]
+image::click-create-api-key.png[width=750]
+. Enter the API key details, and click *Create API key*.
+. Copy and securely store the API key, as it will not be shown again.
+
+[float]
+=== Serverless deployments
+
+[float]
+[[find-cloud-id-serverless]]
+==== Find your Elasticsearch endpoint
+
+. Navigate to the serverless project's home page.
+. Scroll down to the *Copy your connection details* section, and copy the *Elasticsearch endpoint*.
++
+[.screenshot]
+image::serverless-connection-details.png[width=750]
+
+[NOTE]
+====
+The *Cloud ID* is also displayed in the Copy your connection details section, which you can use with specific client libraries and connectors.
+====
+
+[float]
+[[create-an-api-key-serverless]]
+==== Create an API key
+
+. Navigate to the serverless project's home page.
+. Scroll down to the *Add an API Key* section, and click *New*.
++
+[.screenshot]
+image::serverless-create-an-api-key.png[width=750]
+. Enter the API key details, and click *Create API key*.
+. Copy and securely store the API key, as it will not be shown again.

packages/kbn-alerts-as-data-utils/src/schemas/generated/observability_slo_schema.ts

@@ -12,6 +12,7 @@
 import * as rt from 'io-ts';
 import { Either } from 'fp-ts/lib/Either';
 import { AlertSchema } from './alert_schema';
+import { EcsSchema } from './ecs_schema';
 import { LegacyAlertSchema } from './legacy_alert_schema';
 const ISO_DATE_PATTERN = /^d{4}-d{2}-d{2}Td{2}:d{2}:d{2}.d{3}Z$/;
 export const IsoDateString = new rt.Type<string, string, unknown>(
@@ -88,6 +89,6 @@ const ObservabilitySloAlertOptional = rt.partial({
 });
 
 // prettier-ignore
-export const ObservabilitySloAlertSchema = rt.intersection([ObservabilitySloAlertRequired, ObservabilitySloAlertOptional, AlertSchema, LegacyAlertSchema]);
+export const ObservabilitySloAlertSchema = rt.intersection([ObservabilitySloAlertRequired, ObservabilitySloAlertOptional, AlertSchema, EcsSchema, LegacyAlertSchema]);
 // prettier-ignore
 export type ObservabilitySloAlert = rt.TypeOf<typeof ObservabilitySloAlertSchema>;

src/plugins/interactive_setup/public/app.scss

@@ -9,10 +9,10 @@
 }
 
 .interactiveSetup__logo {
+  margin-bottom: $euiSizeXL;
+
   @include kibanaCircleLogo;
   @include euiBottomShadowMedium;
-
-  margin-bottom: $euiSizeXL;
 }
 
 .interactiveSetup__content {

test/functional/fixtures/es_archiver/kibana_sample_data_logs_logsdb/mappings.json

@@ -0,0 +1,171 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {},
+    "index": "kibana_sample_data_logslogsdb",
+    "mappings": {
+      "_data_stream_timestamp": {
+        "enabled": true
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "bytes": {
+          "type": "long"
+        },
+        "bytes_counter": {
+          "time_series_metric": "counter",
+          "type": "long"
+        },
+        "bytes_gauge": {
+          "time_series_metric": "gauge",
+          "type": "long"
+        },
+        "clientip": {
+          "type": "ip"
+        },
+        "event": {
+          "properties": {
+            "dataset": {
+              "type": "keyword"
+            }
+          }
+        },
+        "extension": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "geo": {
+          "properties": {
+            "coordinates": {
+              "type": "geo_point"
+            },
+            "dest": {
+              "type": "keyword"
+            },
+            "src": {
+              "type": "keyword"
+            },
+            "srcdest": {
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "name": {
+              "type": "keyword"
+            }
+          }
+        },
+        "index": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "ip": {
+          "type": "ip"
+        },
+        "machine": {
+          "properties": {
+            "os": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "ram": {
+              "type": "long"
+            }
+          }
+        },
+        "memory": {
+          "type": "double"
+        },
+        "message": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "phpmemory": {
+          "type": "long"
+        },
+        "referer": {
+          "type": "keyword"
+        },
+        "request": {
+          "time_series_dimension": true,
+          "type": "keyword"
+        },
+        "response": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "tags": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "timestamp": {
+          "path": "@timestamp",
+          "type": "alias"
+        },
+        "url": {
+          "time_series_dimension": true,
+          "type": "keyword"
+        },
+        "utc_time": {
+          "type": "date"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "mode": "time_series",
+        "number_of_replicas": "0",
+        "number_of_shards": "1",
+        "routing_path": "request",
+        "time_series": {
+          "end_time": "2023-06-28T09:17:00.283Z",
+          "start_time": "2023-03-28T09:17:00.283Z"
+        }
+      }
+    }
+  }
+}

test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_logsdb.json

@@ -0,0 +1,22 @@
+{
+    "attributes": {
+        "fieldFormatMap": "{\"hour_of_day\":{}}",
+        "name": "Kibana Sample Data Logs (LogsDB)",
+        "runtimeFieldMap": "{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}",
+        "timeFieldName": "timestamp",
+        "title": "kibana_sample_data_logslogsdb"
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2023-04-27T13:09:20.333Z",
+    "id": "90943e30-9a47-11e8-b64d-95841ca0c247",
+    "managed": false,
+    "references": [],
+    "sort": [
+        1682600960333,
+        64
+    ],
+    "type": "index-pattern",
+    "typeMigrationVersion": "7.11.0",
+    "updated_at": "2023-04-27T13:09:20.333Z",
+    "version": "WzIxLDFd"
+}

x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts

@@ -265,6 +265,19 @@ export type InferenceServiceSettings =
         url: string;
       };
     }
+  | {
+      service: 'alibabacloud-ai-search';
+      service_settings: {
+        api_key: string;
+        service_id: string;
+        host: string;
+        workspace: string;
+        http_schema: 'https' | 'http';
+        rate_limit: {
+          requests_per_minute: number;
+        };
+      };
+    }
   | {
       service: 'amazonbedrock';
       service_settings: {

x-pack/packages/security-solution/features/src/product_features_keys.ts

@@ -54,10 +54,16 @@ export enum ProductFeatureSecurityKey {
   osqueryAutomatedResponseActions = 'osquery_automated_response_actions',
 
   /**
-   * Enables Agent Tamper Protection
+   * Enables Protection Updates
    */
   endpointProtectionUpdates = 'endpoint_protection_updates',
 
+  /**
+   * Enables Endpoint Custom Notification
+   */
+
+  endpointCustomNotification = 'endpoint_custom_notification',
+
   /**
    * Enables Agent Tamper Protection
    */

x-pack/packages/security-solution/features/src/security/product_feature_config.ts

@@ -126,6 +126,7 @@ export const securityDefaultProductFeaturesConfig: DefaultSecurityProductFeature
   [ProductFeatureSecurityKey.osqueryAutomatedResponseActions]: {},
   [ProductFeatureSecurityKey.endpointProtectionUpdates]: {},
   [ProductFeatureSecurityKey.endpointAgentTamperProtection]: {},
+  [ProductFeatureSecurityKey.endpointCustomNotification]: {},
   [ProductFeatureSecurityKey.externalRuleActions]: {},
   [ProductFeatureSecurityKey.cloudSecurityPosture]: {},
 

x-pack/packages/security-solution/upselling/service/types.ts

@@ -17,6 +17,7 @@ export type UpsellingSectionId =
   | 'osquery_automated_response_actions'
   | 'endpoint_protection_updates'
   | 'endpoint_agent_tamper_protection'
+  | 'endpoint_custom_notification'
   | 'cloud_security_posture_integration_installation'
   | 'ruleDetailsEndpointExceptions'
   | 'integration_assistant';

x-pack/plugins/actions/common/connector_feature_config.test.ts

@@ -44,7 +44,7 @@ describe('getConnectorCompatibility', () => {
   it('returns the compatibility list for valid feature ids', () => {
     expect(
       getConnectorCompatibility(['alerting', 'cases', 'uptime', 'siem', 'generativeAIForSecurity'])
-    ).toEqual(['Alerting Rules', 'Cases', 'Generative AI for Security']);
+    ).toEqual(['Alerting Rules', 'Cases', 'Security Solution', 'Generative AI for Security']);
   });
 
   it('skips invalid feature ids', () => {

x-pack/plugins/actions/common/connector_feature_config.ts

@@ -56,6 +56,12 @@ const compatibilityAlertingRules = i18n.translate(
     defaultMessage: 'Alerting Rules',
   }
 );
+const compatibilitySecuritySolution = i18n.translate(
+  'xpack.actions.availableConnectorFeatures.compatibility.securitySolution',
+  {
+    defaultMessage: 'Security Solution',
+  }
+);
 
 const compatibilityCases = i18n.translate(
   'xpack.actions.availableConnectorFeatures.compatibility.cases',
@@ -93,7 +99,7 @@ export const SecuritySolutionFeature: ConnectorFeatureConfig = {
   name: i18n.translate('xpack.actions.availableConnectorFeatures.securitySolution', {
     defaultMessage: 'Security Solution',
   }),
-  compatibility: compatibilityAlertingRules,
+  compatibility: compatibilitySecuritySolution,
 };
 
 export const GenerativeAIForSecurityFeature: ConnectorFeatureConfig = {