fix type errors from rebase with master, update index names after cha…

…nges were merged into master regarding naming conventions for alerts as data index
dhurley14 · Jul 8, 2021 · 220a8e9 · 220a8e9
1 parent 1ae051c
commit 220a8e9
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/...ck/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock.ts b/...ck/plugins/rule_registry/server/rule_data_plugin_service/rule_data_plugin_service.mock.ts
@@ -21,6 +21,7 @@ const createRuleDataPluginServiceMock = (_: RuleDataPluginServiceConstructorOpti
     createOrUpdateIndexTemplate: jest.fn(),
     createOrUpdateLifecyclePolicy: jest.fn(),
     getRuleDataClient: jest.fn(),
+    updateIndexMappingsMatchingPattern: jest.fn(),
   };
   return mocked;
 };

diff --git a/x-pack/plugins/rule_registry/server/utils/rbac.ts b/x-pack/plugins/rule_registry/server/utils/rbac.ts
@@ -13,7 +13,7 @@
 export const mapConsumerToIndexName = {
   apm: '.alerts-observability-apm',
   observability: '.alerts-observability',
-  siem: ['.alerts-security-solution', '.siem-signals'],
+  siem: ['.alerts-security.alerts', '.siem-signals'],
 };
 export type ValidFeatureId = keyof typeof mapConsumerToIndexName;
 

diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
@@ -238,8 +238,8 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       });
 
       ruleDataClient = ruleDataService.getRuleDataClient(
-        ruleDataService.getFullAssetName('security.alerts'),
         SERVER_APP_ID,
+        ruleDataService.getFullAssetName('security.alerts'),
         () => initializeRuleDataTemplatesPromise
       );
 

diff --git a/x-pack/test/functional/es_archives/rule_registry/alerts/data.json b/x-pack/test/functional/es_archives/rule_registry/alerts/data.json
@@ -16,7 +16,7 @@
 {
   "type": "doc",
   "value": {
-    "index": ".alerts-security-solution",
+    "index": ".alerts-security.alerts",
     "id": "020202",
     "source": {
       "@timestamp": "2020-12-16T15:16:18.570Z",

diff --git a/x-pack/test/functional/es_archives/rule_registry/alerts/mappings.json b/x-pack/test/functional/es_archives/rule_registry/alerts/mappings.json
@@ -25,7 +25,7 @@
 {
   "type": "index",
   "value": {
-    "index": ".alerts-security-solution",
+    "index": ".alerts-security.alerts",
     "mappings": {
       "properties": {
         "message": {

diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alert_by_id.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/get_alert_by_id.ts
@@ -56,7 +56,7 @@ export default ({ getService }: FtrProviderContext) => {
   const APM_ALERT_ID = 'NoxgpHkBqbdrfX07MqXV';
   const APM_ALERT_INDEX = '.alerts-observability-apm';
   const SECURITY_SOLUTION_ALERT_ID = '020202';
-  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security-solution';
+  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security.alerts';
 
   const getAPMIndexName = async (user: User) => {
     const {

diff --git a/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts b/x-pack/test/rule_registry/security_and_spaces/tests/basic/update_alert.ts
@@ -55,7 +55,7 @@ export default ({ getService }: FtrProviderContext) => {
   const APM_ALERT_ID = 'NoxgpHkBqbdrfX07MqXV';
   const APM_ALERT_INDEX = '.alerts-observability-apm';
   const SECURITY_SOLUTION_ALERT_ID = '020202';
-  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security-solution';
+  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security.alerts';
   const ALERT_VERSION = Buffer.from(JSON.stringify([0, 1]), 'utf8').toString('base64'); // required for optimistic concurrency control
 
   const getAPMIndexName = async (user: User) => {
@@ -155,7 +155,7 @@ export default ({ getService }: FtrProviderContext) => {
               ids: [APM_ALERT_ID],
               status: 'closed',
               index: 'this index does not exist',
-              _version: Buffer.from(JSON.stringify([0, 1]), 'utf8').toString('base64'),
+              _version: ALERT_VERSION,
             })
             .expect(404);
         });

diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/get_alert_by_id.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/get_alert_by_id.ts
@@ -23,7 +23,7 @@ export default ({ getService }: FtrProviderContext) => {
   const SPACE2 = 'space2';
   const APM_ALERT_ID = 'NoxgpHkBqbdrfX07MqXV';
   const APM_ALERT_INDEX = '.alerts-observability-apm';
-  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security-solution';
+  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security.alerts';
 
   const getAPMIndexName = async (user: User) => {
     const {

diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/update_alert.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/update_alert.ts
@@ -22,7 +22,7 @@ export default ({ getService }: FtrProviderContext) => {
   const SPACE2 = 'space2';
   const APM_ALERT_ID = 'NoxgpHkBqbdrfX07MqXV';
   const APM_ALERT_INDEX = '.alerts-observability-apm';
-  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security-solution';
+  const SECURITY_SOLUTION_ALERT_INDEX = '.alerts-security.alerts';
   const ALERT_VERSION = Buffer.from(JSON.stringify([0, 1]), 'utf8').toString('base64'); // required for optimistic concurrency control
 
   const getAPMIndexName = async (user: User) => {