From 182c9d3903b5287a09aa50481059b91a2054ace3 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 11:09:49 +0100 Subject: [PATCH 1/6] Fix incorrect field --- .../_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index 9ea04c9018b..6b6dce37132 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -156,7 +156,7 @@ "enabled": true, "id": "1", "params": { - "field": "haproxy.client_ip" + "field": "haproxy.client.ip" }, "schema": "metric", "type": "cardinality" @@ -403,4 +403,4 @@ } ], "version": "6.3.2" -} \ No newline at end of file +} From 84137383ec97df40f05049de13e0ad2324c3eaa7 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 11:41:13 +0100 Subject: [PATCH 2/6] Use same params than apache module in geoip view --- .../dashboard/Filebeat-haproxy-overview.json | 52 ++++++------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index 6b6dce37132..2bdb64c0ddc 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -144,10 +144,9 @@ "title": "IP Geohashes [Filebeat HAProxy]", "uiStateJSON": { "mapCenter": [ - -9.275622176792098, - 28.4765625 - ], - "mapZoom": 2 + 14.944784875088372, + 5.09765625 + ] }, "version": 1, "visState": { @@ -175,49 +174,32 @@ "type": "geohash_grid" } ], - "params": { + "params": { "addTooltip": true, - "heatClusterSize": 1.5, + "heatBlur": 15, + "heatMaxZoom": 16, + "heatMinOpacity": 0.1, + "heatNormalizeData": true, + "heatRadius": 25, "isDesaturated": true, "legendPosition": "bottomright", "mapCenter": [ - 0, - 0 + 15, + 5 ], "mapType": "Scaled Circle Markers", "mapZoom": 2, "wms": { - "baseLayersAreLoaded": { - "_c": [], - "_d": true, - "_h": 0, - "_n": false, - "_s": 1, - "_v": true - }, "enabled": false, "options": { + "attribution": "Maps provided by USGS", "format": "image/png", - "transparent": true - }, - "selectedTmsLayer": { - "attribution": "\u003cp\u003e\u0026#169; \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors | \u003ca href=\"https://www.elastic.co/elastic-maps-service\"\u003eElastic Maps Service\u003c/a\u003e\u003c/p\u003e\u0026#10;", - "id": "road_map", - "maxZoom": 18, - "minZoom": 0, - "subdomains": [], - "url": "https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree\u0026my_app_name=kibana\u0026my_app_version=6.3.2\u0026license=222b9c80-1528-4ddf-9a40-cc59d57f55bf" + "layers": "0", + "styles": "", + "transparent": true, + "version": "1.3.0" }, - "tmsLayers": [ - { - "attribution": "\u003cp\u003e\u0026#169; \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors | \u003ca href=\"https://www.elastic.co/elastic-maps-service\"\u003eElastic Maps Service\u003c/a\u003e\u003c/p\u003e\u0026#10;", - "id": "road_map", - "maxZoom": 18, - "minZoom": 0, - "subdomains": [], - "url": "https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree\u0026my_app_name=kibana\u0026my_app_version=6.3.2\u0026license=222b9c80-1528-4ddf-9a40-cc59d57f55bf" - } - ] + "url": "https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer" } }, "title": "IP Geohashes [Filebeat HAProxy]", From 240fd1e5a5c1f5a69f0e93c567413471eb6a7b91 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 11:46:01 +0100 Subject: [PATCH 3/6] Added description to haproxy dashboard --- .../_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index 2bdb64c0ddc..88d4fd33904 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -355,7 +355,7 @@ }, { "attributes": { - "description": "", + "description": "Filebeat Haproxy module dashboard", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -369,9 +369,7 @@ } }, "optionsJSON": { - "darkTheme": false, - "hidePanelTitles": false, - "useMargins": true + "darkTheme": false }, "panelsJSON": null, "timeRestore": false, From d1b546a3318aca207386afd982a2781b8751f5d2 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 12:05:31 +0100 Subject: [PATCH 4/6] Add visualizations to dashboard --- .../dashboard/Filebeat-haproxy-overview.json | 97 +++++++++++++++---- 1 file changed, 77 insertions(+), 20 deletions(-) diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index 88d4fd33904..a2710920574 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -61,8 +61,8 @@ }, "id": "55251360-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-08-27T19:50:02.901Z", - "version": 2 + "updated_at": "2018-12-06T10:39:48.825Z", + "version": 4 }, { "attributes": { @@ -125,8 +125,8 @@ }, "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-08-27T19:50:50.255Z", - "version": 1 + "updated_at": "2018-12-06T10:39:48.825Z", + "version": 4 }, { "attributes": { @@ -174,7 +174,7 @@ "type": "geohash_grid" } ], - "params": { + "params": { "addTooltip": true, "heatBlur": 15, "heatMaxZoom": 16, @@ -184,8 +184,8 @@ "isDesaturated": true, "legendPosition": "bottomright", "mapCenter": [ - 15, - 5 + 15, + 5 ], "mapType": "Scaled Circle Markers", "mapZoom": 2, @@ -208,8 +208,8 @@ }, "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-08-27T19:49:15.098Z", - "version": 2 + "updated_at": "2018-12-06T10:39:48.825Z", + "version": 4 }, { "attributes": { @@ -350,8 +350,8 @@ }, "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-08-27T19:57:55.070Z", - "version": 2 + "updated_at": "2018-12-06T10:39:48.825Z", + "version": 4 }, { "attributes": { @@ -360,27 +360,84 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": { "filter": [], - "highlightAll": true, "query": { "language": "lucene", "query": "" - }, - "version": true + } } }, "optionsJSON": { - "darkTheme": false + "darkTheme": false, + "hidePanelTitles": false, + "useMargins": true }, - "panelsJSON": null, + "panelsJSON": [ + { + "embeddableConfig": {}, + "gridData": { + "h": 15, + "i": "1", + "w": 24, + "x": 24, + "y": 16 + }, + "id": "55251360-aa32-11e8-9c06-877f0445e3e0", + "panelIndex": "1", + "type": "visualization", + "version": "6.5.2" + }, + { + "embeddableConfig": {}, + "gridData": { + "h": 15, + "i": "2", + "w": 24, + "x": 0, + "y": 16 + }, + "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", + "panelIndex": "2", + "type": "visualization", + "version": "6.5.2" + }, + { + "embeddableConfig": {}, + "gridData": { + "h": 16, + "i": "3", + "w": 24, + "x": 0, + "y": 0 + }, + "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", + "panelIndex": "3", + "type": "visualization", + "version": "6.5.2" + }, + { + "embeddableConfig": {}, + "gridData": { + "h": 16, + "i": "4", + "w": 24, + "x": 24, + "y": 0 + }, + "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", + "panelIndex": "4", + "type": "visualization", + "version": "6.5.2" + } + ], "timeRestore": false, - "title": "[Filebeat HAProxy] Overview", + "title": "[Filebeat HAproxy] Overview", "version": 1 }, "id": "3560d580-aa34-11e8-9c06-877f0445e3e0", "type": "dashboard", - "updated_at": "2018-08-27T20:03:04.536Z", - "version": 1 + "updated_at": "2018-12-06T10:57:06.975Z", + "version": 2 } ], - "version": "6.3.2" + "version": "6.5.2" } From 0bea8b6793880b5a577995423d6f7d9f979415b2 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 12:25:25 +0100 Subject: [PATCH 5/6] Actually export from kibana 6.5.2 --- CHANGELOG.asciidoc | 1 + .../dashboard/Filebeat-haproxy-overview.json | 168 +++++++++--------- 2 files changed, 85 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index ddc1d5a6d00..8d06d545577 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -47,6 +47,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...master[Check the HEAD d - Fix installation of haproxy dashboard. {issue}9307[9307] {pull}9313[9313] - Don't generate incomplete configurations when logs collection is disabled by hints. {pull}9305[9305] - Stop runners disabled by hints after previously being started. {pull}9305[9305] +- Fix saved objects in filebeat haproxy dashboard. {pull}9417[9417] *Heartbeat* diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index a2710920574..fbecd07d380 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -61,72 +61,8 @@ }, "id": "55251360-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T10:39:48.825Z", - "version": 4 - }, - { - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "index": "filebeat-*", - "query": { - "language": "lucene", - "query": "" - } - } - }, - "title": "Frontend breakdown [Filebeat HAProxy]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [ - { - "enabled": true, - "id": "1", - "params": {}, - "schema": "metric", - "type": "count" - }, - { - "enabled": true, - "id": "2", - "params": { - "field": "haproxy.frontend_name", - "missingBucket": false, - "missingBucketLabel": "Missing", - "order": "desc", - "orderBy": "1", - "otherBucket": false, - "otherBucketLabel": "Other", - "size": 5 - }, - "schema": "segment", - "type": "terms" - } - ], - "params": { - "addLegend": true, - "addTooltip": true, - "isDonut": true, - "labels": { - "last_level": true, - "show": false, - "truncate": 100, - "values": true - }, - "legendPosition": "right", - "type": "pie" - }, - "title": "Frontend breakdown [Filebeat HAProxy]", - "type": "pie" - } - }, - "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", - "type": "visualization", - "updated_at": "2018-12-06T10:39:48.825Z", - "version": 4 + "updated_at": "2018-12-06T11:17:12.883Z", + "version": 1 }, { "attributes": { @@ -208,8 +144,8 @@ }, "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T10:39:48.825Z", - "version": 4 + "updated_at": "2018-12-06T11:17:12.883Z", + "version": 1 }, { "attributes": { @@ -350,12 +286,76 @@ }, "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T10:39:48.825Z", - "version": 4 + "updated_at": "2018-12-06T11:17:12.883Z", + "version": 1 + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "index": "filebeat-*", + "query": { + "language": "lucene", + "query": "" + } + } + }, + "title": "Frontend breakdown [Filebeat HAProxy]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": {}, + "schema": "metric", + "type": "count" + }, + { + "enabled": true, + "id": "2", + "params": { + "field": "haproxy.frontend_name", + "missingBucket": false, + "missingBucketLabel": "Missing", + "order": "desc", + "orderBy": "1", + "otherBucket": false, + "otherBucketLabel": "Other", + "size": 5 + }, + "schema": "segment", + "type": "terms" + } + ], + "params": { + "addLegend": true, + "addTooltip": true, + "isDonut": true, + "labels": { + "last_level": true, + "show": false, + "truncate": 100, + "values": true + }, + "legendPosition": "right", + "type": "pie" + }, + "title": "Frontend breakdown [Filebeat HAProxy]", + "type": "pie" + } + }, + "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", + "type": "visualization", + "updated_at": "2018-12-06T11:17:12.883Z", + "version": 1 }, { "attributes": { - "description": "Filebeat Haproxy module dashboard", + "description": "Filebeat HAProxy module dashboard", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -378,8 +378,8 @@ "h": 15, "i": "1", "w": 24, - "x": 24, - "y": 16 + "x": 0, + "y": 15 }, "id": "55251360-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "1", @@ -393,9 +393,9 @@ "i": "2", "w": 24, "x": 0, - "y": 16 + "y": 0 }, - "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", + "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "2", "type": "visualization", "version": "6.5.2" @@ -403,13 +403,13 @@ { "embeddableConfig": {}, "gridData": { - "h": 16, + "h": 15, "i": "3", "w": 24, - "x": 0, + "x": 24, "y": 0 }, - "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", + "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", "panelIndex": "3", "type": "visualization", "version": "6.5.2" @@ -417,26 +417,26 @@ { "embeddableConfig": {}, "gridData": { - "h": 16, + "h": 15, "i": "4", "w": 24, "x": 24, - "y": 0 + "y": 15 }, - "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", + "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "4", "type": "visualization", "version": "6.5.2" } ], "timeRestore": false, - "title": "[Filebeat HAproxy] Overview", + "title": "[Filebeat HAProxy] Overview", "version": 1 }, "id": "3560d580-aa34-11e8-9c06-877f0445e3e0", "type": "dashboard", - "updated_at": "2018-12-06T10:57:06.975Z", - "version": 2 + "updated_at": "2018-12-06T11:20:21.738Z", + "version": 3 } ], "version": "6.5.2" From a2bac69b6777e19f31bef6c75e6d3297a2b9772b Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 6 Dec 2018 12:41:44 +0100 Subject: [PATCH 6/6] Keep order in visualizations --- .../dashboard/Filebeat-haproxy-overview.json | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json index fbecd07d380..03014c0e8cb 100644 --- a/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json +++ b/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json @@ -61,8 +61,72 @@ }, "id": "55251360-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T11:17:12.883Z", - "version": 1 + "updated_at": "2018-12-06T11:35:36.721Z", + "version": 2 + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "index": "filebeat-*", + "query": { + "language": "lucene", + "query": "" + } + } + }, + "title": "Frontend breakdown [Filebeat HAProxy]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": {}, + "schema": "metric", + "type": "count" + }, + { + "enabled": true, + "id": "2", + "params": { + "field": "haproxy.frontend_name", + "missingBucket": false, + "missingBucketLabel": "Missing", + "order": "desc", + "orderBy": "1", + "otherBucket": false, + "otherBucketLabel": "Other", + "size": 5 + }, + "schema": "segment", + "type": "terms" + } + ], + "params": { + "addLegend": true, + "addTooltip": true, + "isDonut": true, + "labels": { + "last_level": true, + "show": false, + "truncate": 100, + "values": true + }, + "legendPosition": "right", + "type": "pie" + }, + "title": "Frontend breakdown [Filebeat HAProxy]", + "type": "pie" + } + }, + "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", + "type": "visualization", + "updated_at": "2018-12-06T11:35:36.721Z", + "version": 2 }, { "attributes": { @@ -144,8 +208,8 @@ }, "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T11:17:12.883Z", - "version": 1 + "updated_at": "2018-12-06T11:35:36.721Z", + "version": 2 }, { "attributes": { @@ -286,72 +350,8 @@ }, "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", "type": "visualization", - "updated_at": "2018-12-06T11:17:12.883Z", - "version": 1 - }, - { - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "index": "filebeat-*", - "query": { - "language": "lucene", - "query": "" - } - } - }, - "title": "Frontend breakdown [Filebeat HAProxy]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [ - { - "enabled": true, - "id": "1", - "params": {}, - "schema": "metric", - "type": "count" - }, - { - "enabled": true, - "id": "2", - "params": { - "field": "haproxy.frontend_name", - "missingBucket": false, - "missingBucketLabel": "Missing", - "order": "desc", - "orderBy": "1", - "otherBucket": false, - "otherBucketLabel": "Other", - "size": 5 - }, - "schema": "segment", - "type": "terms" - } - ], - "params": { - "addLegend": true, - "addTooltip": true, - "isDonut": true, - "labels": { - "last_level": true, - "show": false, - "truncate": 100, - "values": true - }, - "legendPosition": "right", - "type": "pie" - }, - "title": "Frontend breakdown [Filebeat HAProxy]", - "type": "pie" - } - }, - "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", - "type": "visualization", - "updated_at": "2018-12-06T11:17:12.883Z", - "version": 1 + "updated_at": "2018-12-06T11:35:36.721Z", + "version": 2 }, { "attributes": { @@ -379,7 +379,7 @@ "i": "1", "w": 24, "x": 0, - "y": 15 + "y": 0 }, "id": "55251360-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "1", @@ -392,10 +392,10 @@ "h": 15, "i": "2", "w": 24, - "x": 0, + "x": 24, "y": 0 }, - "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", + "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "2", "type": "visualization", "version": "6.5.2" @@ -406,10 +406,10 @@ "h": 15, "i": "3", "w": 24, - "x": 24, - "y": 0 + "x": 0, + "y": 15 }, - "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", + "id": "11f8b9c0-aa32-11e8-9c06-877f0445e3e0", "panelIndex": "3", "type": "visualization", "version": "6.5.2" @@ -423,7 +423,7 @@ "x": 24, "y": 15 }, - "id": "7fb671f0-aa32-11e8-9c06-877f0445e3e0", + "id": "68af8ef0-aa33-11e8-9c06-877f0445e3e0", "panelIndex": "4", "type": "visualization", "version": "6.5.2" @@ -435,8 +435,8 @@ }, "id": "3560d580-aa34-11e8-9c06-877f0445e3e0", "type": "dashboard", - "updated_at": "2018-12-06T11:20:21.738Z", - "version": 3 + "updated_at": "2018-12-06T11:40:40.204Z", + "version": 6 } ], "version": "6.5.2"