Merge branch 'main' into synthetics-embeddable-schema-registration

Author: yiannisnikolopoulos

.github/workflows/copilot-request-review.yml

@@ -356,8 +356,15 @@
     "error",
     "filter",
     "integrationName",
+    "integrations",
+    "integrations.syncData",
+    "integrations.syncData.lastFullSync",
+    "integrations.syncData.lastUpdateProcessed",
+    "integrations.syncMarkerIndex",
     "managed",
+    "managedVersion",
     "matchers",
+    "matchersModifiedByUser",
     "name",
     "type"
   ],

packages/kbn-check-saved-objects-cli/current_fields.json

@@ -1218,13 +1218,40 @@
       "integrationName": {
         "type": "keyword"
       },
+      "integrations": {
+        "dynamic": false,
+        "properties": {
+          "syncData": {
+            "dynamic": false,
+            "properties": {
+              "lastFullSync": {
+                "type": "date"
+              },
+              "lastUpdateProcessed": {
+                "type": "date"
+              }
+            },
+            "type": "object"
+          },
+          "syncMarkerIndex": {
+            "type": "keyword"
+          }
+        },
+        "type": "object"
+      },
       "managed": {
         "type": "boolean"
       },
+      "managedVersion": {
+        "type": "integer"
+      },
       "matchers": {
         "dynamic": false,
         "type": "object"
       },
+      "matchersModifiedByUser": {
+        "type": "boolean"
+      },
       "name": {
         "type": "keyword"
       },

packages/kbn-check-saved-objects-cli/current_mappings.json

@@ -0,0 +1,58 @@
+{
+  "10.1.0": [
+    {
+      "type": "entity-analytics-integration",
+      "name": ".entity_analytics.monitoring.sources.entityanalytics_okta-default",
+      "managed": true,
+      "enabled": true,
+      "integrationName": "entityanalytics_okta",
+      "matchers": [
+        {
+          "fields": [
+            "user.roles"
+          ],
+          "values": [
+            "Super Administrator",
+            "Organization Administrator",
+            "Group Administrator",
+            "Application Administrator",
+            "Mobile Administrator",
+            "Help Desk Administrator",
+            "Report Administrator",
+            "API Access Management Administrator",
+            "Group Membership Administrator",
+            "Read-only Administrator"
+          ]
+        }        
+      ]
+    }
+  ],
+  "10.2.0": [
+    {
+      "type": "entity-analytics-integration",
+      "name": ".entity_analytics.monitoring.sources.entityanalytics_okta-default",
+      "managed": true,
+      "enabled": true,
+      "integrationName": "entityanalytics_okta",
+      "matchers": [
+        {
+          "fields": ["user.roles"],
+          "values": [
+            "Super Administrator",
+            "Organization Administrator",
+            "Group Administrator",
+            "Application Administrator",
+            "Mobile Administrator",
+            "Help Desk Administrator",
+            "Report Administrator",
+            "API Access Management Administrator",
+            "Group Membership Administrator",
+            "Read-only Administrator"
+          ]
+        }
+      ],
+      "matchersModifiedByUser": false,
+      "managedVersion": 1
+    }
+  ]
+}

packages/kbn-check-saved-objects-cli/src/migrations/__fixtures__/entity-analytics-monitoring-entity-source/10.2.0.json

