From 8af87e3f8a884a8476a2828a7d8386dc372d27d2 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 2 Sep 2019 11:32:38 +0200 Subject: [PATCH 1/7] Add acm mapping to APM for beats --- .../src/main/resources/monitoring-beats.json | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index d9824f8c21c2c..02bfabd1728c0 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -246,6 +246,89 @@ }, "apm-server": { "properties": { + "acm": { + "properties": { + "response": { + "properties": { + "count": { + "type": "long" + }, + "errors": { + "properties": { + "validate": { + "type": "long" + }, + "internal": { + "type": "long" + }, + "queue": { + "type": "long" + }, + "count": { + "type": "long" + }, + "decode": { + "type": "long" + }, + "toolarge": { + "type": "long" + }, + "unavailable": { + "type": "long" + }, + "forbidden": { + "type": "long" + }, + "method": { + "type": "long" + }, + "notfound": { + "type": "long" + }, + "invalidquery": { + "type": "long" + }, + "ratelimit": { + "type": "long" + }, + "closed": { + "type": "long" + }, + "unauthorized": { + "type": "long" + } + } + }, + "valid": { + "properties": { + "notmodified": { + "type": "long" + }, + "count": { + "type": "long" + }, + "ok": { + "type": "long" + }, + "accepted": { + "type": "long" + } + } + }, + "unset": { + "type": "long" + }, + "request": { + "properties": { + "count": { + "type": "long" + } + } + } + } + } + } + }, "server": { "properties": { "request": { From a996fa9557c3d624ad9c686dda1f9ebd467f8f7d Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 2 Sep 2019 12:18:31 +0200 Subject: [PATCH 2/7] Add root mapping for APM --- .../src/main/resources/monitoring-beats.json | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index 02bfabd1728c0..ae82933a4dc5a 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -246,6 +246,89 @@ }, "apm-server": { "properties": { + "root": { + "properties": { + "unset": { + "type": "long" + }, + "request": { + "properties": { + "count": { + "type": "long" + } + } + }, + "response": { + "properties": { + "errors": { + "properties": { + "count": { + "type": "long" + }, + "validate": { + "type": "long" + }, + "decode": { + "type": "long" + }, + "method": { + "type": "long" + }, + "closed": { + "type": "long" + }, + "forbidden": { + "type": "long" + }, + "unavailable": { + "type": "long" + }, + "toolarge": { + "type": "long" + }, + "queue": { + "type": "long" + }, + "invalidquery": { + "type": "long" + }, + "ratelimit": { + "type": "long" + }, + "internal": { + "type": "long" + }, + "notfound": { + "type": "long" + }, + "unauthorized": { + "type": "long" + } + } + }, + "valid": { + "properties": { + "ok": { + "type": "long" + }, + "accepted": { + "type": "long" + }, + "notmodified": { + "type": "long" + }, + "count": { + "type": "long" + } + } + }, + "count": { + "type": "long" + } + } + } + } + }, "acm": { "properties": { "response": { From fb6d5dd2d47d732ad52b88a06c9251b45609b145 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 2 Sep 2019 12:45:14 +0200 Subject: [PATCH 3/7] Add sourcemap mapping to APM --- .../src/main/resources/monitoring-beats.json | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index ae82933a4dc5a..f5295d4bfa062 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -329,6 +329,82 @@ } } }, + "sourcemap": { + "properties": { + "response": { + "errors": { + "count": { + "type": "long" + }, + "closed": { + "type": "long" + }, + "unauthorized": { + "type": "long" + }, + "forbidden": { + "type": "long" + }, + "internal": { + "type": "long" + }, + "notfound": { + "type": "long" + }, + "ratelimit": { + "type": "long" + }, + "invalidquery": { + "type": "long" + }, + "method": { + "type": "long" + }, + "unavailable": { + "type": "long" + }, + "toolarge": { + "type": "long" + }, + "queue": { + "type": "long" + }, + "validate": { + "type": "long" + } + }, + "valid": { + "properties": { + "accepted": { + "type": "long" + }, + "notmodified": { + "type": "long" + }, + "count": { + "type": "long" + }, + "ok": { + "type": "long" + } + } + }, + "count": { + "type": "long" + } + }, + "unset": { + "type": "long" + }, + "request": { + "properties": { + "count": { + "type": "long" + } + } + } + } + }, "acm": { "properties": { "response": { From d552e86c380eb7162040c74dedb8d3fdf53919f9 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 2 Sep 2019 13:44:56 +0200 Subject: [PATCH 4/7] Fix missing properties --- .../src/main/resources/monitoring-beats.json | 102 +++++++++--------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index f5295d4bfa062..f166abd301eed 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -332,65 +332,67 @@ "sourcemap": { "properties": { "response": { - "errors": { - "count": { - "type": "long" - }, - "closed": { - "type": "long" - }, - "unauthorized": { - "type": "long" - }, - "forbidden": { - "type": "long" - }, - "internal": { - "type": "long" - }, - "notfound": { - "type": "long" - }, - "ratelimit": { - "type": "long" - }, - "invalidquery": { - "type": "long" - }, - "method": { - "type": "long" - }, - "unavailable": { - "type": "long" - }, - "toolarge": { - "type": "long" - }, - "queue": { - "type": "long" - }, - "validate": { - "type": "long" - } - }, - "valid": { - "properties": { - "accepted": { + "properties": { + "errors": { + "count": { "type": "long" }, - "notmodified": { + "closed": { "type": "long" }, - "count": { + "unauthorized": { + "type": "long" + }, + "forbidden": { "type": "long" }, - "ok": { + "internal": { + "type": "long" + }, + "notfound": { + "type": "long" + }, + "ratelimit": { + "type": "long" + }, + "invalidquery": { + "type": "long" + }, + "method": { + "type": "long" + }, + "unavailable": { + "type": "long" + }, + "toolarge": { + "type": "long" + }, + "queue": { + "type": "long" + }, + "validate": { "type": "long" } + }, + "valid": { + "properties": { + "accepted": { + "type": "long" + }, + "notmodified": { + "type": "long" + }, + "count": { + "type": "long" + }, + "ok": { + "type": "long" + } + } + }, + "count": { + "type": "long" } - }, - "count": { - "type": "long" } }, "unset": { From 29a0327e45ce5fae7d1efc2bc8616e9d250379ed Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 2 Sep 2019 13:51:32 +0200 Subject: [PATCH 5/7] Fix a second missing properties --- .../src/main/resources/monitoring-beats.json | 78 ++++++++++--------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index f166abd301eed..98abf99c1892c 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -334,44 +334,46 @@ "response": { "properties": { "errors": { - "count": { - "type": "long" - }, - "closed": { - "type": "long" - }, - "unauthorized": { - "type": "long" - }, - "forbidden": { - "type": "long" - }, - "internal": { - "type": "long" - }, - "notfound": { - "type": "long" - }, - "ratelimit": { - "type": "long" - }, - "invalidquery": { - "type": "long" - }, - "method": { - "type": "long" - }, - "unavailable": { - "type": "long" - }, - "toolarge": { - "type": "long" - }, - "queue": { - "type": "long" - }, - "validate": { - "type": "long" + "properties": { + "count": { + "type": "long" + }, + "closed": { + "type": "long" + }, + "unauthorized": { + "type": "long" + }, + "forbidden": { + "type": "long" + }, + "internal": { + "type": "long" + }, + "notfound": { + "type": "long" + }, + "ratelimit": { + "type": "long" + }, + "invalidquery": { + "type": "long" + }, + "method": { + "type": "long" + }, + "unavailable": { + "type": "long" + }, + "toolarge": { + "type": "long" + }, + "queue": { + "type": "long" + }, + "validate": { + "type": "long" + } } }, "valid": { From 5cca7a0f88ed2e802f34a606b62adcb250935ecf Mon Sep 17 00:00:00 2001 From: Mike Place Date: Fri, 20 Sep 2019 19:21:50 +0200 Subject: [PATCH 6/7] Add request property to acm --- .../plugin/core/src/main/resources/monitoring-beats.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index 98abf99c1892c..be96b6994e32e 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -411,6 +411,13 @@ }, "acm": { "properties": { + "request": { + "properties": { + "count": { + "type": "long" + } + } + }, "response": { "properties": { "count": { From babc9cf785d77435c4d778351a16cb269a58809b Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 16:38:45 +0200 Subject: [PATCH 7/7] Remove root and sourcemap per review --- .../src/main/resources/monitoring-beats.json | 163 ------------------ 1 file changed, 163 deletions(-) diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats.json b/x-pack/plugin/core/src/main/resources/monitoring-beats.json index be96b6994e32e..a39507ec8a4d9 100644 --- a/x-pack/plugin/core/src/main/resources/monitoring-beats.json +++ b/x-pack/plugin/core/src/main/resources/monitoring-beats.json @@ -246,169 +246,6 @@ }, "apm-server": { "properties": { - "root": { - "properties": { - "unset": { - "type": "long" - }, - "request": { - "properties": { - "count": { - "type": "long" - } - } - }, - "response": { - "properties": { - "errors": { - "properties": { - "count": { - "type": "long" - }, - "validate": { - "type": "long" - }, - "decode": { - "type": "long" - }, - "method": { - "type": "long" - }, - "closed": { - "type": "long" - }, - "forbidden": { - "type": "long" - }, - "unavailable": { - "type": "long" - }, - "toolarge": { - "type": "long" - }, - "queue": { - "type": "long" - }, - "invalidquery": { - "type": "long" - }, - "ratelimit": { - "type": "long" - }, - "internal": { - "type": "long" - }, - "notfound": { - "type": "long" - }, - "unauthorized": { - "type": "long" - } - } - }, - "valid": { - "properties": { - "ok": { - "type": "long" - }, - "accepted": { - "type": "long" - }, - "notmodified": { - "type": "long" - }, - "count": { - "type": "long" - } - } - }, - "count": { - "type": "long" - } - } - } - } - }, - "sourcemap": { - "properties": { - "response": { - "properties": { - "errors": { - "properties": { - "count": { - "type": "long" - }, - "closed": { - "type": "long" - }, - "unauthorized": { - "type": "long" - }, - "forbidden": { - "type": "long" - }, - "internal": { - "type": "long" - }, - "notfound": { - "type": "long" - }, - "ratelimit": { - "type": "long" - }, - "invalidquery": { - "type": "long" - }, - "method": { - "type": "long" - }, - "unavailable": { - "type": "long" - }, - "toolarge": { - "type": "long" - }, - "queue": { - "type": "long" - }, - "validate": { - "type": "long" - } - } - }, - "valid": { - "properties": { - "accepted": { - "type": "long" - }, - "notmodified": { - "type": "long" - }, - "count": { - "type": "long" - }, - "ok": { - "type": "long" - } - } - }, - "count": { - "type": "long" - } - } - }, - "unset": { - "type": "long" - }, - "request": { - "properties": { - "count": { - "type": "long" - } - } - } - } - }, "acm": { "properties": { "request": {