From cabef3ba2e83f72105ca23681aa531a7d8cb12b0 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Thu, 23 Jan 2014 16:38:45 +0100
Subject: [PATCH] index template didn't use proper object nesting.

Also changed load_average from long to float.
---
 .../main/resources/marvel_index_template.json | 164 ++++++++++++------
 1 file changed, 114 insertions(+), 50 deletions(-)

diff --git a/agent/src/main/resources/marvel_index_template.json b/agent/src/main/resources/marvel_index_template.json
index f2b9ad7c7958..bfbeb5c6ac1e 100644
--- a/agent/src/main/resources/marvel_index_template.json
+++ b/agent/src/main/resources/marvel_index_template.json
@@ -41,66 +41,130 @@
         },
         "node_stats": {
             "properties": {
-                "indices.percolate.size_in_bytes": {
-                    "type": "long"
+                "indices": {
+                    "properties": {
+                        "percolate": {
+                            "properties": {
+                                "size_in_bytes": {
+                                    "type": "long"
+                                }
+                            }
+                        }
+                    }
                 },
-                "jvm.buffer_pools.direct.used_in_bytes": {
-                    "type": "long"
+                "jvm": {
+                    "properties": {
+                        "buffer_pools": {
+                            "properties": {
+                                "direct": {
+                                    "properties": {
+                                        "used_in_bytes": {
+                                            "type": "long"
+                                        }
+                                    }
+                                },
+                                "mapped": {
+                                    "properties": {
+                                        "used_in_bytes": {
+                                            "type": "long"
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "gc": {
+                            "properties": {
+                                "collectors": {
+                                    "properties": {
+                                        "young": {
+                                            "properties": {
+                                                "collection_count": {
+                                                    "type": "long"
+                                                },
+                                                "collection_time_in_millis": {
+                                                    "type": "long"
+                                                }
+                                            }
+                                        },
+                                        "old": {
+                                            "properties": {
+                                                "collection_count": {
+                                                    "type": "long"
+                                                },
+                                                "collection_time_in_millis": {
+                                                    "type": "long"
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 },
-                "jvm.buffer_pools.mapped.used_in_bytes": {
-                    "type": "long"
+                "indices": {
+                    "properties": {
+                        "percolate": {
+                            "properties": {
+                                "total": {
+                                    "type": "long"
+                                },
+                                "time_in_millis": {
+                                    "type": "long"
+                                },
+                                "queries": {
+                                    "type": "long"
+                                },
+                                "memory_size_in_bytes": {
+                                    "type": "long"
+                                }
+                            }
+                        }
+                    }
                 },
-                "jvm.gc.collectors.young.collection_count": {
-                    "type": "long"
-                },
-                "jvm.gc.collectors.young.collection_time_in_millis": {
-                    "type": "long"
-                },
-                "jvm.gc.collectors.old.collection_count": {
-                    "type": "long"
-                },
-                "jvm.gc.collectors.old.collection_time_in_millis": {
-                    "type": "long"
-                },
-                "indices.percolate.total": {
-                    "type": "long"
-                },
-                "indices.percolate.time_in_millis": {
-                    "type": "long"
-                },
-                "indices.percolate.queries": {
-                    "type": "long"
-                },
-                "indices.percolate.memory_size_in_bytes": {
-                    "type": "long"
-                },
-                "os.load_average.1m": {
-                    "type": "long"
-                },
-                "os.load_average.5m": {
-                    "type": "long"
-                },
-                "os.load_average.15m": {
-                    "type": "long"
+                "os": {
+                    "properties": {
+                        "load_average": {
+                            "properties": {
+                                "1m": {
+                                    "type": "float"
+                                },
+                                "5m": {
+                                    "type": "float"
+                                },
+                                "15m": {
+                                    "type": "float"
+                                }
+                            }
+                        }
+                    }
                 }
             }
         },
         "index_stats": {
             "properties": {
-                "total.percolate.memory_size_in_bytes": {
-                    "type": "long"
-                },
-                "total.percolate.time_in_millis": {
-                    "type": "long"
-                },
-                "total.percolate.queries": {
-                    "type": "long"
-                },
-                "total.percolate.total": {
-                    "type": "long"
+                "total": {
+                    "properties": {
+
+                        "percolate": {
+                            "properties": {
+                                "total": {
+                                    "type": "long"
+                                },
+                                "time_in_millis": {
+                                    "type": "long"
+                                },
+                                "queries": {
+                                    "type": "long"
+                                },
+                                "memory_size_in_bytes": {
+                                    "type": "long"
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
-
     }
 }
\ No newline at end of file