[BeatsCM] check for security after license, add support for standard …

…license (elastic#24210)
skh · Oct 18, 2018 · 612bd74 · 612bd74
1 parent 46d1a81
commit 612bd74
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -115,25 +115,13 @@ export class KibanaBackendFrameworkAdapter implements BackendFrameworkAdapter {
       };
     }
 
-    const VALID_LICENSE_MODES = ['trial', 'gold', 'platinum'];
+    const VALID_LICENSE_MODES = ['trial', 'standard', 'gold', 'platinum'];
 
     const isLicenseValid = xPackInfo.license.isOneOf(VALID_LICENSE_MODES);
     const isLicenseActive = xPackInfo.license.isActive();
     const licenseType = xPackInfo.license.getType();
     const isSecurityEnabled = xPackInfo.feature('security').isEnabled();
 
-    // Security is not enabled in ES
-    if (!isSecurityEnabled) {
-      const message =
-        'Security must be enabled in order to use Beats centeral management features.' +
-        ' Please set xpack.security.enabled: true in your elasticsearch.yml.';
-      return {
-        securityEnabled: false,
-        licenseValid: true,
-        message,
-      };
-    }
-
     // License is not valid
     if (!isLicenseValid) {
       return {
@@ -152,6 +140,18 @@ export class KibanaBackendFrameworkAdapter implements BackendFrameworkAdapter {
       };
     }
 
+    // Security is not enabled in ES
+    if (!isSecurityEnabled) {
+      const message =
+        'Security must be enabled in order to use Beats centeral management features.' +
+        ' Please set xpack.security.enabled: true in your elasticsearch.yml.';
+      return {
+        securityEnabled: false,
+        licenseValid: true,
+        message,
+      };
+    }
+
     // License is valid and active
     return {
       securityEnabled: true,