From 4664c297c4c078b2a3971f00f355e5741729bf27 Mon Sep 17 00:00:00 2001 From: Kevin Delemme Date: Thu, 2 Jan 2025 15:10:29 -0500 Subject: [PATCH 1/2] chore(slo): use CCS Remote index name util function (#205425) --- .../plugins/slo/server/services/summary_search_client.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 index 0d12ee7255dc8..c4f0de5b38b25 100644 --- 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(':')); } } From f72252a07c8a545c2997a656f721f17fe4183051 Mon Sep 17 00:00:00 2001 From: Larry Gregory Date: Thu, 2 Jan 2025 15:40:39 -0500 Subject: [PATCH 2/2] Dependency ownership for o11y teams, part 1 (#205429) ## Summary This updates our `renovate.json` configuration to mark the Observability teams as owners of their set of dependencies. --- renovate.json | 153 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 145 insertions(+), 8 deletions(-) diff --git a/renovate.json b/renovate.json index 1c7043511e57d..c1d7b8b53ba76 100644 --- 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" } ] -} +} \ No newline at end of file