- Closes elastic#64278 by removing the framework badge.

- changes anomaly score display to integer formatting - update link test to 'View anomalies'
ogupte · May 5, 2020 · 2f8f296 · 2f8f296
1 parent d56debc
commit 2f8f296
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
@@ -17,13 +17,12 @@ import { i18n } from '@kbn/i18n';
 import cytoscape from 'cytoscape';
 import React from 'react';
 import styled from 'styled-components';
-import { SERVICE_FRAMEWORK_NAME } from '../../../../../common/elasticsearch_fieldnames';
 import { Buttons } from './Buttons';
 import { Info } from './Info';
 import { ServiceMetricFetcher } from './ServiceMetricFetcher';
 import { MLJobLink } from '../../../shared/Links/MachineLearningLinks/MLJobLink';
 import { getSeverityColor } from '../cytoscapeOptions';
-import { asDecimal } from '../../../../utils/formatters';
+import { asInteger } from '../../../../utils/formatters';
 import { getMetricChangeDescription } from '../../../../../../ml/public';
 
 const popoverMinWidth = 280;
@@ -98,7 +97,7 @@ const ANOMALY_DETECTION_SCORE_METRIC = i18n.translate(
 
 const ANOMALY_DETECTION_LINK = i18n.translate(
   'xpack.apm.serviceMap.anomalyDetectionPopoverLink',
-  { defaultMessage: 'View in Anomaly Explorer' }
+  { defaultMessage: 'View anomalies' }
 );
 
 export function Contents({
@@ -108,8 +107,6 @@ export function Contents({
   onFocusClick,
   selectedNodeServiceName
 }: ContentsProps) {
-  const frameworkName = selectedNodeData[SERVICE_FRAMEWORK_NAME];
-
   // Anomaly Detection
   const severity = selectedNodeData.severity;
   const maxScore = selectedNodeData.max_score;
@@ -158,7 +155,7 @@ export function Contents({
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <div>
-                  {asDecimal(maxScore)}
+                  {asInteger(maxScore)}
                   <SubduedText>&nbsp;({anomalyDescription})</SubduedText>
                 </div>
               </EuiFlexItem>
@@ -174,10 +171,7 @@ export function Contents({
       )}
       <FlexColumnItem>
         {isService ? (
-          <ServiceMetricFetcher
-            frameworkName={frameworkName}
-            serviceName={selectedNodeServiceName}
-          />
+          <ServiceMetricFetcher serviceName={selectedNodeServiceName} />
         ) : (
           <Info {...selectedNodeData} />
         )}

diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
@@ -16,7 +16,6 @@ storiesOf('app/ServiceMap/Popover/ServiceMetricList', module)
       avgRequestsPerMinute={164.47222031860858}
       avgCpuUsage={0.32809666568309237}
       avgMemoryUsage={0.5504868173242986}
-      frameworkName="Spring"
       numInstances={2}
       isLoading={false}
     />

diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceMetricFetcher.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceMetricFetcher.tsx
@@ -11,12 +11,10 @@ import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { ServiceMetricList } from './ServiceMetricList';
 
 interface ServiceMetricFetcherProps {
-  frameworkName?: string;
   serviceName: string;
 }
 
 export function ServiceMetricFetcher({
-  frameworkName,
   serviceName
 }: ServiceMetricFetcherProps) {
   const {
@@ -39,11 +37,5 @@ export function ServiceMetricFetcher({
   );
   const isLoading = status === 'loading';
 
-  return (
-    <ServiceMetricList
-      {...data}
-      frameworkName={frameworkName}
-      isLoading={isLoading}
-    />
-  );
+  return <ServiceMetricList {...data} isLoading={isLoading} />;
 }
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceMetricList.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceMetricList.tsx
@@ -48,7 +48,6 @@ export const ItemDescription = styled('td')`
 `;
 
 interface ServiceMetricListProps extends ServiceNodeMetrics {
-  frameworkName?: string;
   isLoading: boolean;
 }
 
@@ -58,7 +57,6 @@ export function ServiceMetricList({
   avgErrorsPerMinute,
   avgCpuUsage,
   avgMemoryUsage,
-  frameworkName,
   numInstances,
   isLoading
 }: ServiceMetricListProps) {
@@ -112,7 +110,7 @@ export function ServiceMetricList({
         : null
     }
   ];
-  const showBadgeRow = frameworkName || numInstances > 1;
+  const showBadgeRow = numInstances > 1;
 
   return isLoading ? (
     <LoadingSpinner />
@@ -121,7 +119,6 @@ export function ServiceMetricList({
       {showBadgeRow && (
         <BadgeRow>
           <EuiFlexGroup gutterSize="none">
-            {frameworkName && <EuiBadge>{frameworkName}</EuiBadge>}
             {numInstances > 1 && (
               <EuiBadge iconType="apps" color="hollow">
                 {i18n.translate('xpack.apm.serviceMap.numInstancesMetric', {