Merge pull request #19 from seabaylea/elasticsearch-2

Update to work with Elasticsearch 2.x
RuntimeTools · Dec 8, 2015 · 0e59186 · 0e59186
2 parents 2196079 + b8d8165
commit 0e59186
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 30 deletions.
diff --git a/mappings/cpu.json b/mappings/cpu.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "cpu",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/eventloop.json b/mappings/eventloop.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "eventloop",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},
@@ -13,9 +12,15 @@
                 "type": "nested",
                 "include_in_parent": true,
                 "properties": {
-                    "latency.min":	{"type": "long"},
-                    "latency.max":	{"type": "long"},
-                    "latency.avg":	{"type": "long"}
+                	"latency": {
+                        "type": "nested",
+                        "include_in_parent": true,
+                        "properties": {
+                            "min":	{"type": "long"},
+                            "max":	{"type": "long"},
+                            "avg":	{"type": "long"}
+                        }
+                	}
                 }
             }
         }

diff --git a/mappings/gc.json b/mappings/gc.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "gc",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/http.json b/mappings/http.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "http",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},
@@ -13,7 +12,7 @@
                 "type": "nested",
                 "include_in_parent": true,
                 "properties": {
-                    "method":     {"type": "string", "index": "not_analyzed"},            
+                    "method":     {"type": "string", "index": "not_analyzed"},
                     "url":        {"type": "string", "index": "not_analyzed"},
                     "duration":   {"type": "long"}
                 }

diff --git a/mappings/leveldown.json b/mappings/leveldown.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "leveldown",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/memcached.json b/mappings/memcached.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "memcached",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/memory.json b/mappings/memory.json
@@ -2,29 +2,34 @@
     "index":  "appmetrics",
     "type":   "memory",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},
             "hostName":         {"type": "string", "index": "not_analyzed"},
             "pid":              {"type": "integer"},
             "applicationName":  {"type": "string", "index": "not_analyzed"},
-            "memory.process" : {
+            "memory" : {
                 "type": "nested",
                 "include_in_parent": true,
                 "properties": {
-                    "private":  {"type": "long"},
-                    "physical": {"type": "long"},
-                    "virtual":  {"type": "long"}
+                	"process" : {
+                		"type": "nested",
+                		"include_in_parent": true,
+                		"properties": {
+                			"private":  {"type": "long"},
+                			"physical": {"type": "long"},
+                			"virtual":  {"type": "long"}
+                		}
+                	},
+                	"system" : {
+                		"type": "nested",
+                		"include_in_parent": true,
+                		"properties": {
+                			"physical": {"type": "long"},
+                			"total":    {"type": "long"}
+                		}
+                	}
                 }
-            },
-            "memory.system" : {
-                "type": "nested",
-                "include_in_parent": true,
-                "properties": {
-                    "physical": {"type": "long"},
-                    "total":    {"type": "long"}
-                }                           
             }
         }
     }

diff --git a/mappings/mongo.json b/mappings/mongo.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "mongo",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/mqlight.json b/mappings/mqlight.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "mqlight",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/mqtt.json b/mappings/mqtt.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "mqtt",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/mysql.json b/mappings/mysql.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "mysql",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/postgres.json b/mappings/postgres.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "postgres",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/redis.json b/mappings/redis.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "redis",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},

diff --git a/mappings/socketio.json b/mappings/socketio.json
@@ -2,7 +2,6 @@
     "index":  "appmetrics",
     "type":   "socketio",
     "body": {
-        "_source" : {"compress" : true},
         "_ttl" : {"enabled" : true, "default" : "90d"},
         "properties": {
             "timestamp":        {"type": "date", "format": "dateOptionalTime"},