Fix incorrect detection rules sort order

elastic · Apr 13, 2022 · 625c940 · 625c940
1 parent f814e0f
commit 625c940
Show file tree

Hide file tree

Showing 4 changed files with 196 additions and 189 deletions.
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts b/x-pack/plugins/alerting/server/rules_client/lib/validate_attributes.ts
@@ -7,7 +7,7 @@
 
 import { KueryNode } from '@kbn/es-query';
 import { get, isEmpty } from 'lodash';
-import mappings from '../../saved_objects/mappings.json';
+import mappings from '../../saved_objects/mappings';
 
 const astFunctionType = ['is', 'range', 'nested'];
 

diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -10,9 +10,8 @@ import type {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
-  SavedObjectsTypeMappingDefinition,
 } from 'kibana/server';
-import mappings from './mappings.json';
+import { alert } from './mappings';
 import { getMigrations } from './migrations';
 import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import { transformRulesForExport } from './transform_rule_for_export';
@@ -60,7 +59,7 @@ export function setupSavedObjects(
     namespaceType: 'multiple-isolated',
     convertToMultiNamespaceTypeVersion: '8.0.0',
     migrations: getMigrations(encryptedSavedObjects, isPreconfigured),
-    mappings: mappings.alert as SavedObjectsTypeMappingDefinition,
+    mappings: alert,
     management: {
       displayName: 'rule',
       importableAndExportable: true,

diff --git a/x-pack/plugins/alerting/server/saved_objects/mappings.json b/x-pack/plugins/alerting/server/saved_objects/mappings.json