From bb5ff7ab36276919fdb77008be7a887c21285e4d Mon Sep 17 00:00:00 2001
From: Chris Earle <chris.earle@elastic.co>
Date: Thu, 1 Sep 2016 18:12:00 -0400
Subject: [PATCH] Fix test on Linux; setting name missing 'total.'

Original commit: elastic/x-pack-elasticsearch@de0183b3ef55be38b17b2769ce82e4d3bdf9367e
---
 .../resolver/node/NodeStatsResolver.java      | 10 +++---
 .../src/main/resources/monitoring-es.json     | 32 +++++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
index e608ee270db..48898c800c3 100644
--- a/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
+++ b/elasticsearch/x-pack/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/resolver/node/NodeStatsResolver.java
@@ -103,11 +103,11 @@ public class NodeStatsResolver extends MonitoringIndexNameResolver.Timestamped<N
             // Disk Info
             "node_stats.fs.data.spins",
             // Node IO Stats
-            "node_stats.fs.io_stats.operations",
-            "node_stats.fs.io_stats.read_operations",
-            "node_stats.fs.io_stats.write_operations",
-            "node_stats.fs.io_stats.read_kilobytes",
-            "node_stats.fs.io_stats.write_kilobytes");
+            "node_stats.fs.io_stats.total.operations",
+            "node_stats.fs.io_stats.total.read_operations",
+            "node_stats.fs.io_stats.total.write_operations",
+            "node_stats.fs.io_stats.total.read_kilobytes",
+            "node_stats.fs.io_stats.total.write_kilobytes");
         FILTERS = Collections.unmodifiableSet(filters);
     }
 
diff --git a/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json b/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json
index 8f3eb7b8631..dbe102d8f22 100644
--- a/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json
+++ b/elasticsearch/x-pack/monitoring/src/main/resources/monitoring-es.json
@@ -566,20 +566,24 @@
                 },
                 "io_stats": {
                   "properties": {
-                    "operations": {
-                      "type": "long"
-                    },
-                    "read_operations": {
-                      "type": "long"
-                    },
-                    "write_operations": {
-                      "type": "long"
-                    },
-                    "read_kilobytes": {
-                      "type": "long"
-                    },
-                    "write_kilobytes": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        },
+                        "read_kilobytes": {
+                          "type": "long"
+                        },
+                        "write_kilobytes": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 }