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

Reflect upstream load average change 

This commit addresses the handling of load averages in Marvel due to
upstream changes in core Elasticsearch where the load average field was
changed from an array to an object.

Original commit: elastic/x-pack-elasticsearch@9ea57968bb
This commit is contained in:
Jason Tedor 2016-01-18 15:49:32 -05:00
parent d713f203ad
commit 69ee9d77ad
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRenderer.java
View File

@ -36,7 +36,7 @@ public class NodeStatsRenderer extends AbstractRenderer<NodeStatsMarvelDoc> {
"node_stats.fs.total.total_in_bytes",
"node_stats.fs.total.free_in_bytes",
"node_stats.fs.total.available_in_bytes",
"node_stats.os.cpu.load_average",
"node_stats.os.cpu.load_average.1m",
"node_stats.process.cpu.percent",
"node_stats.process.max_file_descriptors",
"node_stats.process.open_file_descriptors",

8
elasticsearch/x-pack/marvel/src/test/resources/samples/node_stats.json
View File

@ -30,11 +30,9 @@
},
"os": {
"cpu": {
"load_average": [
0.66,
0.87,
1.28
]
"load_average": {
"1m": 0.66
}
}
},
"process": {