More tweaks

x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/ccr_shard.js

@@ -128,7 +128,7 @@ export class CcrShard extends PureComponent {
     const { stat, oldestStat, formattedLeader, alerts } = this.props;
 
     return (
-      <EuiPage style={{ backgroundColor: 'white' }}>
+      <EuiPage>
         <EuiPageBody>
           <EuiPanel>
             <Status

x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/status.js

@@ -6,23 +6,21 @@
  */
 
 import React from 'react';
+import { get } from 'lodash';
 import { SummaryStatus } from '../../summary_status';
 import { formatMetric } from '../../../lib/format_number';
 import { i18n } from '@kbn/i18n';
 import { AlertsStatus } from '../../../alerts/status';
 
 export function Status({ stat, formattedLeader, oldestStat, alerts = {} }) {
-  const {
-    follower_index: followerIndex,
-    shard_id: shardId,
-    operations_written: operationsReceived,
-    failed_read_requests: failedFetches,
-  } = stat;
-
-  const {
-    operations_written: oldestOperationsReceived,
-    failed_read_requests: oldestFailedFetches,
-  } = oldestStat;
+  const followerIndex = stat.follower_index || get(stat, 'follower.index');
+  const shardId = stat.shard_id || get(stat, 'follower.shard.number');
+  const operationsReceived = stat.operations_written || get(stat, 'follower.operations_written');
+  const failedFetches = stat.failed_read_requests || get(stat, 'requests.failed.read.count');
+  const oldestOperationsReceived =
+    oldestStat.operations_written || get(oldestStat, 'follower.operations_written');
+  const oldestFailedFetches =
+    oldestStat.failed_read_requests || get(oldestStat, 'requests.failed.read.count');
 
   const metrics = [
     {

x-pack/plugins/monitoring/public/directives/elasticsearch/ml_job_listing/index.js

@@ -116,6 +116,7 @@ export function monitoringMlListingProvider() {
           if (job.ml) {
             return {
               ...job.ml.job,
+              node: job.node,
               job_id: job.ml.job.id,
             };
           }

x-pack/plugins/monitoring/server/lib/alerts/fetch_cluster_health.ts

@@ -6,7 +6,7 @@
  */
 import { ElasticsearchClient } from 'kibana/server';
 import { AlertCluster, AlertClusterHealth } from '../../../common/types/alerts';
-import { ElasticsearchSource } from '../../../common/types/es';
+import { ElasticsearchSource, ElasticsearchResponse } from '../../../common/types/es';
 
 export async function fetchClusterHealth(
   esClient: ElasticsearchClient,
@@ -59,8 +59,9 @@ export async function fetchClusterHealth(
     },
   };
 
-  const { body: response } = await esClient.search<ElasticsearchSource>(params);
-  return response.hits.hits.map((hit) => {
+  const result = await esClient.search<ElasticsearchSource>(params);
+  const response: ElasticsearchResponse = result.body as ElasticsearchResponse;
+  return (response.hits?.hits ?? []).map((hit) => {
     return {
       health: hit._source!.cluster_state?.status,
       clusterUuid: hit._source!.cluster_uuid,

x-pack/plugins/monitoring/server/lib/alerts/fetch_elasticsearch_versions.ts

@@ -6,7 +6,7 @@
  */
 import { ElasticsearchClient } from 'kibana/server';
 import { AlertCluster, AlertVersions } from '../../../common/types/alerts';
-import { ElasticsearchSource } from '../../../common/types/es';
+import { ElasticsearchSource, ElasticsearchResponse } from '../../../common/types/es';
 
 export async function fetchElasticsearchVersions(
   esClient: ElasticsearchClient,
@@ -60,8 +60,9 @@ export async function fetchElasticsearchVersions(
     },
   };
 
-  const { body: response } = await esClient.search<ElasticsearchSource>(params);
-  return response.hits.hits.map((hit) => {
+  const result = await esClient.search<ElasticsearchSource>(params);
+  const response: ElasticsearchResponse = result.body as ElasticsearchResponse;
+  return (response.hits?.hits ?? []).map((hit) => {
     const versions = hit._source!.cluster_stats?.nodes?.versions ?? [];
     return {
       versions,

x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.ts

@@ -21,7 +21,18 @@ import { LegacyRequest } from '../../types';
  */
 export function handleResponse(response: ElasticsearchResponse) {
   const hits = response.hits?.hits;
-  return hits?.map((hit) => hit._source.job_stats ?? hit._source.elasticsearch) ?? [];
+  return (
+    hits?.map((hit) => {
+      const job = hit._source.job_stats ?? hit._source.elasticsearch;
+      return {
+        ...job,
+        node: {
+          ...job?.node,
+          name: job?.node?.name ?? job?.node?.id,
+        },
+      };
+    }) ?? []
+  );
 }
 
 export function getMlJobs(req: LegacyRequest, esIndexPattern: string) {

x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.ts

@@ -43,7 +43,7 @@ async function getCcrStat(req: LegacyRequest, esIndexPattern: string, filters: u
       'hits.hits.inner_hits.oldest.hits.hits._source.ccr_stats.operations_written',
       'hits.hits.inner_hits.oldest.hits.hits._source.elasticsearch.ccr.follower.operations_written',
       'hits.hits.inner_hits.oldest.hits.hits._source.ccr_stats.failed_read_requests',
-      'hits.hits.inner_hits.oldest.hits.hits._source.elasticsearch.ccr.follower.failed_read_requests',
+      'hits.hits.inner_hits.oldest.hits.hits._source.elasticsearch.ccr.requests.failed.read.count',
     ],
     body: {
       sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],