wip

Author: kdelemme

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

@@ -6,7 +6,7 @@
  */
 import { toBooleanRt } from '@kbn/io-ts-utils/src/to_boolean_rt';
 import * as t from 'io-ts';
-import { healthStatusSchema, sloDefinitionSchema, transformHealthSchema } from '../../schema';
+import { sloDefinitionSchema, transformHealthSchema } from '../../schema';
 
 const findSloDefinitionsParamsSchema = t.partial({
   query: t.partial({
@@ -21,7 +21,7 @@ const findSloDefinitionsParamsSchema = t.partial({
 
 const healthMetadataSchema = t.partial({
   health: t.type({
-    overall: healthStatusSchema,
+    isProblematic: t.boolean,
     rollup: transformHealthSchema,
     summary: transformHealthSchema,
   }),

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

@@ -5,7 +5,7 @@
  * 2.0.
  */
 import * as t from 'io-ts';
-import { healthStatusSchema, sloIdSchema, stateSchema, transformHealthSchema } from '../../schema';
+import { sloIdSchema, transformHealthSchema } from '../../schema';
 import { allOrAnyString } from '../../schema/common';
 
 const fetchSLOHealthResponseSchema = t.array(
@@ -14,11 +14,10 @@ const fetchSLOHealthResponseSchema = t.array(
     sloInstanceId: allOrAnyString,
     sloRevision: t.number,
     sloName: t.string,
-    state: stateSchema,
     health: t.type({
-      overall: transformHealthSchema,
-      rollup: healthStatusSchema,
-      summary: healthStatusSchema,
+      isProblematic: t.boolean,
+      rollup: transformHealthSchema,
+      summary: transformHealthSchema,
     }),
   })
 );
@@ -33,4 +32,4 @@ type FetchSLOHealthResponse = t.OutputOf<typeof fetchSLOHealthResponseSchema>;
 type FetchSLOHealthParams = t.TypeOf<typeof fetchSLOHealthParamsSchema.props.body>;
 
 export { fetchSLOHealthParamsSchema, fetchSLOHealthResponseSchema };
-export type { FetchSLOHealthResponse, FetchSLOHealthParams };
+export type { FetchSLOHealthParams, FetchSLOHealthResponse };

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

@@ -14,18 +14,24 @@ import * as t from 'io-ts';
  * If types need to diverge, they should be split into separate files.
  */
 
-const healthStatusSchema = t.union([t.literal('healthy'), t.literal('unhealthy')]);
-
-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'),
-  t.literal('indexing'),
-  t.literal('running'),
-  t.literal('stale'),
+const transformHealthSchema = t.intersection([
+  t.type({
+    isProblematic: t.boolean,
+    missing: t.boolean,
+    status: t.union([t.literal('healthy'), t.literal('unhealthy'), t.literal('unavailable')]),
+    state: t.union([
+      t.literal('stopped'),
+      t.literal('started'),
+      t.literal('stopping'),
+      t.literal('aborting'),
+      t.literal('failed'),
+      t.literal('indexing'),
+      t.literal('unavailable'),
+    ]),
+  }),
+  t.partial({
+    stateMatches: t.boolean,
+  }),
 ]);
 
-export { transformHealthSchema, healthStatusSchema, stateSchema };
+export { transformHealthSchema };

x-pack/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_health_callout.tsx

@@ -11,7 +11,6 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import kbnRison from '@kbn/rison';
 import type { SLOWithSummaryResponse } from '@kbn/slo-schema';
-import { values } from 'lodash';
 import React from 'react';
 import { getSLOSummaryTransformId, getSLOTransformId } from '../../../../common/constants';
 import { useActionModal } from '../../../context/action_modal';
@@ -57,7 +56,7 @@ export function SloHealthCallout({ slo }: { slo: SLOWithSummaryResponse }) {
   }
 
   const health = data[0].health;
-  if (health.overall === 'healthy') {
+  if (!health.isProblematic) {
     return null;
   }
 
@@ -67,20 +66,7 @@ export function SloHealthCallout({ slo }: { slo: SLOWithSummaryResponse }) {
   const rollupUrl = getUrl(rollupTransformId);
   const summaryUrl = getUrl(summaryTransformId);
 
-  const rollup = {
-    unhealthy: health.rollup.status === 'unhealthy',
-    missing: health.rollup.status === 'missing',
-    stopped: health.rollup.transformState === 'stopped',
-  };
-  const summary = {
-    unhealthy: health.summary.status === 'unhealthy',
-    missing: health.summary.status === 'missing',
-    stopped: health.summary.transformState === 'stopped',
-  };
-
-  const rollupHasIssue = values(rollup).some(Boolean);
-  const summaryHasIssue = values(summary).some(Boolean);
-  const count = [rollupHasIssue, summaryHasIssue].filter(Boolean).length;
+  const count = [health.rollup.isProblematic, health.summary.isProblematic].filter(Boolean).length;
 
   return (
     <EuiCallOut
@@ -98,20 +84,21 @@ export function SloHealthCallout({ slo }: { slo: SLOWithSummaryResponse }) {
             values={{ count }}
           />
           <ul>
-            {(rollup.unhealthy || rollup.stopped) && !!rollupUrl && (
-              <li>
-                <ContentWithInspectCta
-                  textSize="s"
-                  content={
-                    rollup.unhealthy
-                      ? getUnhealthyText(rollupTransformId)
-                      : getStoppedText(rollupTransformId)
-                  }
-                  url={rollupUrl}
-                />
-              </li>
-            )}
-            {rollup.missing && (
+            {(health.rollup.status === 'unhealthy' || health.rollup.stateMatches === false) &&
+              !!rollupUrl && (
+                <li>
+                  <ContentWithInspectCta
+                    textSize="s"
+                    content={
+                      health.rollup.status === 'unhealthy'
+                        ? getUnhealthyText(rollupTransformId)
+                        : getStateConflictText(rollupTransformId)
+                    }
+                    url={rollupUrl}
+                  />
+                </li>
+              )}
+            {health.rollup.missing && (
               <li>
                 <ContentWithResetCta
                   textSize="s"
@@ -121,20 +108,21 @@ export function SloHealthCallout({ slo }: { slo: SLOWithSummaryResponse }) {
               </li>
             )}
 
-            {(summary.unhealthy || summary.stopped) && !!summaryUrl && (
-              <li>
-                <ContentWithInspectCta
-                  textSize="s"
-                  content={
-                    summary.unhealthy
-                      ? getUnhealthyText(summaryTransformId)
-                      : getStoppedText(summaryTransformId)
-                  }
-                  url={summaryUrl}
-                />
-              </li>
-            )}
-            {summary.missing && (
+            {(health.summary.status === 'unhealthy' || health.summary.stateMatches === false) &&
+              !!summaryUrl && (
+                <li>
+                  <ContentWithInspectCta
+                    textSize="s"
+                    content={
+                      health.summary.status === 'unhealthy'
+                        ? getUnhealthyText(summaryTransformId)
+                        : getStateConflictText(rollupTransformId)
+                    }
+                    url={summaryUrl}
+                  />
+                </li>
+              )}
+            {health.summary.missing && (
               <li>
                 <ContentWithResetCta
                   textSize="s"
@@ -156,9 +144,9 @@ const getUnhealthyText = (transformId: string) =>
     values: { transformId },
   });
 
-const getStoppedText = (transformId: string) =>
-  i18n.translate('xpack.slo.sloDetails.healthCallout.stoppedTransformText', {
-    defaultMessage: '{transformId} (stopped)',
+const getStateConflictText = (transformId: string) =>
+  i18n.translate('xpack.slo.sloDetails.healthCallout.transformStateConflictText', {
+    defaultMessage: '{transformId} (conflicting state)',
     values: { transformId },
   });
 

x-pack/solutions/observability/plugins/slo/public/pages/slo_management/components/slo_management_table.tsx

@@ -278,7 +278,7 @@ export function SloManagementTable() {
           );
         }
 
-        return item.health.overall === 'healthy' ? (
+        return !item.health.isProblematic ? (
           <EuiHealth color="success">
             {i18n.translate('xpack.slo.sloManagementTable.columns.health.healthy', {
               defaultMessage: 'Healthy',

x-pack/solutions/observability/plugins/slo/public/pages/slos/components/health_callout/health_callout.tsx

@@ -23,6 +23,11 @@ export function HealthCallout({ sloList = [] }: { sloList: SLOWithSummaryRespons
   );
   const [isOpen, setIsOpen] = useState(false);
 
+  const dismiss = () => {
+    setShowCallOut(false);
+    sessionStorage.setItem('slo_health_callout_hidden', 'true');
+  };
+
   if (!showCallOut) {
     return null;
   }
@@ -31,18 +36,13 @@ export function HealthCallout({ sloList = [] }: { sloList: SLOWithSummaryRespons
     return null;
   }
 
-  const problematicSloList = results.filter((result) => result.health.overall !== 'healthy');
+  const problematicSloList = results.filter((result) => result.health.isProblematic);
   if (problematicSloList.length === 0) {
     return null;
   }
 
   const deduplicatedList = uniqBy(problematicSloList, (item) => item.sloId);
 
-  const dismiss = () => {
-    setShowCallOut(false);
-    sessionStorage.setItem('slo_health_callout_hidden', 'true');
-  };
-
   return (
     <EuiCallOut
       data-test-subj="sloHealthCallout"

x-pack/solutions/observability/plugins/slo/server/domain/models/health.ts

@@ -5,11 +5,9 @@
  * 2.0.
  */
 
-import type { healthStatusSchema, stateSchema, transformHealthSchema } from '@kbn/slo-schema';
+import type { transformHealthSchema } from '@kbn/slo-schema';
 import type * as t from 'io-ts';
 
 type TransformHealth = t.OutputOf<typeof transformHealthSchema>;
-type HealthStatus = t.OutputOf<typeof healthStatusSchema>;
-type State = t.OutputOf<typeof stateSchema>;
 
-export type { TransformHealth, HealthStatus, State };
+export type { TransformHealth };