Merge branch 'main' into elastic#205329

alexwizp · Jan 2, 2025 · 47e2fc1 · 47e2fc1
2 parents 3fd481f + f72252a
commit 47e2fc1
Show file tree

Hide file tree

Showing 2 changed files with 149 additions and 11 deletions.
diff --git a/renovate.json b/renovate.json
@@ -2557,16 +2557,56 @@
         "react-hook-form"
       ],
       "reviewers": [
-        "team:security-asset-management",
-        "team:uptime"
+        "team:obs-ux-management-team"
       ],
       "matchBaseBranches": [
         "main"
       ],
       "labels": [
         "release_note:skip",
-        "backport:skip",
-        "ci:all-cypress-suites"
+        "backport:all-open",
+        "ci:all-cypress-suites",
+        "Team:obs-ux-management"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "@faker-js/faker",
+      "matchDepNames": [
+        "@faker-js/faker"
+      ],
+      "reviewers": [
+        "team:obs-ux-management-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open",
+        "ci:all-cypress-suites",
+        "Team:obs-ux-management"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "@elastic/synthetics",
+      "matchDepNames": [
+        "@elastic/synthetics"
+      ],
+      "reviewers": [
+        "team:obs-ux-management-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open",
+        "ci:all-cypress-suites",
+        "Team:obs-ux-management"
       ],
       "minimumReleaseAge": "7 days",
       "enabled": true
@@ -2609,7 +2649,101 @@
       ],
       "labels": [
         "release_note:skip",
-        "backport:skip"
+        "backport:all-open"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "Cytoscape",
+      "matchDepNames": [
+        "@types/cytoscape",
+        "cytoscape",
+        "cytoscape-dagre"
+      ],
+      "reviewers": [
+        "team:obs-ux-infra_services-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "fnv-plus",
+      "matchDepNames": [
+        "fnv-plus",
+        "@types/fnv-plus"
+      ],
+      "reviewers": [
+        "team:obs-ux-infra_services-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "react-syntax-highlighter",
+      "matchDepNames": [
+        "react-syntax-highlighter",
+        "@types/react-syntax-highlighter"
+      ],
+      "reviewers": [
+        "team:obs-ux-infra_services-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "native-hdr-histogram",
+      "matchDepNames": [
+        "native-hdr-histogram"
+      ],
+      "reviewers": [
+        "team:obs-ux-infra_services-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open"
+      ],
+      "minimumReleaseAge": "7 days",
+      "enabled": true
+    },
+    {
+      "groupName": "native-hdr-histogram",
+      "matchDepNames": [
+        "native-hdr-histogram"
+      ],
+      "reviewers": [
+        "team:obs-ux-infra_services-team"
+      ],
+      "matchBaseBranches": [
+        "main"
+      ],
+      "labels": [
+        "release_note:skip",
+        "backport:all-open"
       ],
       "minimumReleaseAge": "7 days",
       "enabled": true
@@ -2667,7 +2801,8 @@
       ],
       "labels": [
         "Team:Obs UX Logs",
-        "release_note:skip"
+        "release_note:skip",
+        "backport:all-open"
       ],
       "minimumReleaseAge": "7 days",
       "enabled": true
@@ -2850,6 +2985,7 @@
     {
       "groupName": "Serve swagger docs",
       "matchDepNames": [
+        "@types/express",
         "express",
         "swagger-jsdoc",
         "swagger-ui-express"
@@ -2862,7 +2998,8 @@
       ],
       "labels": [
         "release_note:skip",
-        "team:obs-entities"
+        "team:obs-entities",
+        "backport:all-open"
       ],
       "enabled": true
     },
@@ -2968,4 +3105,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
diff --git a/x-pack/solutions/observability/plugins/slo/server/services/summary_search_client.ts b/x-pack/solutions/observability/plugins/slo/server/services/summary_search_client.ts
@@ -6,11 +6,12 @@
  */
 
 import { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ElasticsearchClient, Logger, SavedObjectsClientContract } from '@kbn/core/server';
+import { isCCSRemoteIndexName } from '@kbn/es-query';
 import { ALL_VALUE, Paginated, Pagination } from '@kbn/slo-schema';
 import { assertNever } from '@kbn/std';
 import { partition } from 'lodash';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { SLO_SUMMARY_DESTINATION_INDEX_PATTERN } from '../../common/constants';
 import { Groupings, SLODefinition, SLOId, StoredSLOSettings, Summary } from '../domain/models';
 import { toHighPrecision } from '../utils/number';
@@ -225,8 +226,8 @@ function excludeStaleSummaryFilter(
 }
 
 function getRemoteClusterName(index: string) {
-  if (index.includes(':')) {
-    return index.split(':')[0];
+  if (isCCSRemoteIndexName(index)) {
+    return index.substring(0, index.indexOf(':'));
   }
 }