wip: uncomplete type refactoring

Author: kdelemme

x-pack/platform/packages/shared/kbn-slo-schema/src/rest_specs/routes/find_definition.ts

@@ -21,9 +21,9 @@ const findSloDefinitionsParamsSchema = t.partial({
 
 const healthMetadataSchema = t.partial({
   health: t.type({
-    overall: transformHealthSchema,
-    rollup: healthStatusSchema,
-    summary: healthStatusSchema,
+    overall: healthStatusSchema,
+    rollup: transformHealthSchema,
+    summary: transformHealthSchema,
   }),
 });
 

x-pack/platform/packages/shared/kbn-slo-schema/src/schema/health.ts

@@ -14,20 +14,12 @@ import * as t from 'io-ts';
  * If types need to diverge, they should be split into separate files.
  */
 
-const transformHealthSchema = t.union([
-  t.literal('healthy'),
-  t.literal('unhealthy'),
-  t.literal('missing'),
-]);
+const healthStatusSchema = t.union([t.literal('healthy'), t.literal('unhealthy')]);
 
-const healthStatusSchema = t.intersection([
-  t.partial({
-    transformState: t.union([t.literal('stopped'), t.literal('started')]),
-  }),
-  t.type({
-    status: transformHealthSchema,
-  }),
-]);
+const transformHealthSchema = t.type({
+  status: t.union([t.literal('healthy'), t.literal('unhealthy'), t.literal('missing')]),
+  state: t.union([t.literal('stopped'), t.literal('started'), t.literal('unavailable')]),
+});
 
 const stateSchema = t.union([
   t.literal('no_data'),

x-pack/solutions/observability/plugins/slo/server/domain/services/compute_health.ts

@@ -24,6 +24,7 @@ interface Item {
   instanceId?: string;
   revision: number;
   name: string;
+  enabled: boolean;
 }
 
 interface Dependencies {
@@ -37,9 +38,9 @@ export interface SLOHealth {
   sloName: string;
   state: State;
   health: {
-    overall: TransformHealth;
-    rollup: HealthStatus;
-    summary: HealthStatus;
+    overall: HealthStatus;
+    rollup: TransformHealth;
+    summary: TransformHealth;
   };
 }
 
@@ -49,11 +50,11 @@ const STALE_THRESHOLD_MINUTES = 2 * 24 * 60;
 export async function computeHealth(list: Item[], deps: Dependencies): Promise<SLOHealth[]> {
   const [summaryDocsById, transformStatsById] = await Promise.all([
     getSummaryDocsById(list, deps),
-    getTransformStats(list, deps),
+    getTransformStatsById(list, deps),
   ]);
 
   return list.map((item) => {
-    const health = computeTransformHealth(transformStatsById, item);
+    const health = computeTransformsHealth(transformStatsById, item);
     const state = computeTransformState(summaryDocsById, item);
 
     return {
@@ -92,7 +93,7 @@ async function getSummaryDocsById(list: Item[], deps: Dependencies) {
   return summaryDocsById;
 }
 
-async function getTransformStats(
+async function getTransformStatsById(
   list: Item[],
   deps: Dependencies
 ): Promise<Dictionary<TransformGetTransformStatsTransformStats>> {
@@ -144,38 +145,47 @@ function computeTransformState(
 
 function getTransformHealth(
   transformStat?: TransformGetTransformStatsTransformStats
-): HealthStatus {
+): TransformHealth {
   if (!transformStat) {
     return {
       status: 'missing',
+      state: 'unavailable',
     };
   }
+
+  const transformStatus = transformStat.health?.status?.toLowerCase();
   const transformState = transformStat.state?.toLowerCase();
-  return transformStat.health?.status?.toLowerCase() === 'green'
-    ? {
-        status: 'healthy',
-        transformState: transformState as HealthStatus['transformState'],
-      }
-    : {
-        status: 'unhealthy',
-        transformState: transformState as HealthStatus['transformState'],
-      };
+
+  return {
+    status: transformStatus === 'green' ? 'healthy' : 'unhealthy',
+    state:
+      transformState === 'started'
+        ? 'started'
+        : transformState === 'stopped'
+        ? 'stopped'
+        : 'unavailable',
+  };
 }
 
-function computeTransformHealth(
+function computeTransformsHealth(
   transformStatsById: Dictionary<TransformGetTransformStatsTransformStats>,
   item: Item
-): { overall: 'healthy' | 'unhealthy'; rollup: HealthStatus; summary: HealthStatus } {
+): { overall: HealthStatus; rollup: TransformHealth; summary: TransformHealth } {
   const rollup = getTransformHealth(transformStatsById[getSLOTransformId(item.id, item.revision)]);
   const summary = getTransformHealth(
     transformStatsById[getSLOSummaryTransformId(item.id, item.revision)]
   );
 
-  const overall: 'healthy' | 'unhealthy' =
+  const rollupStateMatchesSloEnabled =
+    (item.enabled && rollup.state === 'started') || (!item.enabled && rollup.state === 'stopped');
+  const summaryStateMatchesSloEnabled =
+    (item.enabled && rollup.state === 'started') || (!item.enabled && rollup.state === 'stopped');
+
+  const overall: HealthStatus =
     rollup.status === 'healthy' &&
-    rollup.transformState === 'started' &&
+    rollupStateMatchesSloEnabled &&
     summary.status === 'healthy' &&
-    summary.transformState === 'started'
+    summaryStateMatchesSloEnabled
       ? 'healthy'
       : 'unhealthy';
 

x-pack/solutions/observability/plugins/slo/server/services/get_slo_health.ts

@@ -30,6 +30,7 @@ export class GetSLOHealth {
         instanceId: item.sloInstanceId,
         revision: definitionById[item.sloId].revision,
         name: definitionById[item.sloId].name,
+        enabled: definitionById[item.sloId].enabled,
       }));
 
     const results = await computeHealth(list, { scopedClusterClient: this.scopedClusterClient });