Merge branch 'logs-data-for-obs-homepage_68531' of github.com:jasonrh…

…odes/kibana into logs-data-for-obs-homepage_68531
elastic · Jun 30, 2020 · 3cac145 · 3cac145
2 parents 8abdf6c + 29cf062
commit 3cac145
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
@@ -13,9 +13,7 @@
     "alerts",
     "triggers_actions_ui"
   ],
-  "optionalPlugins": [
-    "ml"
-  ],
+  "optionalPlugins": ["ml", "observability"],
   "server": true,
   "ui": true,
   "configPath": ["xpack", "infra"]

diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
@@ -30,11 +30,13 @@ export class Plugin implements InfraClientPluginClass {
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getLogsAlertType());
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(createMetricThresholdAlertType());
 
-    pluginsSetup.observability.dashboard.register({
-      appName: 'infra_logs',
-      hasData: getLogsHasDataFetcher(core.getStartServices),
-      fetchData: getLogsOverviewDataFetcher(core.getStartServices),
-    });
+    if (pluginsSetup.observability) {
+      pluginsSetup.observability.dashboard.register({
+        appName: 'infra_logs',
+        hasData: getLogsHasDataFetcher(core.getStartServices),
+        fetchData: getLogsOverviewDataFetcher(core.getStartServices),
+      });
+    }
 
     core.application.register({
       id: 'logs',