Merge branch 'master' of https://github.com/elastic/kibana into jvm-m…

…emory-usage
elastic · Oct 2, 2020 · 14c456e · 14c456e
2 parents 509be7e + e92a4ab
commit 14c456e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts
@@ -54,6 +54,22 @@ export function getServiceHealthStatusColor(
   }
 }
 
+export function getServiceHealthStatusBadgeColor(
+  theme: EuiTheme,
+  status: ServiceHealthStatus
+) {
+  switch (status) {
+    case ServiceHealthStatus.healthy:
+      return theme.eui.euiColorVis0_behindText;
+    case ServiceHealthStatus.warning:
+      return theme.eui.euiColorVis5_behindText;
+    case ServiceHealthStatus.critical:
+      return theme.eui.euiColorVis9_behindText;
+    case ServiceHealthStatus.unknown:
+      return theme.eui.euiColorMediumShade;
+  }
+}
+
 export function getServiceHealthStatusLabel(status: ServiceHealthStatus) {
   switch (status) {
     case ServiceHealthStatus.critical:

diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx b/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { EuiBadge } from '@elastic/eui';
 import {
-  getServiceHealthStatusColor,
+  getServiceHealthStatusBadgeColor,
   getServiceHealthStatusLabel,
   ServiceHealthStatus,
 } from '../../../../../common/service_health_status';
@@ -20,7 +20,7 @@ export function HealthBadge({
   const theme = useTheme();
 
   return (
-    <EuiBadge color={getServiceHealthStatusColor(theme, healthStatus)}>
+    <EuiBadge color={getServiceHealthStatusBadgeColor(theme, healthStatus)}>
       {getServiceHealthStatusLabel(healthStatus)}
     </EuiBadge>
   );

diff --git a/...ublic/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/...ublic/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap