cleanup

elastic · Oct 18, 2018 · 55200ca · 55200ca
1 parent 89efc5f
commit 55200ca
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/x-pack/plugins/monitoring/public/views/elasticsearch/index/advanced/index.html b/x-pack/plugins/monitoring/public/views/elasticsearch/index/advanced/index.html
@@ -19,7 +19,6 @@
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.index_disk"/></div>
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.index_segment_count"/></div>
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.index_latency"/></div>
-      <div class="col-md-6"><monitoring-chart series="pageData.metrics.query_latency"/></div>
     </div>
   </div>
 </monitoring-main>
diff --git a/x-pack/plugins/monitoring/public/views/elasticsearch/node/advanced/index.html b/x-pack/plugins/monitoring/public/views/elasticsearch/node/advanced/index.html
@@ -25,8 +25,7 @@
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_read_threads"/></div>
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_cgroup_cpu"/></div>
       <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_cgroup_stats"/></div>
-      <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_index_latency"/></div>
-      <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_query_latency"/></div>
+      <div class="col-md-6"><monitoring-chart series="pageData.metrics.node_latency"/></div>
     </div>
   </div>
 </monitoring-main>
diff --git a/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js
@@ -70,7 +70,7 @@ export const metrics = {
       'Average latency for indexing documents, which is time it takes to index documents divided by number that were indexed. This considers any shard located on this node, including replicas.', // eslint-disable-line max-len
     type: 'node'
   }),
-  index_latency: new LatencyMetric({
+  index_index_latency: new LatencyMetric({
     metric: 'index',
     fieldSource: 'index_stats.primaries',
     field: 'index_stats.primaries.indexing.index_total',
@@ -98,7 +98,7 @@ export const metrics = {
       'Average latency for searching, which is time it takes to execute searches divided by number of searches submitted. This considers primary and replica shards.', // eslint-disable-line max-len
     type: 'node'
   }),
-  query_latency: new LatencyMetric({
+  index_query_latency: new LatencyMetric({
     metric: 'query',
     fieldSource: 'index_stats.total',
     field: 'index_stats.total.search.query_total',

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js
@@ -77,12 +77,8 @@ export const metricSet = {
       name: 'index_segment_count'
     },
     {
-      keys: ['index_latency'],
+      keys: ['index_index_latency', 'index_query_latency'],
       name: 'index_latency'
-    },
-    {
-      keys: ['query_latency'],
-      name: 'query_latency'
     }
   ],
   overview: [

diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js
@@ -90,12 +90,8 @@ export const metricSets = {
       name: 'node_cgroup_stats'
     },
     {
-      keys: ['node_index_latency'],
-      name: 'node_index_latency'
-    },
-    {
-      keys: ['node_query_latency'],
-      name: 'node_query_latency'
+      keys: ['node_query_latency', 'node_index_latency'],
+      name: 'node_latency'
     }
   ],
   overview: [