diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_non_migrated_signals_info.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_non_migrated_signals_info.ts index dd1c1d6bf67de..d1f561fb3846c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_non_migrated_signals_info.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/get_non_migrated_signals_info.ts @@ -101,14 +101,6 @@ export const getNonMigratedSignalsInfo = async ({ [] ); - if (outdatedIndices.length === 0) { - return { - isMigrationRequired: false, - spaces: [], - indices: [], - }; - } - const outdatedIndexNames = outdatedIndices.map((outdatedIndex) => outdatedIndex.indexName); // remove duplicated spaces diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts index 4b66d73c93b1f..183385fa35f99 100644 --- a/x-pack/plugins/security_solution/server/plugin.ts +++ b/x-pack/plugins/security_solution/server/plugin.ts @@ -281,6 +281,7 @@ export class Plugin implements ISecuritySolutionPlugin { all: allRiskScoreIndexPattern, latest: latestRiskScoreIndexPattern, }, + legacySignalsIndex: config.signalsIndex, }); this.telemetryUsageCounter = plugins.usageCollection?.createUsageCounter(APP_ID); diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts index 28896e5844ac1..aa507cd683db5 100644 --- a/x-pack/plugins/security_solution/server/usage/collector.ts +++ b/x-pack/plugins/security_solution/server/usage/collector.ts @@ -3078,16 +3078,17 @@ export const registerCollector: RegisterCollector = ({ }, }, legacy_siem_signals: { - indices_total: { + non_migrated_indices_total: { type: 'long', _meta: { - description: 'Total number of legacy siem signals indices', + description: 'Total number of non migrated legacy siem signals indices', }, }, spaces_total: { type: 'long', _meta: { - description: 'Total number of Kibana spaces that have legacy siem signals indices', + description: + 'Total number of Kibana spaces that have non migrated legacy siem signals indices', }, }, }, diff --git a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_initial_usage.ts b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_initial_usage.ts index b336d77148c5a..df222f9750490 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_initial_usage.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_initial_usage.ts @@ -8,6 +8,6 @@ import type { LegacySiemSignals } from './types'; export const getInitialLegacySiemSignalsUsage = (): LegacySiemSignals => ({ - indices_total: 0, + non_migrated_indices_total: 0, spaces_total: 0, }); diff --git a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_legacy_siem_signals_metrics.ts b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_legacy_siem_signals_metrics.ts index ff8424ad06738..a6d2b8bf06aff 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_legacy_siem_signals_metrics.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/get_legacy_siem_signals_metrics.ts @@ -27,7 +27,7 @@ export const getLegacySiemSignalsUsage = async ({ }); return { - indices_total: indices.length, + non_migrated_indices_total: indices.length, spaces_total: spaces.length, }; }; diff --git a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/types.ts b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/types.ts index 0cbde9b8352b0..b4351b2e7808f 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/types.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/legacy_siem_signals/types.ts @@ -5,6 +5,6 @@ * 2.0. */ export interface LegacySiemSignals { - indices_total: number; + non_migrated_indices_total: number; spaces_total: number; } diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json index e163f107bd36e..37200bd08b7de 100644 --- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json +++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @@ -19539,16 +19539,16 @@ }, "legacy_siem_signals": { "properties": { - "indices_total": { + "non_migrated_indices_total": { "type": "long", "_meta": { - "description": "Total number of legacy siem signals indices" + "description": "Total number of non migrated legacy siem signals indices" } }, "spaces_total": { "type": "long", "_meta": { - "description": "Total number of Kibana spaces that have legacy siem signals indices" + "description": "Total number of Kibana spaces that have non migrated legacy siem signals indices" } } }