From a2fc6db47013e51a4df4fd16a1ac56ec1b36d2f0 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Wed, 12 Nov 2014 13:25:36 +0100
Subject: [PATCH] Add indexing throtteling time to nodes and indices stats
 dashboards

Closes #330
---
 .../main/resources/marvel_index_template.json | 27 ++++++++++---------
 kibana/dashboards/indices_stats.js            |  8 ++++++
 kibana/dashboards/nodes_stats.js              |  8 ++++++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/agent/src/main/resources/marvel_index_template.json b/agent/src/main/resources/marvel_index_template.json
index eaaf1ef6a1e42e..406d876a0f5cfb 100644
--- a/agent/src/main/resources/marvel_index_template.json
+++ b/agent/src/main/resources/marvel_index_template.json
@@ -12,7 +12,7 @@
       }
     },
     "mapper.dynamic": true,
-    "marvel.index_format": 5
+    "marvel.index_format": 6
   },
   "mappings": {
     "_default_": {
@@ -78,17 +78,6 @@
             }
           }
         },
-        "indices": {
-          "properties": {
-            "percolate": {
-              "properties": {
-                "size_in_bytes": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
         "jvm": {
           "properties": {
             "buffer_pools": {
@@ -141,6 +130,13 @@
         },
         "indices": {
           "properties": {
+            "indexing": {
+              "properties": {
+                "throttle_time_in_millis": {
+                  "type": "long"
+                }
+              }
+            },
             "percolate": {
               "properties": {
                 "total": {
@@ -210,6 +206,13 @@
                 }
               }
             },
+            "indexing": {
+              "properties": {
+                "throttle_time_in_millis": {
+                  "type": "long"
+                }
+              }
+            },
             "merges": {
               "properties": {
                 "total_size_in_bytes": {
diff --git a/kibana/dashboards/indices_stats.js b/kibana/dashboards/indices_stats.js
index acfe224ad36310..d17a4b24f90890 100644
--- a/kibana/dashboards/indices_stats.js
+++ b/kibana/dashboards/indices_stats.js
@@ -245,6 +245,14 @@ var rows = [
         "scale": 0.001,
         "title": "Total Indexing Time"
       },
+      {
+        "value_field": "total.indexing.throttle_time_in_millis",
+        "derivative": true,
+        "mode": "min",
+        "scaleSeconds": true,
+        "scale": 0.001,
+        "title": "Total Indexing Throttling Time"
+      },
       {
         "value_field": "total.indexing.delete_total",
         "derivative": true,
diff --git a/kibana/dashboards/nodes_stats.js b/kibana/dashboards/nodes_stats.js
index 9890bd0ed8bcba..afdeecf3ebc7d5 100644
--- a/kibana/dashboards/nodes_stats.js
+++ b/kibana/dashboards/nodes_stats.js
@@ -429,6 +429,14 @@ var rows = [
         "scale": 0.001,
         "title": "Indices Total Indexing Time"
       },
+      {
+        "value_field": "indices.indexing.throttle_time_in_millis",
+        "derivative": true,
+        "mode": "min",
+        "scaleSeconds": true,
+        "scale": 0.001,
+        "title": "Indices Indexing Throttling Time"
+      },
       {
         "value_field": "indices.indexing.delete_total",
         "derivative": true,