From ee18aff8e02993310ac20b470493f5d7e8d5927d Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 11 Aug 2021 10:00:05 -0400 Subject: [PATCH] adjust uptime rbac and index settings --- .../kbn-rule-data-utils/src/alerts_as_data_rbac.ts | 4 ++-- .../public/pages/alerts/alerts_table_t_grid.tsx | 2 +- x-pack/plugins/uptime/server/plugin.ts | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts b/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts index 795d194ee8a92..f8b5acc52513c 100644 --- a/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts +++ b/packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts @@ -24,7 +24,7 @@ export const AlertConsumers = { INFRASTRUCTURE: 'infrastructure', OBSERVABILITY: 'observability', SIEM: 'siem', - SYNTHETICS: 'synthetics', + UPTIME: 'uptime', } as const; export type AlertConsumers = typeof AlertConsumers[keyof typeof AlertConsumers]; export type STATUS_VALUES = 'open' | 'acknowledged' | 'closed'; @@ -35,7 +35,7 @@ export const mapConsumerToIndexName: Record = infrastructure: '.alerts-observability.metrics', observability: '.alerts-observability', siem: ['.alerts-security.alerts', '.siem-signals'], - synthetics: '.alerts-observability-synthetics', + uptime: '.alerts-observability.uptime', }; export type ValidFeatureId = keyof typeof mapConsumerToIndexName; diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx index 4bc9c40e6e917..62f8fde5e3196 100644 --- a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx +++ b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx @@ -120,7 +120,7 @@ const OBSERVABILITY_ALERT_CONSUMERS = [ AlertConsumers.APM, AlertConsumers.LOGS, AlertConsumers.INFRASTRUCTURE, - AlertConsumers.SYNTHETICS, + AlertConsumers.UPTIME, ]; export function AlertsTableTGrid(props: AlertsTableTGridProps) { diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts index d4bc9ca1b4d5d..a9369067e97ec 100644 --- a/x-pack/plugins/uptime/server/plugin.ts +++ b/x-pack/plugins/uptime/server/plugin.ts @@ -36,8 +36,8 @@ export class Plugin implements PluginType { const { ruleDataService } = plugins.ruleRegistry; const ready = once(async () => { - const componentTemplateName = ruleDataService.getFullAssetName('synthetics-mappings'); - const alertsIndexPattern = ruleDataService.getFullAssetName('observability.synthetics*'); + const componentTemplateName = ruleDataService.getFullAssetName('uptime-mappings'); + const alertsIndexPattern = ruleDataService.getFullAssetName('observability.uptime*'); if (!ruleDataService.isWriteEnabled()) { return; @@ -56,7 +56,7 @@ export class Plugin implements PluginType { }); await ruleDataService.createOrUpdateIndexTemplate({ - name: ruleDataService.getFullAssetName('synthetics-index-template'), + name: ruleDataService.getFullAssetName('uptime-index-template'), body: { index_patterns: [alertsIndexPattern], composed_of: [ @@ -75,8 +75,8 @@ export class Plugin implements PluginType { }); const ruleDataClient = ruleDataService.getRuleDataClient( - 'synthetics', - ruleDataService.getFullAssetName('observability.synthetics'), + 'uptime', + ruleDataService.getFullAssetName('observability.uptime'), () => initializeRuleDataTemplatesPromise );