Fixes type hacks for logs fetcher

Author: jasonrhodes

x-pack/plugins/infra/public/plugin.ts

@@ -30,7 +30,7 @@ export class Plugin implements InfraClientPluginClass {
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getLogsAlertType());
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(createMetricThresholdAlertType());
 
-    pluginsSetup.observability.dashboard.register<'infra_logs'>({
+    pluginsSetup.observability.dashboard.register({
       appName: 'infra_logs',
       hasData: getLogsHasDataFetcher(core.getStartServices),
       fetchData: getLogsOverviewDataFetcher(core.getStartServices),

x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts

@@ -5,15 +5,16 @@
  */
 
 import { InfraClientCoreSetup } from '../types';
-
-// TODO: this satisfies a TS error because TS inference assumed the stat type was just "string",
-// but we need a better solution for this 🤔
-type StatType = 'number' | 'percent' | 'bytesPerSecond';
+import { LogsFetchDataResponse } from '../../../observability/public';
 
 export function getLogsHasDataFetcher(getStartServices: InfraClientCoreSetup['getStartServices']) {
   return async () => {
+    // if you need the data plugin, this is how you get it
     const [, startPlugins] = await getStartServices();
     const { data } = startPlugins;
+
+    // if you need a core dep, we need to pass in more than just getStartServices
+
     // perform query
     return true;
   };
@@ -22,27 +23,30 @@ export function getLogsHasDataFetcher(getStartServices: InfraClientCoreSetup['ge
 export function getLogsOverviewDataFetcher(
   getStartServices: InfraClientCoreSetup['getStartServices']
 ) {
-  return async () => {
+  return async (): Promise<LogsFetchDataResponse> => {
+    // if you need the data plugin, this is how you get it
     const [, startPlugins] = await getStartServices();
     const { data } = startPlugins;
 
+    // if you need a core dep, we need to pass in more than just getStartServices
+
     // perform query
     return {
       title: 'Log rate',
       appLink: 'TBD', // TODO: what format should this be in, relative I assume?
       stats: {
         nginx: {
-          type: 'number' as StatType, // TODO: this casting is a hack, we need to fix
+          type: 'number',
           label: 'nginx',
           value: 345341,
         },
         'elasticsearch.audit': {
-          type: 'number' as StatType,
+          type: 'number',
           label: 'elasticsearch.audit',
           value: 164929,
         },
         'haproxy.log': {
-          type: 'number' as StatType,
+          type: 'number',
           label: 'haproxy.log',
           value: 51101,
         },
@@ -56,31 +60,31 @@ export function getLogsOverviewDataFetcher(
         nginx: {
           label: 'nginx',
           coordinates: [
-            { x: '2020-06-24T12:00:00.000Z', y: 10014 },
-            { x: '2020-06-24T12:15:00.000Z', y: 12827 },
-            { x: '2020-06-24T12:30:00.000Z', y: 2946 },
-            { x: '2020-06-24T12:45:00.000Z', y: 14298 },
-            { x: '2020-06-24T13:00:00.000Z', y: 4096 },
+            { x: 1593000000000, y: 10014 },
+            { x: 1593000900000, y: 12827 },
+            { x: 1593001800000, y: 2946 },
+            { x: 1593002700000, y: 14298 },
+            { x: 1593003600000, y: 4096 },
           ],
         },
         'elasticsearch.audit': {
           label: 'elasticsearch.audit',
           coordinates: [
-            { x: '2020-06-24T12:00:00.000Z', y: 5676 },
-            { x: '2020-06-24T12:15:00.000Z', y: 6783 },
-            { x: '2020-06-24T12:30:00.000Z', y: 2394 },
-            { x: '2020-06-24T12:45:00.000Z', y: 4554 },
-            { x: '2020-06-24T13:00:00.000Z', y: 5659 },
+            { x: 1593000000000, y: 5676 },
+            { x: 1593000900000, y: 6783 },
+            { x: 1593001800000, y: 2394 },
+            { x: 1593002700000, y: 4554 },
+            { x: 1593003600000, y: 5659 },
           ],
         },
         'haproxy.log': {
           label: 'haproxy.log',
           coordinates: [
-            { x: '2020-06-24T12:00:00.000Z', y: 9085 },
-            { x: '2020-06-24T12:15:00.000Z', y: 9002 },
-            { x: '2020-06-24T12:30:00.000Z', y: 3940 },
-            { x: '2020-06-24T12:45:00.000Z', y: 5451 },
-            { x: '2020-06-24T13:00:00.000Z', y: 9133 },
+            { x: 1593000000000, y: 9085 },
+            { x: 1593000900000, y: 9002 },
+            { x: 1593001800000, y: 3940 },
+            { x: 1593002700000, y: 5451 },
+            { x: 1593003600000, y: 9133 },
           ],
         },
       },

x-pack/plugins/observability/public/typings/index.ts

@@ -6,3 +6,4 @@
 
 export * from './eui_draggable';
 export * from './eui_styled_components';
+export * from './fetch_data_response';