Merge remote-tracking branch 'upstream/master'

Original commit: elastic/x-pack-elasticsearch@4707b33364

marvel_index_template.json

@@ -1,8 +1,9 @@
+
 {
   "template": ".marvel*",
   "settings": {
     "marvel.index_format": 7,
-    "marvel.version": "2.0.0",
+    "marvel.version": "${project.version}",
     "index.number_of_shards": 1,
     "index.number_of_replicas": 1,
     "index.codec": "best_compression",
@@ -15,10 +16,6 @@
       },
       "date_detection": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "string",
-          "index": "not_analyzed"
-        },
         "cluster_uuid": {
           "type": "string",
           "index": "not_analyzed"
@@ -29,13 +26,6 @@
         }
       }
     },
-    "marvel_licenses": {
-      "properties": {
-        "licenses": {
-          "type": "object"
-        }
-      }
-    },
     "marvel_index_stats": {
       "properties": {
         "index_stats": {
@@ -44,6 +34,17 @@
               "type": "string",
               "index": "not_analyzed"
             },
+            "primaries": {
+              "properties": {
+                "docs": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "total": {
               "properties": {
                 "docs": {
@@ -65,10 +66,47 @@
                 },
                 "indexing": {
                   "properties": {
+                    "index_total": {
+                      "type": "long"
+                    },
+                    "index_time_in_millis": {
+                      "type": "long"
+                    },
                     "throttle_time_in_millis": {
                       "type": "long"
                     }
                   }
+                },
+                "merges": {
+                  "properties": {
+                    "total_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "query_total": {
+                      "type": "long"
+                    },
+                    "query_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "segments": {
+                  "properties": {
+                    "memory_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
@@ -94,14 +132,33 @@
       "properties": {
         "cluster_state": {
           "properties": {
-            "version": { "type": "long" },
+            "version": {
-            "nodes": { "type": "object" },
+              "type": "long"
-            "master_node": { "type": "string", "index": "not_analyzed" },
+            },
-            "shards": { "type": "object" }
+            "master_node": {
+              "type": "string",
+              "index": "not_analyzed"
+            },
+            "status": {
+              "type": "string",
+              "index": "not_analyzed"
+            },
+            "nodes": {
+              "type": "object"
+            },
+            "shards": {
+              "type": "object"
+            }
           }
         }
       }
     },
+    "cluster_info": {
+      "enabled": false
+    },
+    "phone_home": {
+      "enabled": false
+    },
     "marvel_node_stats": {
       "properties": {
         "node_stats": {
@@ -112,6 +169,30 @@
             },
             "node_master": {
               "type": "boolean"
+            },
+            "mlockall": {
+              "type": "boolean"
+            },
+            "disk_threshold_enabled": {
+              "type": "boolean"
+            },
+            "disk_threshold_watermark_high": {
+              "type": "short"
+            },
+            "indices": {
+              "type": "object"
+            },
+            "fs": {
+              "type": "object"
+            },
+            "process": {
+              "type": "object"
+            },
+            "jvm": {
+              "type": "object"
+            },
+            "thread_pool": {
+              "type": "object"
             }
           }
         }
@@ -119,10 +200,6 @@
     },
     "marvel_index_recovery": {
       "properties": {
-        "index_name": {
-          "type": "string",
-          "index": "not_analyzed"
-        },
         "shards": {
           "type": "object"
         }