Updated PR from feedback and merge from master

elastic · Nov 21, 2019 · f109cfe · f109cfe
1 parent acd752a
commit f109cfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/x-pack/legacy/plugins/siem/index.test.ts b/x-pack/legacy/plugins/siem/index.test.ts
@@ -52,6 +52,14 @@ describe('siem plugin tests', () => {
       ]);
     });
 
+    test('alertingFeatureEnabled being true and an empty string for siemIndex returns regular kibana and elasticsearch plugins', () => {
+      expect(getRequiredPlugins(undefined, '')).toEqual(['kibana', 'elasticsearch']);
+    });
+
+    test('alertingFeatureEnabled being true and a string of spaces for siemIndex returns regular kibana and elasticsearch plugins', () => {
+      expect(getRequiredPlugins(undefined, '   ')).toEqual(['kibana', 'elasticsearch']);
+    });
+
     test('alertingFeatureEnabled being null and a string for siemIndex returns alerting and actions', () => {
       expect(getRequiredPlugins(null, '.siem-signals-frank')).toEqual([
         'kibana',

diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
@@ -42,7 +42,7 @@ export const getRequiredPlugins = (
 ) => {
   const baseRequire = ['kibana', 'elasticsearch'];
   if (
-    signalsIndex != null ||
+    (signalsIndex != null && signalsIndex.trim() !== '') ||
     (alertingFeatureEnabled && alertingFeatureEnabled.toLowerCase() === 'true')
   ) {
     return [...baseRequire, 'alerting', 'actions'];