honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Monitoring UI] Use same Index Memory chart for Index page as Node page 

This provides the same -- more useful -- index memory chart to the index page, instead of just "Lucene Memory", it now breaks down what it shows just like the Node page as as more generalized "Index Memory" chart. It also rolls Fielddata into the Index Memory. With Fielddata now in the Index Memory chart, I decided to add the Segment Count chart to the Index page.

Original commit: elastic/x-pack-elasticsearch@4e3490ce9c
This commit is contained in:
Chris Earle 2016-07-11 11:56:46 -04:00
parent 7e4b200f43
commit 4224d70986
4 changed files with 151 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/agent/collector/indices/IndexStatsCollector.java
View File

@ -68,6 +68,8 @@ public class IndexStatsCollector extends AbstractCollector {
.setSegments(true)
.setStore(true)
.setRefresh(true)
.setQueryCache(true)
.setRequestCache(true)
.get(monitoringSettings.indexStatsTimeout());
long timestamp = System.currentTimeMillis();

20
elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/agent/resolver/indices/IndexStatsResolver.java
View File

@ -26,12 +26,22 @@ public class IndexStatsResolver extends MonitoringIndexNameResolver.Timestamped<
"index_stats.index",
"index_stats.primaries.docs.count",
"index_stats.primaries.fielddata.memory_size_in_bytes",
"index_stats.primaries.fielddata.evictions",
"index_stats.primaries.indexing.index_total",
"index_stats.primaries.indexing.index_time_in_millis",
"index_stats.primaries.indexing.throttle_time_in_millis",
"index_stats.primaries.merges.total_size_in_bytes",
"index_stats.primaries.query_cache.memory_size_in_bytes",
"index_stats.primaries.query_cache.evictions",
"index_stats.primaries.query_cache.hit_count",
"index_stats.primaries.query_cache.miss_count",
"index_stats.primaries.request_cache.memory_size_in_bytes",
"index_stats.primaries.request_cache.evictions",
"index_stats.primaries.request_cache.hit_count",
"index_stats.primaries.request_cache.miss_count",
"index_stats.primaries.search.query_total",
"index_stats.primaries.search.query_time_in_millis",
"index_stats.primaries.segments.count",
"index_stats.primaries.segments.memory_in_bytes",
"index_stats.primaries.segments.terms_memory_in_bytes",
"index_stats.primaries.segments.stored_fields_memory_in_bytes",
@ -47,12 +57,22 @@ public class IndexStatsResolver extends MonitoringIndexNameResolver.Timestamped<
"index_stats.primaries.refresh.total_time_in_millis",
"index_stats.total.docs.count",
"index_stats.total.fielddata.memory_size_in_bytes",
"index_stats.total.fielddata.evictions",
"index_stats.total.indexing.index_total",
"index_stats.total.indexing.index_time_in_millis",
"index_stats.total.indexing.throttle_time_in_millis",
"index_stats.total.merges.total_size_in_bytes",
"index_stats.total.query_cache.memory_size_in_bytes",
"index_stats.total.query_cache.evictions",
"index_stats.total.query_cache.hit_count",
"index_stats.total.query_cache.miss_count",
"index_stats.total.request_cache.memory_size_in_bytes",
"index_stats.total.request_cache.evictions",
"index_stats.total.request_cache.hit_count",
"index_stats.total.request_cache.miss_count",
"index_stats.total.search.query_total",
"index_stats.total.search.query_time_in_millis",
"index_stats.total.segments.count",
"index_stats.total.segments.memory_in_bytes",
"index_stats.total.segments.terms_memory_in_bytes",
"index_stats.total.segments.stored_fields_memory_in_bytes",

10
elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/agent/resolver/node/NodeStatsResolver.java
View File

@ -32,11 +32,21 @@ public class NodeStatsResolver extends MonitoringIndexNameResolver.Timestamped<N
"node_stats.disk_threshold_watermark_high",
// Node Stats
"node_stats.indices.docs.count",
"node_stats.indices.fielddata.memory_size_in_bytes",
"node_stats.indices.fielddata.evictions",
"node_stats.indices.store.size_in_bytes",
"node_stats.indices.store.throttle_time_in_millis",
"node_stats.indices.indexing.throttle_time_in_millis",
"node_stats.indices.indexing.index_total",
"node_stats.indices.indexing.index_time_in_millis",
"node_stats.indices.query_cache.memory_size_in_bytes",
"node_stats.indices.query_cache.evictions",
"node_stats.indices.query_cache.hit_count",
"node_stats.indices.query_cache.miss_count",
"node_stats.indices.request_cache.memory_size_in_bytes",
"node_stats.indices.request_cache.evictions",
"node_stats.indices.request_cache.hit_count",
"node_stats.indices.request_cache.miss_count",
"node_stats.indices.search.query_total",
"node_stats.indices.search.query_time_in_millis",
"node_stats.indices.segments.count",

120
elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json
View File

@ -109,6 +109,9 @@
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
}
}
},
@ -142,6 +145,38 @@
}
}
},
"query_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"request_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"search": {
"properties": {
"query_total": {
@ -154,6 +189,9 @@
},
"segments": {
"properties": {
"count": {
"type": "integer"
},
"memory_in_bytes": {
"type": "long"
},
@ -205,6 +243,9 @@
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
}
}
},
@ -238,6 +279,38 @@
}
}
},
"query_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"request_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"search": {
"properties": {
"query_total": {
@ -250,6 +323,9 @@
},
"segments": {
"properties": {
"count": {
"type": "integer"
},
"memory_in_bytes": {
"type": "long"
},
@ -374,6 +450,16 @@
}
}
},
"fielddata" : {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
}
}
},
"indexing": {
"properties": {
"index_time_in_millis": {
@ -387,6 +473,38 @@
}
}
},
"query_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"request_cache": {
"properties": {
"memory_size_in_bytes": {
"type": "long"
},
"evictions": {
"type": "long"
},
"hit_count": {
"type": "long"
},
"miss_count": {
"type": "long"
}
}
},
"search": {
"properties": {
"query_time_in_millis": {
@ -400,7 +518,7 @@
"segments": {
"properties": {
"count": {
"type": "long"
"type": "integer"
},
"memory_in_bytes": {
"type": "long"