[Monitoring] Fix issue with ES node detail status (#72298)

* Fix issue with ES node detail status * Add test
elastic · Jul 17, 2020 · f0d3cb9 · f0d3cb9
1 parent f487867
commit f0d3cb9
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 6 deletions.
diff --git a/x-pack/plugins/monitoring/public/alerts/status.tsx b/x-pack/plugins/monitoring/public/alerts/status.tsx
@@ -20,6 +20,10 @@ interface Props {
 export const AlertsStatus: React.FC<Props> = (props: Props) => {
   const { alerts, showBadge = false, showOnlyCount = false } = props;
 
+  if (!alerts) {
+    return null;
+  }
+
   let atLeastOneDanger = false;
   const count = Object.values(alerts).reduce((cnt, alertStatus) => {
     if (alertStatus.states.length) {

diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js
@@ -19,7 +19,7 @@ import { NodeDetailStatus } from '../node_detail_status';
 import { MonitoringTimeseriesContainer } from '../../chart';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-export const AdvancedNode = ({ nodeSummary, metrics, ...props }) => {
+export const AdvancedNode = ({ nodeSummary, metrics, alerts, ...props }) => {
   const metricsToShow = [
     metrics.node_gc,
     metrics.node_gc_time,
@@ -50,7 +50,7 @@ export const AdvancedNode = ({ nodeSummary, metrics, ...props }) => {
           </h1>
         </EuiScreenReaderOnly>
         <EuiPanel>
-          <NodeDetailStatus stats={nodeSummary} />
+          <NodeDetailStatus stats={nodeSummary} alerts={alerts} />
         </EuiPanel>
         <EuiSpacer size="m" />
         <EuiPageContent>

diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node_detail_status/index.js
@@ -9,8 +9,9 @@ import { SummaryStatus } from '../../summary_status';
 import { NodeStatusIcon } from '../node';
 import { formatMetric } from '../../../lib/format_number';
 import { i18n } from '@kbn/i18n';
+import { AlertsStatus } from '../../../alerts/status';
 
-export function NodeDetailStatus({ stats, alerts }) {
+export function NodeDetailStatus({ stats, alerts = {} }) {
   const {
     transport_address: transportAddress,
     usedHeap,
@@ -29,8 +30,10 @@ export function NodeDetailStatus({ stats, alerts }) {
 
   const metrics = [
     {
-      label: 'Alerts',
-      value: <span>{Object.values(alerts).length}</span>,
+      label: i18n.translate('xpack.monitoring.elasticsearch.nodeDetailStatus.alerts', {
+        defaultMessage: 'Alerts',
+      }),
+      value: <AlertsStatus alerts={alerts} showOnlyCount={true} />,
     },
     {
       label: i18n.translate('xpack.monitoring.elasticsearch.nodeDetailStatus.transportAddress', {

diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -90,6 +90,7 @@
       </a>
       <a
         ng-if="monitoringMain.instance && (monitoringMain.name === 'nodes' || monitoringMain.name === 'indices')"
+        data-test-subj="esNodeDetailAdvancedLink"
         kbn-href="#/elasticsearch/{{ monitoringMain.name }}/{{ monitoringMain.resolver }}/advanced"
         class="euiTab"
         ng-class="{'euiTab-isSelected': monitoringMain.page === 'advanced'}"

diff --git a/x-pack/plugins/monitoring/public/views/elasticsearch/node/advanced/index.js b/x-pack/plugins/monitoring/public/views/elasticsearch/node/advanced/index.js
@@ -16,7 +16,7 @@ import template from './index.html';
 import { Legacy } from '../../../../legacy_shims';
 import { AdvancedNode } from '../../../../components/elasticsearch/node/advanced';
 import { MonitoringViewBaseController } from '../../../base_controller';
-import { CODE_PATH_ELASTICSEARCH } from '../../../../../common/constants';
+import { CODE_PATH_ELASTICSEARCH, ALERT_CPU_USAGE } from '../../../../../common/constants';
 
 function getPageData($injector) {
   const $http = $injector.get('$http');
@@ -53,12 +53,26 @@ uiRoutes.when('/elasticsearch/nodes/:node/advanced', {
   },
   controller: class extends MonitoringViewBaseController {
     constructor($injector, $scope) {
+      const $route = $injector.get('$route');
+      const nodeName = $route.current.params.node;
+
       super({
         defaultData: {},
         getPageData,
         reactNodeId: 'monitoringElasticsearchAdvancedNodeApp',
         $scope,
         $injector,
+        alerts: {
+          shouldFetch: true,
+          options: {
+            alertTypeIds: [ALERT_CPU_USAGE],
+            filters: [
+              {
+                nodeUuid: nodeName,
+              },
+            ],
+          },
+        },
       });
 
       $scope.$watch(
@@ -80,6 +94,7 @@ uiRoutes.when('/elasticsearch/nodes/:node/advanced', {
           this.renderReact(
             <AdvancedNode
               nodeSummary={data.nodeSummary}
+              alerts={this.alerts}
               metrics={data.metrics}
               onBrush={this.onBrush}
               zoomInfo={this.zoomInfo}

diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
@@ -103,5 +103,64 @@ export default function ({ getService, getPageObjects }) {
         });
       });
     });
+
+    describe('Advanced', () => {
+      describe('Active Nodes', () => {
+        const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+
+        before(async () => {
+          await setup('monitoring/singlecluster-three-nodes-shard-relocation', {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          });
+
+          // go to nodes listing
+          await overview.clickEsNodes();
+          expect(await nodesList.isOnListing()).to.be(true);
+        });
+
+        after(async () => {
+          await tearDown();
+        });
+
+        afterEach(async () => {
+          await PageObjects.monitoring.clickBreadcrumb('~breadcrumbEsNodes'); // return back for next test
+        });
+
+        it('should show node summary of master node with 20 indices and 38 shards', async () => {
+          await nodesList.clickRowByResolver('jUT5KdxfRbORSCWkb5zjmA');
+          await nodeDetail.clickAdvanced();
+
+          expect(await nodeDetail.getSummary()).to.eql({
+            transportAddress: 'Transport Address\n127.0.0.1:9300',
+            jvmHeap: 'JVM Heap\n29%',
+            freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
+            documentCount: 'Documents\n24.8k',
+            dataSize: 'Data\n50.4 MB',
+            indicesCount: 'Indices\n20',
+            shardsCount: 'Shards\n38',
+            nodeType: 'Type\nMaster Node',
+            status: 'Status: Online',
+          });
+        });
+
+        it('should show node summary of data node with 4 indices and 4 shards', async () => {
+          await nodesList.clickRowByResolver('bwQWH-7IQY-mFPpfoaoFXQ');
+          await nodeDetail.clickAdvanced();
+
+          expect(await nodeDetail.getSummary()).to.eql({
+            transportAddress: 'Transport Address\n127.0.0.1:9302',
+            jvmHeap: 'JVM Heap\n17%',
+            freeDiskSpace: 'Free Disk Space\n173.9 GB (37.42%)',
+            documentCount: 'Documents\n240',
+            dataSize: 'Data\n1.4 MB',
+            indicesCount: 'Indices\n4',
+            shardsCount: 'Shards\n4',
+            nodeType: 'Type\nNode',
+            status: 'Status: Online',
+          });
+        });
+      });
+    });
   });
 }
diff --git a/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js b/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js
@@ -19,6 +19,10 @@ export function MonitoringElasticsearchNodeDetailProvider({ getService }) {
   const SUBJ_SUMMARY_STATUS = `${SUBJ_SUMMARY} > statusIcon`;
 
   return new (class ElasticsearchNodeDetail {
+    async clickAdvanced() {
+      return testSubjects.click('esNodeDetailAdvancedLink');
+    }
+
     async getSummary() {
       return {
         transportAddress: await testSubjects.getVisibleText(SUBJ_SUMMARY_TRANSPORT_ADDRESS),