@@ -73,8 +73,7 @@ test.skip('set correct defaults', () => {
   `);
 });
 
-// FLAKY: https://github.com/elastic/kibana/issues/253373
-test.skip('set correct defaults (serverless)', () => {
+test('set correct defaults (serverless)', () => {
   const configValue = new ElasticsearchConfig(config.schema.validate({}, { serverless: true }));
   expect(configValue).toMatchInlineSnapshot(`
     ElasticsearchConfig {
@@ -84,6 +83,7 @@ test.skip('set correct defaults (serverless)', () => {
       "customHeaders": Object {},
       "dnsCacheTtl": "P0D",
       "healthCheckDelay": "PT2.5S",
+      "healthCheckFailureInterval": undefined,
       "healthCheckRetry": 3,
       "healthCheckStartupDelay": "PT0.5S",
       "hosts": Array [

src/core/packages/elasticsearch/server-internal/src/elasticsearch_config.test.ts

@@ -98,7 +98,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "endpoint:unified-user-artifact-manifest": "43de99c3d008e0b84173f63ee09936ba398c93ed3e18eabbd5792073a26b69b8",
         "endpoint:user-artifact-manifest": "eb81c7e7f4a32496d259521a9b5754a202fec4b139ef64c90ae3d777a3f217ee",
         "enterprise_search_telemetry": "14b8cb1ede45a76f5d7799867629de672a5c329b7af8165f0a5b3e88011a5d68",
-        "entity-analytics-monitoring-entity-source": "9f4972290a0448ea33a699e257247a56288793b3ff604104252e6672f0cd6c63",
+        "entity-analytics-monitoring-entity-source": "a7307895e5c38accc21ebea852bd46ef98ebb73f7a73d116c8dfcd3932f57899",
         "entity-definition": "28cde811da5815b6fdebb0112419b593253fb5053d60c2cf29b50af3be058c67",
         "entity-discovery-api-key": "2350e2ce1b6e913f55aef2cd04971b15604b03e049370ef10949c3eeec38c46f",
         "entity-engine-descriptor-v2": "9dd0f716e0726e3b04c5e8eb9d0c91c3217063fa458573b66bec3668b00e5f3f",
@@ -597,8 +597,9 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "enterprise_search_telemetry|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
         "=============================================================================",
         "entity-analytics-monitoring-entity-source|global: 490d8737877bba3f6bad8e9a56977d402e5377fd",
-        "entity-analytics-monitoring-entity-source|mappings: 4a0f773e6ee3a84d8a91d925adfc4426c6fe2202",
+        "entity-analytics-monitoring-entity-source|mappings: 477d75d5cba5dedf5f392f794fb90dbc4d2ce5e0",
         "entity-analytics-monitoring-entity-source|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "entity-analytics-monitoring-entity-source|10.2.0: 4a17daaf7689a26d3a3383211fea3ed44e2766f7b9ef757a541f4cf161fc025f",
         "entity-analytics-monitoring-entity-source|10.1.0: 0bf95a609d2587fb1dea9c41fb320e50a58f46bc487ae7f4277f3cc34bd72e46",
         "==================================================================================================================",
         "entity-definition|global: 083b167687b1aaef9f6510a7601be70f1b1cbde0",
@@ -1359,7 +1360,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "endpoint:unified-user-artifact-manifest": "10.0.0",
         "endpoint:user-artifact-manifest": "10.0.0",
         "enterprise_search_telemetry": "10.0.0",
-        "entity-analytics-monitoring-entity-source": "10.1.0",
+        "entity-analytics-monitoring-entity-source": "10.2.0",
         "entity-definition": "10.4.0",
         "entity-discovery-api-key": "10.0.0",
         "entity-engine-descriptor-v2": "10.1.0",
@@ -1514,7 +1515,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "endpoint:unified-user-artifact-manifest": "0.0.0",
         "endpoint:user-artifact-manifest": "7.12.0",
         "enterprise_search_telemetry": "0.0.0",
-        "entity-analytics-monitoring-entity-source": "10.1.0",
+        "entity-analytics-monitoring-entity-source": "10.2.0",
         "entity-definition": "10.4.0",
         "entity-discovery-api-key": "0.0.0",
         "entity-engine-descriptor-v2": "10.1.0",

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

@@ -49,6 +49,19 @@ export const useSourcesBadge = ({
       color: ${euiTheme.colors.primary} !important;
       background-color: ${euiTheme.colors.backgroundBasePrimary} !important;
       box-sizing: border-box;
+      transition: background-color ${euiTheme.animation.fast} ease-in-out,
+        box-shadow ${euiTheme.animation.fast} ease-in-out;
+    }
+
+    .${sourcesBadgeClassName}:hover {
+      background-color: ${euiTheme.colors.backgroundLightPrimary} !important;
+    }
+
+    /* Monaco decorations aren't keyboard-focusable DOM nodes, so we use the editor's
+   * focus state to provide a "focus" treatment for the badge.
+   */
+    .monaco-editor:focus-within .${sourcesBadgeClassName} {
+      background-color: ${euiTheme.colors.backgroundLightPrimary} !important;
     }
   `;
 

src/platform/packages/private/kbn-esql-editor/src/resource_browser/use_resource_browser_badge.tsx

@@ -24,6 +24,7 @@ import { withAutoSuggest } from './autocomplete/helpers';
 import { isIdentifier, isList, isSource } from '../../../ast/is';
 import { SuggestionCategory } from '../../../language/autocomplete/utils/sorting';
 import { techPreviewLabel } from './shared';
+import { arithmeticOperators } from '../all_operators';
 
 const INDEX_PARAM_REGEX = /\bindex\s*=\s*(\S+)/i;
 
@@ -65,22 +66,22 @@ const getPromqlFunctionSuggestion = (fn: PromQLFunctionDefinition): ISuggestionI
 };
 
 /* Returns all PROMQL function suggestions suitable for autocomplete. */
-export const getPromqlFunctionSuggestions = (): ISuggestionItem[] => {
+const buildPromqlFunctionSuggestions = (): ISuggestionItem[] => {
   return promqlFunctionDefinitions
     .filter((fn) => !fn.ignoreAsSuggestion)
     .map((fn) => withAutoSuggest(getPromqlFunctionSuggestion(fn)));
 };
 
-export const getPromqlFunctionSuggestionsForReturnTypes = (
-  returnTypes: PromQLFunctionParamType[]
+export const getPromqlFunctionSuggestions = (
+  returnTypes: PromQLFunctionParamType[] = []
 ): ISuggestionItem[] => {
   if (!returnTypes.length) {
-    return getPromqlFunctionSuggestions();
+    return buildPromqlFunctionSuggestions();
   }
 
   const allowed = new Set(returnTypes);
 
-  return getPromqlFunctionSuggestions().filter((suggestion) => {
+  return buildPromqlFunctionSuggestions().filter((suggestion) => {
     const definition = getPromqlFunctionDefinition(suggestion.label);
     if (!definition?.signatures.length) {
       return false;
@@ -102,6 +103,22 @@ export const getPromqlFunctionDefinition = (
   return promqlFunctionDefinitions.find((fn) => fn.name.toLowerCase() === normalized);
 };
 
+/* Returns the PromQL operator definition matching the provided operator symbol. */
+export const getPromqlOperatorDefinition = (
+  operator: string | undefined
+): PromQLFunctionDefinition | undefined => {
+  if (!operator) {
+    return undefined;
+  }
+
+  const normalized = operator.toLowerCase();
+  return promqlOperatorDefinitions.find(
+    ({ operator: symbol, name, signatures }) =>
+      (symbol ?? name)?.toLowerCase() === normalized &&
+      signatures.some(({ params }) => params.length >= 2)
+  );
+};
+
 /* Extracts param types for a specific PromQL function parameter index. */
 export function getPromqlParamTypesForFunction(
   name: string | undefined,
@@ -146,13 +163,37 @@ const buildPromqlSymbolSuggestion = (definition: PromQLFunctionDefinition): ISug
   };
 };
 
-/* Returns all PromQL operator suggestions suitable for autocomplete. */
+// TODO: Temporarily limited to arithmetic operators. Remove filter when comparison and logical operators are fully supported.
 export const getPromqlOperatorSuggestions = (): ISuggestionItem[] => {
   return promqlOperatorDefinitions
-    .filter((op) => !op.ignoreAsSuggestion)
+    .filter((op) => {
+      const symbol = op.operator ?? op.name;
+
+      return (
+        !op.ignoreAsSuggestion &&
+        op.signatures.some((sig) => sig.params.length >= 2) &&
+        (arithmeticOperators.some(({ name }) => name === symbol) || symbol === '^')
+      );
+    })
     .map((op) => buildPromqlSymbolSuggestion(op));
 };
 
+/* Extracts rhs param types for a PromQL binary operator from operator signatures. */
+export const getBinaryOperatorParamTypes = (
+  operator: string,
+  paramIndex: number
+): PromQLFunctionParamType[] => {
+  const definition = getPromqlOperatorDefinition(operator);
+
+  if (!definition) {
+    return [];
+  }
+
+  return definition.signatures
+    .map((signature) => signature.params[paramIndex]?.type)
+    .filter((paramType): paramType is PromQLFunctionParamType => Boolean(paramType));
+};
+
 /* Returns all PromQL label matcher suggestions suitable for autocomplete. */
 export const getPromqlLabelMatcherSuggestions = (): ISuggestionItem[] => {
   return promqlLabelMatcherDefinitions

src/platform/packages/shared/kbn-esql-language/src/commands/definitions/utils/promql.ts

@@ -211,10 +211,11 @@ export const promqlLabelSelectorItem: ISuggestionItem = withAutoSuggest({
   }),
   text: '{$0}',
   asSnippet: true,
-  kind: 'Operator',
+  kind: 'Reference',
   detail: i18n.translate('kbn-esql-language.esql.autocomplete.promql.labelSelectorDoc', {
     defaultMessage: 'Filter by labels',
   }),
+  category: SuggestionCategory.PROMQL_METRIC_QUALIFIER,
 });
 
 export const promqlRangeSelectorItem: ISuggestionItem = withAutoSuggest({
@@ -223,10 +224,11 @@ export const promqlRangeSelectorItem: ISuggestionItem = withAutoSuggest({
   }),
   text: '[${0:5m}]',
   asSnippet: true,
-  kind: 'Operator',
+  kind: 'Reference',
   detail: i18n.translate('kbn-esql-language.esql.autocomplete.promql.rangeSelectorDoc', {
     defaultMessage: 'Range selector (duration)',
   }),
+  category: SuggestionCategory.PROMQL_METRIC_QUALIFIER,
 });
 
 export const byCompleteItem: ISuggestionItem = withAutoSuggest({