From 37c4083db120fcba361ec5b0770c59ceda209fdb Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Thu, 13 Feb 2020 13:49:41 +0300 Subject: [PATCH 1/6] Updated plugin version to 7.6.0 --- src/kibana-cf_authentication/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kibana-cf_authentication/package.json b/src/kibana-cf_authentication/package.json index 1fd7ec55..2f397899 100644 --- a/src/kibana-cf_authentication/package.json +++ b/src/kibana-cf_authentication/package.json @@ -1,6 +1,6 @@ { "name": "authentication", - "version": "6.8.1", + "version": "7.6.0", "description": "Integrations Kibana into CF's OAuth 2 authentication mechanism + User page in Kibana", "repository": { "type": "git", From 7e120ca1fea1378ddad939367f41813748ba6162 Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Tue, 18 Feb 2020 17:35:55 +0300 Subject: [PATCH 2/6] Adopted visualizations to v7 Kibana API --- .../App-APP-logs-count-(top-10-apps).json.erb | 13 ++++++++++--- ...-APP-logs-count-by-level-(top-5-apps).json.erb | 13 ++++++++++--- .../App-APP-logs-count-by-level.json.erb | 11 +++++++++-- .../App-APP-logs-count-in-timeline.json.erb | 13 ++++++++++--- .../visualization/App-METRIC-CPU-usage.json.erb | 15 +++++++++++---- .../visualization/App-METRIC-disk-usage.json.erb | 15 +++++++++++---- .../App-METRIC-memory-usage.json.erb | 15 +++++++++++---- .../App-RTR-request-count-(top-10-apps).json.erb | 11 +++++++++-- ...RTR-request-count-by-timezone-(top-5).json.erb | 13 ++++++++++--- .../visualization/App-RTR-requests-map.json.erb | 13 ++++++++++--- ...e-times-(50th-and-95th-first-10-apps).json.erb | 15 +++++++++++---- .../visualization/App-RTR-response-times.json.erb | 13 ++++++++++--- ...c-by-response_time_ms-(first-10-apps).json.erb | 15 +++++++++++---- .../visualization/App-apps-with-errors.json.erb | 11 +++++++++-- ...errors-count-in-timeline-(top-5-apps).json.erb | 11 +++++++++-- .../App-logs-by-source-type-(top-10).json.erb | 13 ++++++++++--- ...by-source-type-(APP-or-cf-top-5-apps).json.erb | 13 ++++++++++--- .../visualization/App-names.json.erb | 13 ++++++++++--- ...roxy-request-status-codes-in-timeline.json.erb | 13 ++++++++++--- ...-time-duration-(50th-95th-99th-top-5).json.erb | 13 ++++++++++--- ...latform-Haproxy-request-time-duration.json.erb | 11 +++++++++-- .../Platform-Haproxy-requests-(top-10).json.erb | 11 +++++++++-- .../Platform-UAA-Audit-event-locations.json.erb | 13 ++++++++++--- .../Platform-UAA-Audit-event-types.json.erb | 11 +++++++++-- .../Platform-UAA-Audit-events-by-type.json.erb | 15 +++++++++++---- .../Platform-components-with-errors.json.erb | 11 +++++++++-- .../visualization/Platform-components.json.erb | 13 ++++++++++--- ...ors-count-by-source-component-(top-5).json.erb | 11 +++++++++-- .../Platform-errors-count-in-timeline.json.erb | 13 ++++++++++--- .../Platform-logs-by-component-(top-5).json.erb | 13 ++++++++++--- .../Platform-logs-by-source-job-(top-5).json.erb | 13 ++++++++++--- ...atform-logs-count-(top-10-components).json.erb | 13 ++++++++++--- .../Platform-logs-count-by-level.json.erb | 13 ++++++++++--- .../Platform-logs-count-in-timeline.json.erb | 13 ++++++++++--- 34 files changed, 337 insertions(+), 99 deletions(-) diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-(top-10-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-(top-10-apps).json.erb index 70f8d8a6..e0eff04b 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-(top-10-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-(top-10-apps).json.erb @@ -36,18 +36,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-logs", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level-(top-5-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level-(top-5-apps).json.erb index 78365d8b..57400f29 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level-(top-5-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level-(top-5-apps).json.erb @@ -64,18 +64,25 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "app-logs", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level.json.erb index e74c529e..4ee4cc90 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-by-level.json.erb @@ -36,7 +36,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-logs", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -48,6 +48,13 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-in-timeline.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-in-timeline.json.erb index 9d0edce4..b2c63b77 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-in-timeline.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-APP-logs-count-in-timeline.json.erb @@ -103,18 +103,25 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "app-logs", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-CPU-usage.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-CPU-usage.json.erb index fc3d574d..6c9901ef 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-CPU-usage.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-CPU-usage.json.erb @@ -17,7 +17,7 @@ "drawLinesBetweenPoints": true, "radiusRatio": 9, "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -65,18 +65,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-container-metric", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-container-metric", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-disk-usage.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-disk-usage.json.erb index 1ef1f0c2..1e8a4c31 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-disk-usage.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-disk-usage.json.erb @@ -17,7 +17,7 @@ "drawLinesBetweenPoints": true, "radiusRatio": 9, "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -65,18 +65,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-container-metric", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-container-metric", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-memory-usage.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-memory-usage.json.erb index 6e3cb3dd..8df00e0f 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-memory-usage.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-METRIC-memory-usage.json.erb @@ -17,7 +17,7 @@ "drawLinesBetweenPoints": true, "radiusRatio": 9, "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -65,18 +65,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-container-metric", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-container-metric", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-(top-10-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-(top-10-apps).json.erb index bdd9b0b3..b3bd5c6a 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-(top-10-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-(top-10-apps).json.erb @@ -36,7 +36,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-rtr", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -48,6 +48,13 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-rtr", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-by-timezone-(top-5).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-by-timezone-(top-5).json.erb index e154097b..5a2db667 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-by-timezone-(top-5).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-request-count-by-timezone-(top-5).json.erb @@ -13,7 +13,7 @@ "scale": "linear", "mode": "stacked", "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -47,7 +47,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -59,6 +59,13 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-all", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-requests-map.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-requests-map.json.erb index 5a5fc14c..483735db 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-requests-map.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-requests-map.json.erb @@ -53,18 +53,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-all", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times-(50th-and-95th-first-10-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times-(50th-and-95th-first-10-apps).json.erb index acbbb6ea..38c6d358 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times-(50th-and-95th-first-10-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times-(50th-and-95th-first-10-apps).json.erb @@ -17,7 +17,7 @@ "drawLinesBetweenPoints": true, "radiusRatio": 9, "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -82,18 +82,25 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "app-rtr", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-rtr", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times.json.erb index 4350054f..a4163041 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-response-times.json.erb @@ -42,18 +42,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-rtr", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-rtr", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-traffic-by-response_time_ms-(first-10-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-traffic-by-response_time_ms-(first-10-apps).json.erb index 4aa5e4d3..6c159ea9 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-traffic-by-response_time_ms-(first-10-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-RTR-traffic-by-response_time_ms-(first-10-apps).json.erb @@ -13,7 +13,7 @@ "scale": "linear", "mode": "stacked", "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -72,18 +72,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-rtr", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-rtr", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-apps-with-errors.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-apps-with-errors.json.erb index 87da7605..a21a5408 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-apps-with-errors.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-apps-with-errors.json.erb @@ -35,7 +35,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all-errors", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -45,6 +45,13 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-all-errors", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-errors-count-in-timeline-(top-5-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-errors-count-in-timeline-(top-5-apps).json.erb index 27e969df..b49fe915 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-errors-count-in-timeline-(top-5-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-errors-count-in-timeline-(top-5-apps).json.erb @@ -99,7 +99,7 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -109,6 +109,13 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-by-source-type-(top-10).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-by-source-type-(top-10).json.erb index 2d7fac47..f5e62e8c 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-by-source-type-(top-10).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-by-source-type-(top-10).json.erb @@ -54,18 +54,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-count-by-source-type-(APP-or-cf-top-5-apps).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-count-by-source-type-(APP-or-cf-top-5-apps).json.erb index ba478852..89bc3e2b 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-count-by-source-type-(APP-or-cf-top-5-apps).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-logs-count-by-source-type-(APP-or-cf-top-5-apps).json.erb @@ -86,18 +86,25 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-logs", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-names.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-names.json.erb index faeb62dc..661c7bde 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-names.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/App-names.json.erb @@ -35,18 +35,25 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "app-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "app-all", + "name": "search_0", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-status-codes-in-timeline.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-status-codes-in-timeline.json.erb index cb33fd2d..312f7166 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-status-codes-in-timeline.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-status-codes-in-timeline.json.erb @@ -53,17 +53,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-haproxy", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-haproxy", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5).json.erb index 4e956790..da95c258 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5).json.erb @@ -66,17 +66,24 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-haproxy", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-haproxy", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration.json.erb index 46a71b1b..14d30977 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-request-time-duration.json.erb @@ -41,7 +41,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-haproxy", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -53,5 +53,12 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-haproxy", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-requests-(top-10).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-requests-(top-10).json.erb index 40d6f0fa..0befbbb1 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-requests-(top-10).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-Haproxy-requests-(top-10).json.erb @@ -35,7 +35,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-haproxy", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -47,5 +47,12 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-haproxy", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-locations.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-locations.json.erb index a52b05c9..5d5a6333 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-locations.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-locations.json.erb @@ -52,17 +52,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-uaa-audit", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-uaa-audit", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-types.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-types.json.erb index 6bccb0d8..59bfeef3 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-types.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-event-types.json.erb @@ -36,7 +36,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-uaa-audit", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -48,5 +48,12 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-uaa-audit", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-events-by-type.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-events-by-type.json.erb index 1a4cb877..3eb62680 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-events-by-type.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-UAA-Audit-events-by-type.json.erb @@ -12,7 +12,7 @@ "scale": "linear", "mode": "stacked", "times": [ - + ], "addTimeMarker": false, "defaultYExtents": false, @@ -59,17 +59,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-uaa-audit", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-uaa-audit", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components-with-errors.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components-with-errors.json.erb index 6a3b96eb..ec32860a 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components-with-errors.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components-with-errors.json.erb @@ -45,7 +45,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all-errors", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -57,5 +57,12 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all-errors", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components.json.erb index 361d72f5..5bf6c499 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-components.json.erb @@ -34,17 +34,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-by-source-component-(top-5).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-by-source-component-(top-5).json.erb index ea352dc8..a6eb4b89 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-by-source-component-(top-5).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-by-source-component-(top-5).json.erb @@ -35,7 +35,7 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all-errors", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } @@ -47,5 +47,12 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all-errors", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-in-timeline.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-in-timeline.json.erb index 33a2391c..285c4c46 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-in-timeline.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-errors-count-in-timeline.json.erb @@ -86,17 +86,24 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-component-(top-5).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-component-(top-5).json.erb index d42566b2..0146ecf1 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-component-(top-5).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-component-(top-5).json.erb @@ -53,17 +53,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-source-job-(top-5).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-source-job-(top-5).json.erb index 0e969c6e..e2478181 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-source-job-(top-5).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-by-source-job-(top-5).json.erb @@ -35,17 +35,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-(top-10-components).json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-(top-10-components).json.erb index 9b96da1b..2168cd80 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-(top-10-components).json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-(top-10-components).json.erb @@ -35,17 +35,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-by-level.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-by-level.json.erb index 15b1d834..0f6d9455 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-by-level.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-by-level.json.erb @@ -41,17 +41,24 @@ ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-in-timeline.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-in-timeline.json.erb index 961feee6..1d742f32 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-in-timeline.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/visualization/Platform-logs-count-in-timeline.json.erb @@ -102,17 +102,24 @@ ENDOFFJSON ENDOFFJSON %>", "description": "", - "savedSearchId": "platform-all", + "savedSearchRefName": "search_0", "version": 1, "kibanaSavedObjectMeta": { "searchSourceJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } { "filter": [ - + ] } ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "platform-all", + "name": "search_0", + "type": "search" + } + ] } From 0f886aadc640b7a4cacada285cc742c79183b80e Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Tue, 18 Feb 2020 18:25:17 +0300 Subject: [PATCH 3/6] Adopted dashboards to v7 Kibana API --- .../dashboard/App-Errors.json.erb | 113 ++++++----- .../dashboard/App-Location.json.erb | 79 +++++--- .../dashboard/App-Logs.json.erb | 176 +++++++++++------- .../dashboard/App-Overview.json.erb | 139 ++++++++------ .../dashboard/App-Performance.json.erb | 148 +++++++++------ .../dashboard/Platform-Errors.json.erb | 138 ++++++++------ .../dashboard/Platform-Haproxy.json.erb | 172 ++++++++++------- .../dashboard/Platform-Logs.json.erb | 128 ++++++++----- .../dashboard/Platform-Overview.json.erb | 167 ++++++++++------- .../dashboard/Platform-UAA-Audit.json.erb | 129 ++++++++----- 10 files changed, 863 insertions(+), 526 deletions(-) diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb index 2a8db78f..d601c6d2 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Errors.json.erb @@ -6,55 +6,36 @@ "hits": 0, "description": "", "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - [ - { - "id": "App-errors-count-in-timeline-(top-5-apps)", - "type": "visualization", - "panelIndex": 1, - "size_x": 9, - "size_y": 6, - "col": 1, - "row": 1 - }, - { - "col": 10, - "id": "App-apps-with-errors", - "panelIndex": 2, - "row": 1, - "size_x": 3, - "size_y": 6, - "type": "visualization" - }, - { - "col": 1, - "columns": [ - "@level", - "@source.job", - "@cf.app", - "@message" - ], - "id": "app-all-errors", - "panelIndex": 3, - "row": 7, - "size_x": 12, - "size_y": 5, - "sort": [ - "@timestamp", - "desc" - ], - "type": "search" - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } + [ { - "P-1": { + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 36, + "h": 24, + "i": "1" + }, + "embeddableConfig": { "vis": { "legendOpen": true } + } + }, + { + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 24, + "i": "2" }, - "P-2": { + "embeddableConfig": { "spy": { "mode": { "name": null, @@ -62,7 +43,32 @@ ENDOFFJSON } } } + }, + { + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 24, + "w": 48, + "h": 20, + "i": "3" + }, + "embeddableConfig": { + "columns": [ + "@level", + "@source.job", + "@cf.app", + "@message" + ], + "sort": [ + "@timestamp", + "desc" + ] + } } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -85,6 +91,23 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-errors-count-in-timeline-(top-5-apps)", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-apps-with-errors", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "app-all-errors", + "name": "panel_2", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb index fe733138..26740b32 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Location.json.erb @@ -8,39 +8,45 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "id": "App-RTR-requests-map", - "type": "visualization", - "panelIndex": 1, - "size_x": 9, - "size_y": 8, - "col": 1, - "row": 1 + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 36, + "h": 32, + "i": "1" + }, + "embeddableConfig": {} }, { - "id": "App-names", - "type": "visualization", - "panelIndex": 2, - "size_x": 3, - "size_y": 5, - "col": 10, - "row": 1 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 20, + "i": "2" + }, + "embeddableConfig": {} }, { - "id": "App-RTR-request-count-by-timezone-(top-5)", - "type": "visualization", - "panelIndex": 3, - "size_x": 3, - "size_y": 3, - "col": 10, - "row": 6 + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 20, + "w": 12, + "h": 12, + "i": "3" + }, + "embeddableConfig": {} } ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - - } ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -63,6 +69,23 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-RTR-requests-map", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-names", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "App-RTR-request-count-by-timezone-(top-5)", + "name": "panel_2", + "type": "visualization" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Logs.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Logs.json.erb index a2721a4d..576aad1d 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Logs.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Logs.json.erb @@ -8,88 +8,99 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "id": "App-logs-count-by-source-type-(APP-or-cf-top-5-apps)", - "type": "visualization", - "panelIndex": 1, - "size_x": 4, - "size_y": 4, - "col": 1, - "row": 1 - }, - { - "col": 5, - "id": "App-APP-logs-count-by-level", - "panelIndex": 2, - "row": 1, - "size_x": 3, - "size_y": 4, - "type": "visualization" + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 16, + "h": 16, + "i": "1" + }, + "embeddableConfig": { + "vis": { + "legendOpen": false + } + } }, { - "col": 8, - "id": "App-APP-logs-count-in-timeline", - "panelIndex": 3, - "row": 1, - "size_x": 5, - "size_y": 4, - "type": "visualization" + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 16, + "y": 0, + "w": 12, + "h": 16, + "i": "2" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + }, + "spy": { + "mode": { + "name": null, + "fill": false + } + } + } }, { - "col": 1, - "id": "App-APP-logs-count-(top-10-apps)", - "panelIndex": 4, - "row": 5, - "size_x": 4, - "size_y": 4, - "type": "visualization" + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 28, + "y": 0, + "w": 20, + "h": 16, + "i": "3" + }, + "embeddableConfig": {} }, { - "col": 5, - "id": "App-APP-logs-count-by-level-(top-5-apps)", - "panelIndex": 5, - "row": 5, - "size_x": 8, - "size_y": 4, - "type": "visualization" - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": false - } - }, - "P-2": { - "vis": { - "legendOpen": true + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 16, + "w": 16, + "h": 16, + "i": "4" }, - "spy": { - "mode": { - "name": null, - "fill": false + "embeddableConfig": { + "vis": { + "legendOpen": true } } }, - "P-4": { - "vis": { - "legendOpen": true - } - }, - "P-5": { - "vis": { - "legendOpen": false + { + "panelIndex": "5", + "panelRefName": "panel_4", + "version": "7.3.0", + "gridData": { + "x": 16, + "y": 16, + "w": 32, + "h": 16, + "i": "5" }, - "spy": { - "mode": { - "name": null, - "fill": false + "embeddableConfig": { + "vis": { + "legendOpen": false + }, + "spy": { + "mode": { + "name": null, + "fill": false + } } } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -112,6 +123,33 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-logs-count-by-source-type-(APP-or-cf-top-5-apps)", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-APP-logs-count-by-level", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "App-APP-logs-count-in-timeline", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "App-APP-logs-count-(top-10-apps)", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "App-APP-logs-count-by-level-(top-5-apps)", + "name": "panel_4", + "type": "visualization" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Overview.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Overview.json.erb index cb3ab7b5..21523e71 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Overview.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Overview.json.erb @@ -8,66 +8,77 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "col": 1, - "id": "App-links", - "panelIndex": 1, - "row": 1, - "size_x": 9, - "size_y": 1, - "type": "visualization" + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 36, + "h": 4, + "i": "1" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "col": 1, - "id": "App-logs-by-source-type-(top-10)", - "panelIndex": 2, - "row": 2, - "size_x": 9, - "size_y": 2, - "type": "visualization" + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 4, + "w": 36, + "h": 8, + "i": "2" + }, + "embeddableConfig": {} }, { - "col": 10, - "id": "App-names", - "panelIndex": 3, - "row": 1, - "size_x": 3, - "size_y": 3, - "type": "visualization" + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 12, + "i": "3" + }, + "embeddableConfig": {} }, { - "col": 1, - "columns": [ - "@cf.org", - "@cf.space", - "@cf.app", - "@source.job", - "@source.component", - "@source.type", - "@level", - "@message" - ], - "id": "app-all-overview", - "panelIndex": 4, - "row": 4, - "size_x": 12, - "size_y": 5, - "sort": [ - "@timestamp", - "desc" - ], - "type": "search" - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": true + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 12, + "w": 48, + "h": 20, + "i": "4" + }, + "embeddableConfig": { + "columns": [ + "@cf.org", + "@cf.space", + "@cf.app", + "@source.job", + "@source.component", + "@source.type", + "@level", + "@message" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -90,6 +101,28 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-links", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-logs-by-source-type-(top-10)", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "App-names", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "app-all-overview", + "name": "panel_3", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Performance.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Performance.json.erb index d6793631..8954dd4a 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Performance.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Performance.json.erb @@ -8,68 +8,83 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "col": 1, - "id": "App-RTR-request-count-(top-10-apps)", - "panelIndex": 2, - "row": 1, - "size_x": 3, - "size_y": 4, - "type": "visualization" + "panelIndex": "2", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 12, + "h": 16, + "i": "2" + }, + "embeddableConfig": {} }, { - "col": 4, - "id": "App-RTR-traffic-by-response_time_ms-(first-10-apps)", - "panelIndex": 3, - "row": 1, - "size_x": 9, - "size_y": 4, - "type": "visualization" + "panelIndex": "3", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 12, + "y": 0, + "w": 36, + "h": 16, + "i": "3" + }, + "embeddableConfig": {} }, { - "col": 9, - "id": "App-RTR-response-times", - "panelIndex": 4, - "row": 5, - "size_x": 4, - "size_y": 4, - "type": "visualization" + "panelIndex": "4", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 32, + "y": 16, + "w": 16, + "h": 16, + "i": "4" + }, + "embeddableConfig": {} }, { - "col": 1, - "id": "App-RTR-response-times-(50th-and-95th-first-10-apps)", - "panelIndex": 5, - "row": 5, - "size_x": 8, - "size_y": 4, - "type": "visualization" + "panelIndex": "5", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 16, + "w": 32, + "h": 16, + "i": "5" + }, + "embeddableConfig": {} }, { - "col": 1, - "columns": [ - "@cf.app", - "rtr.response_time_ms", - "rtr.verb", - "rtr.status", - "rtr.path" - ], - "id": "app-rtr-long-response", - "panelIndex": 6, - "row": 9, - "size_x": 12, - "size_y": 4, - "sort": [ - "@timestamp", - "desc" - ], - "type": "search" + "panelIndex": "6", + "panelRefName": "panel_4", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 32, + "w": 48, + "h": 16, + "i": "6" + }, + "embeddableConfig": { + "columns": [ + "@cf.app", + "rtr.response_time_ms", + "rtr.verb", + "rtr.status", + "rtr.path" + ], + "sort": [ + "@timestamp", + "desc" + ] + } } ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - - } ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -92,6 +107,33 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-RTR-request-count-(top-10-apps)", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-RTR-traffic-by-response_time_ms-(first-10-apps)", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "App-RTR-response-times", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "App-RTR-response-times-(50th-and-95th-first-10-apps)", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "app-rtr-long-response", + "name": "panel_4", + "type": "search" + } + ] } <% end %> diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Errors.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Errors.json.erb index 7e002d03..bba2b33d 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Errors.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Errors.json.erb @@ -7,66 +7,76 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "id": "Platform-errors-count-in-timeline", - "type": "visualization", - "panelIndex": 1, - "size_x": 6, - "size_y": 3, - "col": 1, - "row": 1 + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 24, + "h": 12, + "i": "1" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-errors-count-by-source-component-(top-5)", - "type": "visualization", - "panelIndex": 2, - "size_x": 3, - "size_y": 3, - "col": 7, - "row": 1 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 24, + "y": 0, + "w": 12, + "h": 12, + "i": "2" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-components-with-errors", - "type": "visualization", - "panelIndex": 3, - "size_x": 3, - "size_y": 3, - "col": 10, - "row": 1 + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 12, + "i": "3" + }, + "embeddableConfig": {} }, { - "id": "platform-all-errors", - "type": "search", - "panelIndex": 4, - "size_x": 12, - "size_y": 7, - "col": 1, - "row": 4, - "columns": [ - "@type", - "@source.component", - "@message" - ], - "sort": [ - "@timestamp", - "desc" - ] - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": true - } - }, - "P-2": { - "vis": { - "legendOpen": true + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 12, + "w": 48, + "h": 28, + "i": "4" + }, + "embeddableConfig": { + "columns": [ + "@type", + "@source.component", + "@message" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -89,5 +99,27 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "Platform-errors-count-in-timeline", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "Platform-errors-count-by-source-component-(top-5)", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "Platform-components-with-errors", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "platform-all-errors", + "name": "panel_3", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Haproxy.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Haproxy.json.erb index b4070968..62984484 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Haproxy.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Haproxy.json.erb @@ -7,81 +7,94 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "col": 1, - "id": "Platform-Haproxy-requests-(top-10)", - "panelIndex": 1, - "row": 1, - "size_x": 4, - "size_y": 3, - "type": "visualization" - }, - { - "col": 5, - "id": "Platform-Haproxy-request-status-codes-in-timeline", - "panelIndex": 2, - "row": 1, - "size_x": 8, - "size_y": 3, - "type": "visualization" + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 16, + "h": 12, + "i": "1" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-Haproxy-request-time-duration", - "type": "visualization", - "panelIndex": 3, - "size_x": 5, - "size_y": 3, - "col": 8, - "row": 4 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 16, + "y": 0, + "w": 32, + "h": 12, + "i": "2" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5)", - "type": "visualization", - "panelIndex": 4, - "size_x": 7, - "size_y": 3, - "col": 1, - "row": 4 + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 28, + "y": 12, + "w": 20, + "h": 12, + "i": "3" + }, + "embeddableConfig": {} }, { - "id": "platform-haproxy", - "type": "search", - "panelIndex": 5, - "size_x": 12, - "size_y": 6, - "col": 1, - "row": 7, - "columns": [ - "@source.job", - "haproxy.time_duration", - "haproxy.http_status_code", - "haproxy.http_request" - ], - "sort": [ - "@timestamp", - "desc" - ] - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": true - } - }, - "P-2": { - "vis": { - "legendOpen": true + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 12, + "w": 28, + "h": 12, + "i": "4" + }, + "embeddableConfig": { + "vis": { + "legendOpen": false + } } }, - "P-4": { - "vis": { - "legendOpen": false + { + "panelIndex": "5", + "panelRefName": "panel_4", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 24, + "w": 48, + "h": 24, + "i": "5" + }, + "embeddableConfig": { + "columns": [ + "@source.job", + "haproxy.time_duration", + "haproxy.http_status_code", + "haproxy.http_request" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -104,5 +117,32 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "Platform-Haproxy-requests-(top-10)", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "Platform-Haproxy-request-status-codes-in-timeline", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "Platform-Haproxy-request-time-duration", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "Platform-Haproxy-request-time-duration-(50th-95th-99th-top-5)", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "platform-haproxy", + "name": "panel_4", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Logs.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Logs.json.erb index 4ce9a0ba..3255f479 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Logs.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Logs.json.erb @@ -7,62 +7,70 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "col": 1, - "id": "Platform-logs-count-(top-10-components)", - "panelIndex": 1, - "row": 1, - "size_x": 4, - "size_y": 5, - "type": "visualization" - }, - { - "id": "Platform-components", - "type": "visualization", - "panelIndex": 2, - "size_x": 4, - "size_y": 5, - "col": 5, - "row": 1 + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 16, + "h": 20, + "i": "1" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-logs-count-by-level", - "type": "visualization", - "panelIndex": 3, - "size_x": 4, - "size_y": 5, - "col": 9, - "row": 1 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 16, + "y": 0, + "w": 16, + "h": 20, + "i": "2" + }, + "embeddableConfig": {} }, { - "col": 1, - "id": "Platform-logs-count-in-timeline", - "panelIndex": 4, - "row": 6, - "size_x": 12, - "size_y": 4, - "type": "visualization" - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": true - } - }, - "P-3": { - "vis": { - "legendOpen": false + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 32, + "y": 0, + "w": 16, + "h": 20, + "i": "3" + }, + "embeddableConfig": { + "vis": { + "legendOpen": false + } } }, - "P-4": { - "vis": { - "legendOpen": true + { + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 20, + "w": 48, + "h": 16, + "i": "4" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -85,5 +93,27 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "Platform-logs-count-(top-10-components)", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "Platform-components", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "Platform-logs-count-by-level", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "Platform-logs-count-in-timeline", + "name": "panel_3", + "type": "visualization" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Overview.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Overview.json.erb index eb86e3a4..948be7fe 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Overview.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-Overview.json.erb @@ -7,78 +7,92 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "id": "Platform-links", - "type": "visualization", - "panelIndex": 1, - "size_x": 5, - "size_y": 2, - "col": 1, - "row": 1 + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 20, + "h": 8, + "i": "1" + }, + "embeddableConfig": {} }, { - "id": "Platform-logs-by-source-job-(top-5)", - "type": "visualization", - "panelIndex": 2, - "size_x": 4, - "size_y": 2, - "col": 6, - "row": 1 - }, - { - "id": "Platform-components", - "type": "visualization", - "panelIndex": 3, - "size_x": 3, - "size_y": 5, - "col": 10, - "row": 1 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 20, + "y": 0, + "w": 16, + "h": 8, + "i": "2" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-logs-by-component-(top-5)", - "type": "visualization", - "panelIndex": 4, - "size_x": 9, - "size_y": 3, - "col": 1, - "row": 3 + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.3.0", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 20, + "i": "3" + }, + "embeddableConfig": {} }, { - "id": "platform-all-overview", - "type": "search", - "panelIndex": 5, - "size_x": 12, - "size_y": 7, - "col": 1, - "row": 6, - "columns": [ - "@source.type", - "@type", - "@source.job", - "@source.component", - "@level", - "@message" - ], - "sort": [ - "@timestamp", - "desc" - ] - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-2": { - "vis": { - "legendOpen": true + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 8, + "w": 36, + "h": 12, + "i": "4" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } } }, - "P-4": { - "vis": { - "legendOpen": true + { + "panelIndex": "5", + "panelRefName": "panel_4", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 20, + "w": 48, + "h": 28, + "i": "5" + }, + "embeddableConfig": { + "columns": [ + "@source.type", + "@type", + "@source.job", + "@source.component", + "@level", + "@message" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -101,5 +115,32 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "Platform-links", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "Platform-logs-by-source-job-(top-5)", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "Platform-components", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "Platform-logs-by-component-(top-5)", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "platform-all-overview", + "name": "panel_4", + "type": "search" + } + ] } diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-UAA-Audit.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-UAA-Audit.json.erb index ff980d4f..0013468a 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-UAA-Audit.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/Platform-UAA-Audit.json.erb @@ -7,60 +7,73 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "id": "Platform-UAA-Audit-event-types", - "type": "visualization", - "panelIndex": 1, - "size_x": 3, - "size_y": 4, - "col": 1, - "row": 1 + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.3.0", + "gridData": { + "x": 0, + "y": 0, + "w": 12, + "h": 16, + "i": "1" + }, + "embeddableConfig": {} }, { - "id": "Platform-UAA-Audit-events-by-type", - "type": "visualization", - "panelIndex": 2, - "size_x": 5, - "size_y": 4, - "col": 4, - "row": 1 + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.3.0", + "gridData": { + "x": 12, + "y": 0, + "w": 20, + "h": 16, + "i": "2" + }, + "embeddableConfig": { + "vis": { + "legendOpen": true + } + } }, { - "id": "Platform-UAA-Audit-event-locations", - "type": "visualization", - "size_x": 4, - "size_y": 4, - "col": 9, - "row": 1 + "panelRefName": "panel_2", + "version": "7.3.0", + "panelIndex": "7fa8fcce-9d2f-4138-aeee-eab7b0b32d51", + "gridData": { + "x": 32, + "y": 0, + "w": 16, + "h": 16, + "i": "7fa8fcce-9d2f-4138-aeee-eab7b0b32d51" + }, + "embeddableConfig": {} }, { - "id": "platform-uaa-audit", - "type": "search", - "size_x": 12, - "size_y": 5, - "col": 1, - "row": 5, - "columns": [ - "@source.job", - "uaa.audit.type", - "uaa.audit.origin", - "uaa.audit.data" - ], - "sort": [ - "@timestamp", - "desc" - ] - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-2": { - "vis": { - "legendOpen": true + "panelRefName": "panel_3", + "version": "7.3.0", + "panelIndex": "f8909a48-2bb3-41b3-a32a-8fca25f31543", + "gridData": { + "x": 0, + "y": 16, + "w": 48, + "h": 20, + "i": "f8909a48-2bb3-41b3-a32a-8fca25f31543" + }, + "embeddableConfig": { + "columns": [ + "@source.job", + "uaa.audit.type", + "uaa.audit.origin", + "uaa.audit.data" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -83,5 +96,27 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "Platform-UAA-Audit-event-types", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "Platform-UAA-Audit-events-by-type", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "Platform-UAA-Audit-event-locations", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "platform-uaa-audit", + "name": "panel_3", + "type": "search" + } + ] } From 10886758cfd9a2cc30596bccf1c3262cdf3532fa Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Tue, 18 Feb 2020 18:46:34 +0300 Subject: [PATCH 4/6] Update cf-kibana blob --- config/blobs.yml | 8 ++++---- packages/cf-kibana/packaging | 2 +- packages/cf-kibana/spec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index c887b8db..c96c04f8 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,7 +1,7 @@ -cf-kibana/kibana-6.8.1-linux-x86_64.tar.gz: - size: 186486884 - object_id: 5fc2ccc4-0130-4d79-614d-369630619bf2 - sha: sha256:45cc8c47286f218abbdab04ec502b5de99c86e3da2e8debadaeb99ac79391e02 +cf-kibana/kibana-7.6.0-linux-x86_64.tar.gz: + size: 249467327 + object_id: 8c2e3050-1d4f-4ded-7f4b-031fb382ec03 + sha: sha256:3dafefee001da4fe20f8ecf31df59f485c48aabe6814d30089ed253e030a599d redis/redis-3.2.9.tar.gz: size: 1547695 object_id: a1230536-4203-40b9-97e1-9f11d470308d diff --git a/packages/cf-kibana/packaging b/packages/cf-kibana/packaging index 1293a499..27f35a0e 100644 --- a/packages/cf-kibana/packaging +++ b/packages/cf-kibana/packaging @@ -1,6 +1,6 @@ set -e -tar xzf cf-kibana/kibana-6.8.1-linux-x86_64.tar.gz --strip 1 -C ${BOSH_INSTALL_TARGET} +tar xzf cf-kibana/kibana-7.6.0-linux-x86_64.tar.gz --strip 1 -C ${BOSH_INSTALL_TARGET} cd ${BOSH_INSTALL_TARGET} bin/kibana-plugin install file:///var/vcap/packages/kibana-auth-plugin/kibana-auth-plugin.zip diff --git a/packages/cf-kibana/spec b/packages/cf-kibana/spec index dd7e2578..b204b0a8 100644 --- a/packages/cf-kibana/spec +++ b/packages/cf-kibana/spec @@ -5,4 +5,4 @@ dependencies: - kibana-auth-plugin files: - - cf-kibana/kibana-6.8.1-linux-x86_64.tar.gz + - cf-kibana/kibana-7.6.0-linux-x86_64.tar.gz From 20f1a3d9a24956ecb11bb4b61b00d00aa671b1fe Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Wed, 19 Feb 2020 14:02:23 +0300 Subject: [PATCH 5/6] Deprecate per-version Kibana configs --- jobs/upload-kibana-objects/spec | 6 ------ .../templates/kibana-objects/config/4.4.0.json.erb | 6 ------ .../templates/kibana-objects/config/4.4.2.json.erb | 10 ---------- .../templates/kibana-objects/config/4.5.4.json.erb | 6 ------ .../templates/kibana-objects/config/6.3.2.json.erb | 7 ------- .../templates/kibana-objects/config/6.4.2.json.erb | 6 ------ 6 files changed, 41 deletions(-) delete mode 100644 jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb delete mode 100644 jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb delete mode 100644 jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb delete mode 100644 jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb delete mode 100644 jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb diff --git a/jobs/upload-kibana-objects/spec b/jobs/upload-kibana-objects/spec index 24eec0e5..7e9b54e7 100644 --- a/jobs/upload-kibana-objects/spec +++ b/jobs/upload-kibana-objects/spec @@ -24,11 +24,6 @@ templates: kibana-objects/index-pattern/logs.json.erb: kibana-objects/index-pattern/logs-*.json kibana-objects/index-pattern/logs-platform.json.erb: kibana-objects/index-pattern/logs-platform*.json - kibana-objects/config/4.4.0.json.erb: kibana-objects/config/4.4.0.json - kibana-objects/config/4.4.2.json.erb: kibana-objects/config/4.4.2.json - kibana-objects/config/4.5.4.json.erb: kibana-objects/config/4.5.4.json - kibana-objects/config/6.3.2.json.erb: kibana-objects/config/6.3.2.json - kibana-objects/search/app-all.json.erb: kibana-objects/search/app-all.json kibana-objects/search/app-all-messages.json.erb: kibana-objects/search/app-all-messages.json kibana-objects/search/app-all-errors.json.erb: kibana-objects/search/app-all-errors.json @@ -102,7 +97,6 @@ properties: description: "List of glob patterns of Kibana objects to upload" default: - {type: index-pattern, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/index-pattern/*.json} - - {type: config, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/config/*.json} - {type: search, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/search/*.json} - {type: visualization, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/visualization/*.json} - {type: dashboard, pattern: /var/vcap/jobs/upload-kibana-objects/kibana-objects/dashboard/*.json} diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb deleted file mode 100644 index 6b198554..00000000 --- a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.0.json.erb +++ /dev/null @@ -1,6 +0,0 @@ -{ - "attributes": { - "buildNum": 9689, - "defaultIndex": "<%= p('elasticsearch_config.app_index_prefix') %>*" - } -} diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb deleted file mode 100644 index d0ada548..00000000 --- a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.4.2.json.erb +++ /dev/null @@ -1,10 +0,0 @@ -{ - "attributes": { - "buildNum": 9732, - "defaultIndex": "<%= p('elasticsearch_config.app_index_prefix') %>*", - "visualization:tileMap:WMSdefaults":"<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { "enabled": true, "url": "https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer", "options": { "version": "1.3.0", "layers": "0", "format": "image/png", "transparent": true, "attribution": "Maps provided by USGS", "styles": "" } } -ENDOFFJSON - %>" - } -} diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb deleted file mode 100644 index ca61469e..00000000 --- a/jobs/upload-kibana-objects/templates/kibana-objects/config/4.5.4.json.erb +++ /dev/null @@ -1,6 +0,0 @@ -{ - "attributes": { - "buildNum": 10000, - "defaultIndex": "<%= p('elasticsearch_config.app_index_prefix') %>*" - } -} diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb deleted file mode 100644 index 1207fa4e..00000000 --- a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.3.2.json.erb +++ /dev/null @@ -1,7 +0,0 @@ -{ - "attributes": { - "defaultIndex": "<%= p('elasticsearch_config.app_index_prefix') %>*", - "telemetry:optIn": false, - "buildNum": 17307 - } -} diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb deleted file mode 100644 index 9f3435cf..00000000 --- a/jobs/upload-kibana-objects/templates/kibana-objects/config/6.4.2.json.erb +++ /dev/null @@ -1,6 +0,0 @@ -{ - "attributes": { - "defaultIndex": "<%= p('elasticsearch_config.app_index_prefix') %>*", - "telemetry:optIn": false - } -} From ab1b6f2fd3fd0b4575c352cec72093d2dcb94a4a Mon Sep 17 00:00:00 2001 From: Alexey Zakharov Date: Wed, 19 Feb 2020 15:15:58 +0300 Subject: [PATCH 6/6] Adopted App-Metrics dashboard to v7 Kibana API --- .../dashboard/App-Metrics.json.erb | 157 +++++++++++------- 1 file changed, 95 insertions(+), 62 deletions(-) diff --git a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Metrics.json.erb b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Metrics.json.erb index 037c1fa1..c1b6e104 100644 --- a/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Metrics.json.erb +++ b/jobs/upload-kibana-objects/templates/kibana-objects/dashboard/App-Metrics.json.erb @@ -8,77 +8,83 @@ "panelsJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } [ { - "col": 1, - "id": "App-METRIC-memory-usage", - "row": 1, - "size_x": 9, - "size_y": 5, - "type": "visualization" + "panelRefName": "panel_0", + "version": "7.3.0", + "panelIndex": "fbf2609d-069d-4a94-bece-9616c4bf9f63", + "gridData": { + "x": 0, + "y": 0, + "w": 36, + "h": 20, + "i": "fbf2609d-069d-4a94-bece-9616c4bf9f63" + }, + "embeddableConfig": {} }, { - "col": 10, - "id": "App-names", - "row": 1, - "size_x": 3, - "size_y": 5, - "type": "visualization" + "panelRefName": "panel_1", + "version": "7.3.0", + "panelIndex": "cf447345-10f2-4fc1-8eff-85914480904e", + "gridData": { + "x": 36, + "y": 0, + "w": 12, + "h": 20, + "i": "cf447345-10f2-4fc1-8eff-85914480904e" + }, + "embeddableConfig": {} }, { - "id": "App-METRIC-CPU-usage", - "type": "visualization", - "size_x": 6, - "size_y": 4, - "col": 1, - "row": 6 + "panelRefName": "panel_2", + "version": "7.3.0", + "panelIndex": "62dd09bb-8dc7-468b-867b-15e4a8b0ac31", + "gridData": { + "x": 0, + "y": 20, + "w": 24, + "h": 16, + "i": "62dd09bb-8dc7-468b-867b-15e4a8b0ac31" + }, + "embeddableConfig": {} }, { - "id": "App-METRIC-disk-usage", - "type": "visualization", - "size_x": 6, - "size_y": 4, - "col": 7, - "row": 6 + "panelRefName": "panel_3", + "version": "7.3.0", + "panelIndex": "4b6427d3-71b4-4799-96b9-13beedc241f5", + "gridData": { + "x": 24, + "y": 20, + "w": 24, + "h": 16, + "i": "4b6427d3-71b4-4799-96b9-13beedc241f5" + }, + "embeddableConfig": {} }, { - "id": "app-container-metric", - "type": "search", - "size_x": 12, - "size_y": 5, - "col": 1, - "row": 10, - "columns": [ - "@cf.app", - "@cf.app_instance", - "containermetric.cpu_percentage", - "containermetric.disk_bytes", - "containermetric.memory_bytes" - ], - "sort": [ - "@timestamp", - "desc" - ] - } - ] -ENDOFFJSON - %>", - "uiStateJSON": "<%= JSON.parse(<<'ENDOFFJSON').to_json.gsub(/"/) { '\"' } - { - "P-1": { - "vis": { - "legendOpen": true - } - }, - "P-3": { - "vis": { - "legendOpen": true - } - }, - "P-4": { - "vis": { - "legendOpen": true + "panelRefName": "panel_4", + "version": "7.3.0", + "panelIndex": "80314e94-e0fa-4607-a89f-8a320a14b59a", + "gridData": { + "x": 0, + "y": 36, + "w": 48, + "h": 20, + "i": "80314e94-e0fa-4607-a89f-8a320a14b59a" + }, + "embeddableConfig": { + "columns": [ + "@cf.app", + "@cf.app_instance", + "containermetric.cpu_percentage", + "containermetric.disk_bytes", + "containermetric.memory_bytes" + ], + "sort": [ + "@timestamp", + "desc" + ] } } - } + ] ENDOFFJSON %>", "optionsJSON": "{\"darkTheme\":false}", @@ -101,6 +107,33 @@ ENDOFFJSON ENDOFFJSON %>" } - } + }, + "references": [ + { + "id": "App-METRIC-memory-usage", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "App-names", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "App-METRIC-CPU-usage", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "App-METRIC-disk-usage", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "app-container-metric", + "name": "panel_4", + "type": "search" + } + ] } <% end %>