From 024d864b49f1dd333529f96e06de6dec15aac703 Mon Sep 17 00:00:00 2001 From: milan-elastic Date: Fri, 26 Apr 2024 13:00:47 +0530 Subject: [PATCH] add dashboard level filter for apache tomcat --- packages/apache_tomcat/changelog.yml | 5 + ...-2a331270-b8cd-11ed-a099-3791d000f969.json | 202 +---------- ...-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223.json | 321 +++++------------ ...-5b24a9c0-0e86-11ee-8c11-879004e1a267.json | 213 ++--------- ...-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8.json | 296 ++++++++------- ...-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195.json | 270 +++++++------- ...-9f21d4e0-b837-11ed-8008-cf66df3fb6bf.json | 26 +- ...-af7759b0-0a75-11ee-a8d8-d15950a587f6.json | 131 +------ ...-c2e71320-bccb-11ed-8065-19219c0d55ab.json | 198 +---------- ...-c8ec7280-1a57-11ee-8c1a-099fb2bcb823.json | 336 ++++-------------- ...-c97374d0-bb78-11ed-812e-b1288b469a47.json | 70 +--- ...-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195.json | 111 ------ ...-4d39c820-ddcd-11ed-8080-ddad81fe2c3c.json | 111 ------ ...-d0957a70-eda4-11ed-909a-2baec7270d1f.json | 124 ------- packages/apache_tomcat/manifest.yml | 2 +- 15 files changed, 570 insertions(+), 1846 deletions(-) delete mode 100644 packages/apache_tomcat/kibana/search/apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195.json delete mode 100644 packages/apache_tomcat/kibana/search/apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c.json delete mode 100644 packages/apache_tomcat/kibana/search/apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f.json diff --git a/packages/apache_tomcat/changelog.yml b/packages/apache_tomcat/changelog.yml index 9bbc5974ce48..166eb7a7a732 100644 --- a/packages/apache_tomcat/changelog.yml +++ b/packages/apache_tomcat/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.5.0" + changes: + - description: Add global filter on data_stream.dataset to improve performance. + type: enhancement + link: https://github.com/elastic/integrations/pull/1 #Fix ME - version: "1.4.0" changes: - description: Enable secrets for sensitive fields. For more details, refer https://www.elastic.co/guide/en/fleet/current/agent-policy.html#agent-policy-secret-values diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-2a331270-b8cd-11ed-a099-3791d000f969.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-2a331270-b8cd-11ed-a099-3791d000f969.json index 1bc2443c4519..823dde6a4486 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-2a331270-b8cd-11ed-a099-3791d000f969.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-2a331270-b8cd-11ed-a099-3791d000f969.json @@ -17,9 +17,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.session" @@ -28,7 +28,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.session" + "data_stream.dataset": "apache_tomcat.session" } } } @@ -55,11 +55,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-0175242f-2671-474a-a828-deff61e43fb6", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "34b8c32b-1aaf-45de-bdb4-09081617f0c8", - "type": "index-pattern" } ], "state": { @@ -145,29 +140,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "34b8c32b-1aaf-45de-bdb4-09081617f0c8", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -221,8 +194,7 @@ }, "panelIndex": "a39adf70-8e40-4d80-a127-a1747a75be1f", "title": "Created sessions over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -232,11 +204,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-85bb5555-4581-4120-ab66-6ce66aeb4066", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "fa5f9b9a-65b0-452a-bcd0-1df3a33b1b3e", - "type": "index-pattern" } ], "state": { @@ -322,29 +289,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "fa5f9b9a-65b0-452a-bcd0-1df3a33b1b3e", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -421,8 +366,7 @@ }, "panelIndex": "91d26f64-351f-420e-a37b-88a882ecba0e", "title": "Expired sessions per application [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -432,11 +376,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-57b12f03-6995-4072-8994-d512e5700ee4", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "de6b5c32-5630-4877-8b24-be30c47ee9c1", - "type": "index-pattern" } ], "state": { @@ -522,29 +461,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "de6b5c32-5630-4877-8b24-be30c47ee9c1", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -603,8 +520,7 @@ }, "panelIndex": "5922510e-e6a2-4f9c-aceb-83715cc3b539", "title": "Current active sessions over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -615,11 +531,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-9b0dd57c-eb2b-434c-a7d6-21a8e5e83e8b", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "efe32f1b-651c-4ce4-a1e9-06cb0cf2d5af", - "type": "index-pattern" } ], "state": { @@ -685,29 +596,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "efe32f1b-651c-4ce4-a1e9-06cb0cf2d5af", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -772,8 +661,7 @@ }, "panelIndex": "2d408e1c-da52-4aed-b760-812f89f48184", "title": "Session expiration processing time [Metric Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -783,11 +671,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-8533f30a-f59a-4f19-8a60-2231660778cf", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "1df29502-1178-4b06-b0c8-3009d0c3271b", - "type": "index-pattern" } ], "state": { @@ -904,29 +787,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "1df29502-1178-4b06-b0c8-3009d0c3271b", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -985,20 +846,17 @@ }, "panelIndex": "8ce83532-0623-4974-9280-b6c56c6b0c27", "title": "Sessions overview [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Session", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-06-09T11:27:22.150Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T08:47:19.036Z", "id": "apache_tomcat-2a331270-b8cd-11ed-a099-3791d000f969", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -1010,51 +868,26 @@ "name": "a39adf70-8e40-4d80-a127-a1747a75be1f:indexpattern-datasource-layer-0175242f-2671-474a-a828-deff61e43fb6", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "a39adf70-8e40-4d80-a127-a1747a75be1f:34b8c32b-1aaf-45de-bdb4-09081617f0c8", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "91d26f64-351f-420e-a37b-88a882ecba0e:indexpattern-datasource-layer-85bb5555-4581-4120-ab66-6ce66aeb4066", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "91d26f64-351f-420e-a37b-88a882ecba0e:fa5f9b9a-65b0-452a-bcd0-1df3a33b1b3e", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "5922510e-e6a2-4f9c-aceb-83715cc3b539:indexpattern-datasource-layer-57b12f03-6995-4072-8994-d512e5700ee4", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "5922510e-e6a2-4f9c-aceb-83715cc3b539:de6b5c32-5630-4877-8b24-be30c47ee9c1", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "2d408e1c-da52-4aed-b760-812f89f48184:indexpattern-datasource-layer-9b0dd57c-eb2b-434c-a7d6-21a8e5e83e8b", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "2d408e1c-da52-4aed-b760-812f89f48184:efe32f1b-651c-4ce4-a1e9-06cb0cf2d5af", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "8ce83532-0623-4974-9280-b6c56c6b0c27:indexpattern-datasource-layer-8533f30a-f59a-4f19-8a60-2231660778cf", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "8ce83532-0623-4974-9280-b6c56c6b0c27:1df29502-1178-4b06-b0c8-3009d0c3271b", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "controlGroup_48036e6b-bb5f-4779-8ff2-a0affc20a119:optionsListDataView", @@ -1066,5 +899,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223.json index 4df83671119a..431dbf19ec2a 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223.json @@ -11,9 +11,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.access" @@ -22,7 +22,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.access" + "data_stream.dataset": "apache_tomcat.access" } } } @@ -52,12 +52,7 @@ }, { "id": "logs-*", - "name": "167c0497-503a-417c-a30c-768525e8b8dc", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "8c6e9f3c-a1db-4cf0-8b30-1d860be11d98", + "name": "9e014f3c-d19f-4e8c-9992-0053e2cff960", "type": "index-pattern" } ], @@ -125,27 +120,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "167c0497-503a-417c-a30c-768525e8b8dc", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -154,7 +128,7 @@ "alias": null, "disabled": false, "field": "http.response.status_code", - "index": "8c6e9f3c-a1db-4cf0-8b30-1d860be11d98", + "index": "9e014f3c-d19f-4e8c-9992-0053e2cff960", "key": "http.response.status_code", "negate": false, "params": { @@ -242,8 +216,7 @@ }, "panelIndex": "af3cd65d-02e9-477c-8b3b-45f4b717a982", "title": "Top 10 client IPs with most client errors [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -256,12 +229,7 @@ }, { "id": "logs-*", - "name": "0a1fad48-e8d5-4a9b-b8bb-fc7067521d7a", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "758d6656-914a-4304-bbe7-f85474ef30b9", + "name": "5d4ff327-4d18-4187-8e53-d6216c07701f", "type": "index-pattern" } ], @@ -329,27 +297,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "0a1fad48-e8d5-4a9b-b8bb-fc7067521d7a", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -358,7 +305,7 @@ "alias": null, "disabled": false, "field": "http.response.status_code", - "index": "758d6656-914a-4304-bbe7-f85474ef30b9", + "index": "5d4ff327-4d18-4187-8e53-d6216c07701f", "key": "http.response.status_code", "negate": false, "params": { @@ -445,8 +392,7 @@ }, "panelIndex": "30187e6e-f500-4abd-b7c7-ebc64d84e2d9", "title": "Top 10 client IPs with most server errors [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -459,12 +405,7 @@ }, { "id": "logs-*", - "name": "54abd3e5-f8e0-40b6-b458-c1a6906bf3f5", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "72bc9598-8105-4c02-b17a-8d8e8acae300", + "name": "514f5bf9-1cf9-4864-8398-945d0168d126", "type": "index-pattern" } ], @@ -530,28 +471,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "54abd3e5-f8e0-40b6-b458-c1a6906bf3f5", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -560,7 +479,7 @@ "alias": null, "disabled": false, "field": "apache_tomcat.access.response_time", - "index": "72bc9598-8105-4c02-b17a-8d8e8acae300", + "index": "514f5bf9-1cf9-4864-8398-945d0168d126", "key": "apache_tomcat.access.response_time", "negate": false, "type": "exists", @@ -616,8 +535,7 @@ }, "panelIndex": "56ec99b7-5962-4037-b99b-522e2b02882e", "title": "Distribution of average response time by URL [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -627,11 +545,6 @@ "id": "logs-*", "name": "indexpattern-datasource-layer-f4afc69c-a9d0-4b77-be15-d391fcbfe495", "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "2e2072ab-084c-42d9-8d7e-c9171319f95a", - "type": "index-pattern" } ], "state": { @@ -720,29 +633,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "2e2072ab-084c-42d9-8d7e-c9171319f95a", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -785,8 +676,7 @@ }, "panelIndex": "2b880159-9649-4c31-a5c0-a1d93fcdfad3", "title": "Distribution of access events by OS name and version [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -800,12 +690,7 @@ }, { "id": "logs-*", - "name": "4b8a9e86-71d4-4b03-9049-bf28ec63ac90", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "8d346bac-67c0-4aed-ad35-3a5693fc2836", + "name": "5cadfb38-6e24-4b34-8946-c384933cfd78", "type": "index-pattern" } ], @@ -873,27 +758,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "4b8a9e86-71d4-4b03-9049-bf28ec63ac90", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -902,7 +766,7 @@ "alias": null, "disabled": false, "field": "http.response.status_code", - "index": "8d346bac-67c0-4aed-ad35-3a5693fc2836", + "index": "5cadfb38-6e24-4b34-8946-c384933cfd78", "key": "http.response.status_code", "negate": false, "params": { @@ -967,8 +831,7 @@ }, "panelIndex": "911f0638-46a9-4967-b588-a05fddc3ed62", "title": "Distribution by HTTP Client(4xx) and Server(5xx) error status code [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -978,11 +841,6 @@ "id": "logs-*", "name": "indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", - "type": "index-pattern" } ], "state": { @@ -1048,29 +906,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -1113,8 +949,7 @@ }, "panelIndex": "ddb0844d-afd9-45d7-af40-d2153f020847", "title": "Distribution by HTTP status code [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -1235,37 +1070,84 @@ }, "panelIndex": "3cccb19d-989d-4942-b1c6-5b122c0e0f2b", "title": "Distribution of access events by connection status [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { - "enhancements": {}, - "hidePanelTitles": false + "attributes": { + "columns": [ + "source.ip", + "url.original", + "http.response.status_code" + ], + "grid": { + "columns": { + "http.response.status_code": { + "width": 183 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"data_stream.dataset\",\"key\":\"data_stream.dataset\",\"negate\":false,\"params\":{\"query\":\"apache_tomcat.access\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"data_stream.dataset\":\"apache_tomcat.access\"}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"http.response.status_code\",\"key\":\"http.response.status_code\",\"negate\":false,\"params\":{\"gte\":\"400\",\"lt\":\"599\"},\"type\":\"range\",\"value\":{\"gte\":\"400\",\"lt\":\"599\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"query\":{\"range\":{\"http.response.status_code\":{\"gte\":\"400\",\"lt\":\"599\"}}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + } + ], + "refreshInterval": { + "pause": true, + "value": 60000 + }, + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRange": { + "from": "now-1y/d", + "to": "now" + }, + "timeRestore": false, + "usesAdHocDataView": false + }, + "enhancements": {} }, "gridData": { "h": 15, - "i": "5e9ce033-01e7-4c67-b228-becf11b14785", + "i": "43acabc9-d503-4215-8115-9b32976409ae", "w": 24, "x": 24, "y": 45 }, - "panelIndex": "5e9ce033-01e7-4c67-b228-becf11b14785", - "panelRefName": "panel_5e9ce033-01e7-4c67-b228-becf11b14785", - "type": "search", - "version": "8.7.0" + "panelIndex": "43acabc9-d503-4215-8115-9b32976409ae", + "title": "Client and Server HTTP error details [Logs Apache Tomcat]", + "type": "search" } ], "timeRestore": false, "title": "[Logs Apache Tomcat] Access", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T12:48:07.116Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:17:00.658Z", "id": "apache_tomcat-44a8e0d0-b8f5-11ed-ac9b-cb6bcd97d223", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "logs-*", @@ -1279,12 +1161,7 @@ }, { "id": "logs-*", - "name": "af3cd65d-02e9-477c-8b3b-45f4b717a982:167c0497-503a-417c-a30c-768525e8b8dc", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "af3cd65d-02e9-477c-8b3b-45f4b717a982:8c6e9f3c-a1db-4cf0-8b30-1d860be11d98", + "name": "af3cd65d-02e9-477c-8b3b-45f4b717a982:9e014f3c-d19f-4e8c-9992-0053e2cff960", "type": "index-pattern" }, { @@ -1294,12 +1171,7 @@ }, { "id": "logs-*", - "name": "30187e6e-f500-4abd-b7c7-ebc64d84e2d9:0a1fad48-e8d5-4a9b-b8bb-fc7067521d7a", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "30187e6e-f500-4abd-b7c7-ebc64d84e2d9:758d6656-914a-4304-bbe7-f85474ef30b9", + "name": "30187e6e-f500-4abd-b7c7-ebc64d84e2d9:5d4ff327-4d18-4187-8e53-d6216c07701f", "type": "index-pattern" }, { @@ -1309,12 +1181,7 @@ }, { "id": "logs-*", - "name": "56ec99b7-5962-4037-b99b-522e2b02882e:54abd3e5-f8e0-40b6-b458-c1a6906bf3f5", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "56ec99b7-5962-4037-b99b-522e2b02882e:72bc9598-8105-4c02-b17a-8d8e8acae300", + "name": "56ec99b7-5962-4037-b99b-522e2b02882e:514f5bf9-1cf9-4864-8398-945d0168d126", "type": "index-pattern" }, { @@ -1324,44 +1191,40 @@ }, { "id": "logs-*", - "name": "2b880159-9649-4c31-a5c0-a1d93fcdfad3:2e2072ab-084c-42d9-8d7e-c9171319f95a", + "name": "911f0638-46a9-4967-b588-a05fddc3ed62:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", "type": "index-pattern" }, { "id": "logs-*", - "name": "911f0638-46a9-4967-b588-a05fddc3ed62:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", + "name": "911f0638-46a9-4967-b588-a05fddc3ed62:5cadfb38-6e24-4b34-8946-c384933cfd78", "type": "index-pattern" }, { "id": "logs-*", - "name": "911f0638-46a9-4967-b588-a05fddc3ed62:4b8a9e86-71d4-4b03-9049-bf28ec63ac90", + "name": "ddb0844d-afd9-45d7-af40-d2153f020847:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", "type": "index-pattern" }, { "id": "logs-*", - "name": "911f0638-46a9-4967-b588-a05fddc3ed62:8d346bac-67c0-4aed-ad35-3a5693fc2836", + "name": "3cccb19d-989d-4942-b1c6-5b122c0e0f2b:indexpattern-datasource-layer-1dd41a44-76bb-4cc0-adca-9acc7307125b", "type": "index-pattern" }, { "id": "logs-*", - "name": "ddb0844d-afd9-45d7-af40-d2153f020847:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", + "name": "43acabc9-d503-4215-8115-9b32976409ae:kibanaSavedObjectMeta.searchSourceJSON.index", "type": "index-pattern" }, { "id": "logs-*", - "name": "ddb0844d-afd9-45d7-af40-d2153f020847:b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", + "name": "43acabc9-d503-4215-8115-9b32976409ae:kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", "type": "index-pattern" }, { "id": "logs-*", - "name": "3cccb19d-989d-4942-b1c6-5b122c0e0f2b:indexpattern-datasource-layer-1dd41a44-76bb-4cc0-adca-9acc7307125b", + "name": "43acabc9-d503-4215-8115-9b32976409ae:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", "type": "index-pattern" - }, - { - "id": "apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f", - "name": "5e9ce033-01e7-4c67-b228-becf11b14785:panel_5e9ce033-01e7-4c67-b228-becf11b14785", - "type": "search" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-5b24a9c0-0e86-11ee-8c11-879004e1a267.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-5b24a9c0-0e86-11ee-8c11-879004e1a267.json index 9bb4ee02c9cf..866adc2a1153 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-5b24a9c0-0e86-11ee-8c11-879004e1a267.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-5b24a9c0-0e86-11ee-8c11-879004e1a267.json @@ -17,9 +17,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.thread_pool" @@ -28,7 +28,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" + "data_stream.dataset": "apache_tomcat.thread_pool" } } } @@ -56,11 +56,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-05b7c993-53aa-433b-9754-7c1d297dbbad", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "37c53ea7-8de0-4acb-955f-38c67bd51b0a", - "type": "index-pattern" } ], "state": { @@ -99,30 +94,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "37c53ea7-8de0-4acb-955f-38c67bd51b0a", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -153,8 +125,7 @@ }, "panelIndex": "f9c94977-dd52-43b4-922f-4341aacacf07", "title": "Total threads [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -165,11 +136,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-a6c3093d-5a17-4f06-831e-4bc8428628cf", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "5b583af7-2a44-43ac-b787-9d6fc93f6374", - "type": "index-pattern" } ], "state": { @@ -290,30 +256,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "5b583af7-2a44-43ac-b787-9d6fc93f6374", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -366,12 +309,11 @@ "i": "29239466-a1a0-456b-a1f8-5209e6c26339", "w": 39, "x": 9, - "y": 4 + "y": 0 }, "panelIndex": "29239466-a1a0-456b-a1f8-5209e6c26339", "title": "Threads count by state over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -387,11 +329,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-e1e0cfc0-ff9f-4f4c-924a-a4d5ebc4d2ee", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "2a8c013c-a759-4b11-81f2-65a7797491c7", - "type": "index-pattern" } ], "state": { @@ -484,30 +421,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "2a8c013c-a759-4b11-81f2-65a7797491c7", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -590,12 +504,11 @@ "i": "a4b1a059-57c5-469a-9c83-936263c4c73c", "w": 48, "x": 0, - "y": 11 + "y": 10 }, "panelIndex": "a4b1a059-57c5-469a-9c83-936263c4c73c", "title": "Number of connections over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -605,11 +518,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-76459985-8ced-4307-8994-b36fcde849cc", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "d2a87cd7-ddfb-45b0-81cd-64a63f6b2290", - "type": "index-pattern" } ], "state": { @@ -668,29 +576,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "d2a87cd7-ddfb-45b0-81cd-64a63f6b2290", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -750,12 +636,11 @@ "i": "31540e97-068b-4767-b7bd-373d35f8c6fe", "w": 48, "x": 0, - "y": 22 + "y": 21 }, "panelIndex": "31540e97-068b-4767-b7bd-373d35f8c6fe", "title": "Allocated bytes in current threads over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -766,11 +651,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-b6e6d14b-5440-4a1c-882f-a698d66eacfb", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "9bb893c7-c116-49ed-99b8-2e35efd24bf3", - "type": "index-pattern" } ], "state": { @@ -823,29 +703,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "9bb893c7-c116-49ed-99b8-2e35efd24bf3", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -888,24 +746,21 @@ "i": "5756b1ad-a32f-4248-8337-9cce4fb74b3e", "w": 48, "x": 0, - "y": 33 + "y": 32 }, "panelIndex": "5756b1ad-a32f-4248-8337-9cce4fb74b3e", "title": "Processing threads termination time over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Thread Pool", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-19T08:01:33.946Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T08:51:28.183Z", "id": "apache_tomcat-5b24a9c0-0e86-11ee-8c11-879004e1a267", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -917,21 +772,11 @@ "name": "f9c94977-dd52-43b4-922f-4341aacacf07:indexpattern-datasource-layer-05b7c993-53aa-433b-9754-7c1d297dbbad", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "f9c94977-dd52-43b4-922f-4341aacacf07:37c53ea7-8de0-4acb-955f-38c67bd51b0a", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "29239466-a1a0-456b-a1f8-5209e6c26339:indexpattern-datasource-layer-a6c3093d-5a17-4f06-831e-4bc8428628cf", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "29239466-a1a0-456b-a1f8-5209e6c26339:5b583af7-2a44-43ac-b787-9d6fc93f6374", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "a4b1a059-57c5-469a-9c83-936263c4c73c:indexpattern-datasource-layer-1f96fdb7-93b8-4ced-9765-f891869c6b47", @@ -942,31 +787,16 @@ "name": "a4b1a059-57c5-469a-9c83-936263c4c73c:indexpattern-datasource-layer-e1e0cfc0-ff9f-4f4c-924a-a4d5ebc4d2ee", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "a4b1a059-57c5-469a-9c83-936263c4c73c:2a8c013c-a759-4b11-81f2-65a7797491c7", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "31540e97-068b-4767-b7bd-373d35f8c6fe:indexpattern-datasource-layer-76459985-8ced-4307-8994-b36fcde849cc", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "31540e97-068b-4767-b7bd-373d35f8c6fe:d2a87cd7-ddfb-45b0-81cd-64a63f6b2290", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "5756b1ad-a32f-4248-8337-9cce4fb74b3e:indexpattern-datasource-layer-b6e6d14b-5440-4a1c-882f-a698d66eacfb", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "5756b1ad-a32f-4248-8337-9cce4fb74b3e:9bb893c7-c116-49ed-99b8-2e35efd24bf3", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "controlGroup_77e2e883-4872-4992-80ef-ad4bce414173:optionsListDataView", @@ -978,5 +808,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8.json index 71bf9e6dd495..3f5a884f0eb4 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8.json @@ -17,18 +17,37 @@ "meta": { "alias": null, "disabled": false, - "field": "event.module", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.module", + "key": "data_stream.dataset", "negate": false, - "params": { - "query": "apache_tomcat" - }, - "type": "phrase" + "params": [ + "apache_tomcat.access", + "apache_tomcat.catalina", + "apache_tomcat.localhost" + ], + "type": "phrases" }, "query": { - "match_phrase": { - "event.module": "apache_tomcat" + "bool": { + "minimum_should_match": 1, + "should": [ + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.access" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.catalina" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.localhost" + } + } + ] } } } @@ -55,11 +74,6 @@ "id": "logs-*", "name": "indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", - "type": "index-pattern" } ], "state": { @@ -125,29 +139,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -190,8 +182,7 @@ }, "panelIndex": "b089289a-38be-4f6f-8519-ef9b20a77409", "title": "Distribution by HTTP status code [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -205,12 +196,7 @@ }, { "id": "logs-*", - "name": "25ce66fb-534d-42a3-9baf-e3c7768ee2d6", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "adb3c9a7-d289-4c05-9c2b-0791a5c482ff", + "name": "27726488-c222-4017-9646-dc2a3a3438e8", "type": "index-pattern" } ], @@ -278,27 +264,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "25ce66fb-534d-42a3-9baf-e3c7768ee2d6", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -307,7 +272,7 @@ "alias": null, "disabled": false, "field": "http.response.status_code", - "index": "adb3c9a7-d289-4c05-9c2b-0791a5c482ff", + "index": "27726488-c222-4017-9646-dc2a3a3438e8", "key": "http.response.status_code", "negate": false, "params": { @@ -372,8 +337,7 @@ }, "panelIndex": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d", "title": "Distribution by HTTP Client(4xx) and Server(5xx) error status code [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -386,12 +350,7 @@ }, { "id": "logs-*", - "name": "44d71f68-2675-4ed4-adb5-9f2bdce23a3a", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "cfb45038-17c1-40f9-b31e-916d1eefc5c6", + "name": "9ac46d7b-7d38-4e7c-b723-2ace8d3a1c52", "type": "index-pattern" } ], @@ -482,28 +441,6 @@ } }, "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "44d71f68-2675-4ed4-adb5-9f2bdce23a3a", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, { "$state": { "store": "appState" @@ -512,7 +449,7 @@ "alias": null, "disabled": false, "field": "http.response.status_code", - "index": "cfb45038-17c1-40f9-b31e-916d1eefc5c6", + "index": "9ac46d7b-7d38-4e7c-b723-2ace8d3a1c52", "key": "http.response.status_code", "negate": false, "params": { @@ -586,56 +523,141 @@ }, "panelIndex": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7", "title": "Top error causing URLs with hosts [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { - "enhancements": {}, - "hidePanelTitles": false + "attributes": { + "columns": [ + "apache_tomcat.catalina.subsystem", + "log.level", + "message" + ], + "grid": { + "columns": { + "apache_tomcat.catalina.subsystem": { + "width": 240 + }, + "log.level": { + "width": 78 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"data_stream.dataset\",\"key\":\"data_stream.dataset\",\"negate\":false,\"params\":{\"query\":\"apache_tomcat.catalina\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"data_stream.dataset\":\"apache_tomcat.catalina\"}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"log.level\",\"key\":\"log.level\",\"negate\":true,\"params\":{\"query\":\"info\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"query\":{\"match_phrase\":{\"log.level\":\"info\"}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + } + ], + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRestore": false, + "usesAdHocDataView": false + }, + "enhancements": {} }, "gridData": { "h": 15, - "i": "f02e494c-1b62-407e-a402-7799e9fab580", + "i": "74487d6a-9478-485f-b6da-91f9f5b974d0", "w": 48, "x": 0, "y": 30 }, - "panelIndex": "f02e494c-1b62-407e-a402-7799e9fab580", - "panelRefName": "panel_f02e494c-1b62-407e-a402-7799e9fab580", - "title": "Catalina Logs overview [Logs Apache Tomcat]", - "type": "search", - "version": "8.7.0" + "panelIndex": "74487d6a-9478-485f-b6da-91f9f5b974d0", + "title": "Catalina logs overview [Logs Apache Tomcat]", + "type": "search" }, { "embeddableConfig": { - "enhancements": {}, - "hidePanelTitles": false + "attributes": { + "columns": [ + "apache_tomcat.localhost.subsystem", + "log.level", + "message" + ], + "grid": { + "columns": { + "apache_tomcat.localhost.subsystem": { + "width": 248 + }, + "log.level": { + "width": 75 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"data_stream.dataset\",\"key\":\"data_stream.dataset\",\"negate\":false,\"params\":{\"query\":\"apache_tomcat.localhost\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"data_stream.dataset\":\"apache_tomcat.localhost\"}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"log.level\",\"key\":\"log.level\",\"negate\":true,\"params\":{\"query\":\"info\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"query\":{\"match_phrase\":{\"log.level\":\"info\"}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + } + ], + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRestore": false, + "usesAdHocDataView": false + }, + "enhancements": {} }, "gridData": { "h": 15, - "i": "9940557b-4932-4f76-8aec-029ddac34539", + "i": "1cb8c14e-fcc5-428d-8d3c-95fcd031e0b8", "w": 48, "x": 0, "y": 45 }, - "panelIndex": "9940557b-4932-4f76-8aec-029ddac34539", - "panelRefName": "panel_9940557b-4932-4f76-8aec-029ddac34539", - "title": "Localhost Logs overview [Logs Apache Tomcat]", - "type": "search", - "version": "8.7.0" + "panelIndex": "1cb8c14e-fcc5-428d-8d3c-95fcd031e0b8", + "title": "Localhost logs overview [Logs Apache Tomcat]", + "type": "search" } ], "timeRestore": false, "title": "[Logs Apache Tomcat] Overview", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T12:48:07.116Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:02:01.512Z", "id": "apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "logs-*", @@ -649,48 +671,53 @@ }, { "id": "logs-*", - "name": "b089289a-38be-4f6f-8519-ef9b20a77409:b6532743-79d3-4ab0-bdfa-fff8aa69c7a9", + "name": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", "type": "index-pattern" }, { "id": "logs-*", - "name": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d:indexpattern-datasource-layer-55ba9c87-2de6-468b-ae00-ab24cdb6c2d7", + "name": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d:27726488-c222-4017-9646-dc2a3a3438e8", "type": "index-pattern" }, { "id": "logs-*", - "name": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d:25ce66fb-534d-42a3-9baf-e3c7768ee2d6", + "name": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7:indexpattern-datasource-layer-d30a1b56-5918-4732-850a-381fab2c59fb", "type": "index-pattern" }, { "id": "logs-*", - "name": "2f7de9ea-b38c-4a20-9f50-2c50f76f450d:adb3c9a7-d289-4c05-9c2b-0791a5c482ff", + "name": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7:9ac46d7b-7d38-4e7c-b723-2ace8d3a1c52", "type": "index-pattern" }, { "id": "logs-*", - "name": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7:indexpattern-datasource-layer-d30a1b56-5918-4732-850a-381fab2c59fb", + "name": "74487d6a-9478-485f-b6da-91f9f5b974d0:kibanaSavedObjectMeta.searchSourceJSON.index", "type": "index-pattern" }, { "id": "logs-*", - "name": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7:44d71f68-2675-4ed4-adb5-9f2bdce23a3a", + "name": "74487d6a-9478-485f-b6da-91f9f5b974d0:kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", "type": "index-pattern" }, { "id": "logs-*", - "name": "e87fc489-df1a-4f67-9d91-7b3383fcb8c7:cfb45038-17c1-40f9-b31e-916d1eefc5c6", + "name": "74487d6a-9478-485f-b6da-91f9f5b974d0:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", "type": "index-pattern" }, { - "id": "apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195", - "name": "f02e494c-1b62-407e-a402-7799e9fab580:panel_f02e494c-1b62-407e-a402-7799e9fab580", - "type": "search" + "id": "logs-*", + "name": "1cb8c14e-fcc5-428d-8d3c-95fcd031e0b8:kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "1cb8c14e-fcc5-428d-8d3c-95fcd031e0b8:kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" }, { - "id": "apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c", - "name": "9940557b-4932-4f76-8aec-029ddac34539:panel_9940557b-4932-4f76-8aec-029ddac34539", - "type": "search" + "id": "logs-*", + "name": "1cb8c14e-fcc5-428d-8d3c-95fcd031e0b8:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" }, { "id": "logs-*", @@ -698,5 +725,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195.json index 3e2812e74495..d88c450d4329 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195.json @@ -11,52 +11,33 @@ "meta": { "alias": null, "disabled": false, + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "key": "data_stream.dataset", "negate": false, "params": [ - { - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "logs-*", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.catalina" - }, - "type": "phrase" - }, - "query": { + "apache_tomcat.catalina", + "apache_tomcat.localhost" + ], + "type": "phrases" + }, + "query": { + "bool": { + "minimum_should_match": 1, + "should": [ + { "match_phrase": { - "event.dataset": "apache_tomcat.catalina" + "data_stream.dataset": "apache_tomcat.catalina" } - } - }, - { - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "logs-*", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.localhost" - }, - "type": "phrase" }, - "query": { + { "match_phrase": { - "event.dataset": "apache_tomcat.localhost" + "data_stream.dataset": "apache_tomcat.localhost" } } - } - ], - "relation": "OR", - "type": "combined" - }, - "query": {} + ] + } + } } ], "query": { @@ -81,11 +62,6 @@ "id": "logs-*", "name": "indexpattern-datasource-layer-e970fe93-30db-448b-b159-3d0afe1b7953", "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "be7a31fc-fdbf-4791-81bc-e7c6f7fd4e72", - "type": "index-pattern" } ], "state": { @@ -147,30 +123,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "be7a31fc-fdbf-4791-81bc-e7c6f7fd4e72", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.catalina" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.catalina" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -213,8 +166,7 @@ }, "panelIndex": "ce217a0a-1038-4867-b22b-c51765d12c99", "title": "Distribution of Catalina events by log level [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -225,11 +177,6 @@ "id": "logs-*", "name": "indexpattern-datasource-layer-996302ea-5ca4-458a-b92b-8b1c8e76adf6", "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "1fb283e4-af20-4f0b-b875-baaaacd84281", - "type": "index-pattern" } ], "state": { @@ -291,30 +238,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "1fb283e4-af20-4f0b-b875-baaaacd84281", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.localhost" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.localhost" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -357,56 +281,143 @@ }, "panelIndex": "e48f4633-1502-44e1-b093-2b9bc378d24c", "title": "Distribution of Localhost events by log level [Logs Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { + "attributes": { + "columns": [ + "apache_tomcat.catalina.subsystem", + "log.level", + "message" + ], + "grid": { + "columns": { + "apache_tomcat.catalina.subsystem": { + "width": 240 + }, + "log.level": { + "width": 78 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"data_stream.dataset\",\"key\":\"data_stream.dataset\",\"negate\":false,\"params\":{\"query\":\"apache_tomcat.catalina\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"data_stream.dataset\":\"apache_tomcat.catalina\"}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"log.level\",\"key\":\"log.level\",\"negate\":true,\"params\":{\"query\":\"info\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"query\":{\"match_phrase\":{\"log.level\":\"info\"}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + } + ], + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRestore": false, + "usesAdHocDataView": false + }, "enhancements": {}, "hidePanelTitles": false }, "gridData": { "h": 14, - "i": "e9897b3c-32b2-4c12-9510-4e1685ecb611", + "i": "2b6abb8b-9434-489f-b900-ef03efa9fc8f", "w": 48, "x": 0, "y": 14 }, - "panelIndex": "e9897b3c-32b2-4c12-9510-4e1685ecb611", - "panelRefName": "panel_e9897b3c-32b2-4c12-9510-4e1685ecb611", + "panelIndex": "2b6abb8b-9434-489f-b900-ef03efa9fc8f", "title": "Catalina Logs overview [Logs Apache Tomcat]", - "type": "search", - "version": "8.7.0" + "type": "search" }, { "embeddableConfig": { + "attributes": { + "columns": [ + "apache_tomcat.localhost.subsystem", + "log.level", + "message" + ], + "grid": { + "columns": { + "apache_tomcat.localhost.subsystem": { + "width": 248 + }, + "log.level": { + "width": 75 + } + } + }, + "hideChart": false, + "isTextBasedQuery": false, + "kibanaSavedObjectMeta": { + "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"data_stream.dataset\",\"key\":\"data_stream.dataset\",\"negate\":false,\"params\":{\"query\":\"apache_tomcat.localhost\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"data_stream.dataset\":\"apache_tomcat.localhost\"}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":null,\"disabled\":false,\"field\":\"log.level\",\"key\":\"log.level\",\"negate\":true,\"params\":{\"query\":\"info\"},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"query\":{\"match_phrase\":{\"log.level\":\"info\"}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + } + ], + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "timeRestore": false, + "usesAdHocDataView": false + }, "enhancements": {}, "hidePanelTitles": false }, "gridData": { "h": 14, - "i": "8901474e-f646-4eb9-b734-667804d70207", + "i": "3f40d201-41dd-44ad-9f5d-9280b0e31dfd", "w": 48, "x": 0, "y": 28 }, - "panelIndex": "8901474e-f646-4eb9-b734-667804d70207", - "panelRefName": "panel_8901474e-f646-4eb9-b734-667804d70207", + "panelIndex": "3f40d201-41dd-44ad-9f5d-9280b0e31dfd", "title": "Localhost Logs overview [Logs Apache Tomcat]", - "type": "search", - "version": "8.7.0" + "type": "search" } ], "timeRestore": false, "title": "[Logs Apache Tomcat] Catalina and Localhost", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T10:47:18.401Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:02:35.037Z", "id": "apache_tomcat-9c66eb10-dd0c-11ed-9f4f-d97c9f37d195", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "logs-*", @@ -420,29 +431,40 @@ }, { "id": "logs-*", - "name": "ce217a0a-1038-4867-b22b-c51765d12c99:be7a31fc-fdbf-4791-81bc-e7c6f7fd4e72", + "name": "e48f4633-1502-44e1-b093-2b9bc378d24c:indexpattern-datasource-layer-996302ea-5ca4-458a-b92b-8b1c8e76adf6", "type": "index-pattern" }, { "id": "logs-*", - "name": "e48f4633-1502-44e1-b093-2b9bc378d24c:indexpattern-datasource-layer-996302ea-5ca4-458a-b92b-8b1c8e76adf6", + "name": "2b6abb8b-9434-489f-b900-ef03efa9fc8f:kibanaSavedObjectMeta.searchSourceJSON.index", "type": "index-pattern" }, { "id": "logs-*", - "name": "e48f4633-1502-44e1-b093-2b9bc378d24c:1fb283e4-af20-4f0b-b875-baaaacd84281", + "name": "2b6abb8b-9434-489f-b900-ef03efa9fc8f:kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", "type": "index-pattern" }, { - "id": "apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195", - "name": "e9897b3c-32b2-4c12-9510-4e1685ecb611:panel_e9897b3c-32b2-4c12-9510-4e1685ecb611", - "type": "search" + "id": "logs-*", + "name": "2b6abb8b-9434-489f-b900-ef03efa9fc8f:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "3f40d201-41dd-44ad-9f5d-9280b0e31dfd:kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" }, { - "id": "apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c", - "name": "8901474e-f646-4eb9-b734-667804d70207:panel_8901474e-f646-4eb9-b734-667804d70207", - "type": "search" + "id": "logs-*", + "name": "3f40d201-41dd-44ad-9f5d-9280b0e31dfd:kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", + "type": "index-pattern" + }, + { + "id": "logs-*", + "name": "3f40d201-41dd-44ad-9f5d-9280b0e31dfd:kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", + "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9f21d4e0-b837-11ed-8008-cf66df3fb6bf.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9f21d4e0-b837-11ed-8008-cf66df3fb6bf.json index e54937504969..3e0b5bfc3c1b 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9f21d4e0-b837-11ed-8008-cf66df3fb6bf.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-9f21d4e0-b837-11ed-8008-cf66df3fb6bf.json @@ -17,9 +17,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.cache" @@ -28,7 +28,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.cache" + "data_stream.dataset": "apache_tomcat.cache" } } } @@ -201,8 +201,7 @@ }, "panelIndex": "36ae155c-4005-4d73-b475-8988477e226d", "title": "Cache size over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -354,8 +353,7 @@ }, "panelIndex": "9f922f1f-c807-461d-894f-84236ab8cbd8", "title": "Total requests processed through cache over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -507,20 +505,17 @@ }, "panelIndex": "93820318-a84d-43c0-97a0-65731001cf06", "title": "Total requests over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Cache", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-05-05T07:24:12.119Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:03:38.064Z", "id": "apache_tomcat-9f21d4e0-b837-11ed-8008-cf66df3fb6bf", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -553,5 +548,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-af7759b0-0a75-11ee-a8d8-d15950a587f6.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-af7759b0-0a75-11ee-a8d8-d15950a587f6.json index dde26173ef34..0360ec660fa1 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-af7759b0-0a75-11ee-a8d8-d15950a587f6.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-af7759b0-0a75-11ee-a8d8-d15950a587f6.json @@ -17,9 +17,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.connection_pool" @@ -28,7 +28,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.connection_pool" + "data_stream.dataset": "apache_tomcat.connection_pool" } } } @@ -55,11 +55,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-e325a4cc-4f13-45e6-ad1d-ab520a86078f", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "d754c647-0a3e-4949-b974-ae09a1bc847d", - "type": "index-pattern" } ], "state": { @@ -129,30 +124,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "d754c647-0a3e-4949-b974-ae09a1bc847d", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.connection_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.connection_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -220,8 +192,7 @@ }, "panelIndex": "8379c1c8-9392-4af4-a7f4-e625811a8f12", "title": "Connections over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -231,11 +202,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-bf37fdfd-568b-4d88-8698-f487013d0e7a", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "c82a919f-342a-40fb-b752-e7d04fed8ff7", - "type": "index-pattern" } ], "state": { @@ -274,30 +240,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "c82a919f-342a-40fb-b752-e7d04fed8ff7", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.connection_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.connection_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -327,8 +270,7 @@ }, "panelIndex": "f170f694-3b15-4d7f-8d02-93721b07841a", "title": "Active connections [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -338,11 +280,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-bf37fdfd-568b-4d88-8698-f487013d0e7a", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "18d6b810-b483-4c38-8003-439a9795566e", - "type": "index-pattern" } ], "state": { @@ -381,30 +318,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "18d6b810-b483-4c38-8003-439a9795566e", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.connection_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.connection_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -434,20 +348,17 @@ }, "panelIndex": "4ba1c352-1167-4214-a1e0-a8acb13e59aa", "title": "Idle connections [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Connection Pool", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-06-30T05:14:49.407Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:04:43.666Z", "id": "apache_tomcat-af7759b0-0a75-11ee-a8d8-d15950a587f6", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -459,31 +370,16 @@ "name": "8379c1c8-9392-4af4-a7f4-e625811a8f12:indexpattern-datasource-layer-e325a4cc-4f13-45e6-ad1d-ab520a86078f", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "8379c1c8-9392-4af4-a7f4-e625811a8f12:d754c647-0a3e-4949-b974-ae09a1bc847d", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "f170f694-3b15-4d7f-8d02-93721b07841a:indexpattern-datasource-layer-bf37fdfd-568b-4d88-8698-f487013d0e7a", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "f170f694-3b15-4d7f-8d02-93721b07841a:c82a919f-342a-40fb-b752-e7d04fed8ff7", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "4ba1c352-1167-4214-a1e0-a8acb13e59aa:indexpattern-datasource-layer-bf37fdfd-568b-4d88-8698-f487013d0e7a", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "4ba1c352-1167-4214-a1e0-a8acb13e59aa:18d6b810-b483-4c38-8003-439a9795566e", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "controlGroup_3503af0f-80d1-487e-8fa3-e470f20f9f8b:optionsListDataView", @@ -495,5 +391,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c2e71320-bccb-11ed-8065-19219c0d55ab.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c2e71320-bccb-11ed-8065-19219c0d55ab.json index 30ac4e11b58a..305e74c9ab49 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c2e71320-bccb-11ed-8065-19219c0d55ab.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c2e71320-bccb-11ed-8065-19219c0d55ab.json @@ -61,11 +61,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-7a97f25c-2c29-43be-a9d9-227e78aa4824", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "424f182e-1baf-4bc9-a7a6-74f1ca6881ef", - "type": "index-pattern" } ], "state": { @@ -154,29 +149,7 @@ } } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "424f182e-1baf-4bc9-a7a6-74f1ca6881ef", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -210,12 +183,12 @@ "y": 0 }, "panelIndex": "7249a3d9-803b-4ddd-952f-0021fcfe7f58", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { "attributes": { + "description": "When the value for the maximum memory size (in bytes) is set to -1 for heap memory configurations, it indicates that the user has not specified a predefined size for the memory allocation", "references": [ { "id": "metrics-*", @@ -226,11 +199,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-ce5c86d1-5778-457d-a66f-8d2be35fdd09", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "1be63b2a-edae-4674-a21f-4cc44d7ef2a4", - "type": "index-pattern" } ], "state": { @@ -375,29 +343,7 @@ } } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "1be63b2a-edae-4674-a21f-4cc44d7ef2a4", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -483,8 +429,7 @@ }, "panelIndex": "ff461eaa-d936-4fbd-af56-72a528fdf515", "title": "Heap memory over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -500,11 +445,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-b9cb687d-7e05-469a-bc47-e9b07685a0d8", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "8708baa5-febb-4d77-9857-ba124b9c91f8", - "type": "index-pattern" } ], "state": { @@ -593,29 +533,7 @@ } } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "8708baa5-febb-4d77-9857-ba124b9c91f8", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -649,12 +567,12 @@ }, "panelIndex": "3b18802f-5ac5-48f1-8ba3-c46d37f86d47", "title": "", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { "attributes": { + "description": "When the value for the maximum memory size (in bytes) is set to -1 for non-heap memory configurations, it indicates that the user has not specified a predefined size for the memory allocation", "references": [ { "id": "metrics-*", @@ -665,11 +583,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-ce5c86d1-5778-457d-a66f-8d2be35fdd09", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "4fba9f55-18c8-458c-9ee5-83936d0402ac", - "type": "index-pattern" } ], "state": { @@ -814,29 +727,7 @@ } } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "4fba9f55-18c8-458c-9ee5-83936d0402ac", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -922,8 +813,7 @@ }, "panelIndex": "1c7a5509-3841-40a3-9b00-fd11ee6db933", "title": "Non-heap memory over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -939,11 +829,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-9664f1c8-ab27-4919-9805-e22529ee1f2c", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "f7dd40ff-6ab5-4c72-9c14-3d9a3a1459c0", - "type": "index-pattern" } ], "state": { @@ -1030,29 +915,7 @@ } } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "index": "f7dd40ff-6ab5-4c72-9c14-3d9a3a1459c0", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -1141,20 +1004,17 @@ }, "panelIndex": "af80afbb-07f6-4f69-b475-2e5f19cfa60d", "title": "Garbage collection over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Memory", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-18T10:55:22.442Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:05:56.186Z", "id": "apache_tomcat-c2e71320-bccb-11ed-8065-19219c0d55ab", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -1171,11 +1031,6 @@ "name": "7249a3d9-803b-4ddd-952f-0021fcfe7f58:indexpattern-datasource-layer-7a97f25c-2c29-43be-a9d9-227e78aa4824", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "7249a3d9-803b-4ddd-952f-0021fcfe7f58:424f182e-1baf-4bc9-a7a6-74f1ca6881ef", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "ff461eaa-d936-4fbd-af56-72a528fdf515:indexpattern-datasource-layer-832a1cf4-a2fb-4da0-a1a9-e2e4ad75cf0b", @@ -1186,11 +1041,6 @@ "name": "ff461eaa-d936-4fbd-af56-72a528fdf515:indexpattern-datasource-layer-ce5c86d1-5778-457d-a66f-8d2be35fdd09", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "ff461eaa-d936-4fbd-af56-72a528fdf515:1be63b2a-edae-4674-a21f-4cc44d7ef2a4", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "3b18802f-5ac5-48f1-8ba3-c46d37f86d47:indexpattern-datasource-layer-603b89be-e03d-4ed5-83b6-4ca7c19f41aa", @@ -1201,11 +1051,6 @@ "name": "3b18802f-5ac5-48f1-8ba3-c46d37f86d47:indexpattern-datasource-layer-b9cb687d-7e05-469a-bc47-e9b07685a0d8", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "3b18802f-5ac5-48f1-8ba3-c46d37f86d47:8708baa5-febb-4d77-9857-ba124b9c91f8", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "1c7a5509-3841-40a3-9b00-fd11ee6db933:indexpattern-datasource-layer-832a1cf4-a2fb-4da0-a1a9-e2e4ad75cf0b", @@ -1216,11 +1061,6 @@ "name": "1c7a5509-3841-40a3-9b00-fd11ee6db933:indexpattern-datasource-layer-ce5c86d1-5778-457d-a66f-8d2be35fdd09", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "1c7a5509-3841-40a3-9b00-fd11ee6db933:4fba9f55-18c8-458c-9ee5-83936d0402ac", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "af80afbb-07f6-4f69-b475-2e5f19cfa60d:indexpattern-datasource-layer-88daef46-ca28-45c1-b7cc-8f7ccff4842d", @@ -1231,16 +1071,12 @@ "name": "af80afbb-07f6-4f69-b475-2e5f19cfa60d:indexpattern-datasource-layer-9664f1c8-ab27-4919-9805-e22529ee1f2c", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "af80afbb-07f6-4f69-b475-2e5f19cfa60d:f7dd40ff-6ab5-4c72-9c14-3d9a3a1459c0", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "controlGroup_40090461-b167-4b82-8ae3-e1326133b845:optionsListDataView", "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c8ec7280-1a57-11ee-8c1a-099fb2bcb823.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c8ec7280-1a57-11ee-8c1a-099fb2bcb823.json index ab28ff8c7f7b..657ece9f8ba5 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c8ec7280-1a57-11ee-8c1a-099fb2bcb823.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c8ec7280-1a57-11ee-8c1a-099fb2bcb823.json @@ -17,18 +17,55 @@ "meta": { "alias": null, "disabled": false, - "field": "event.module", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.module", + "key": "data_stream.dataset", "negate": false, - "params": { - "query": "apache_tomcat" - }, - "type": "phrase" + "params": [ + "apache_tomcat.session", + "apache_tomcat.cache", + "apache_tomcat.connection_pool", + "apache_tomcat.memory", + "apache_tomcat.request", + "apache_tomcat.thread_pool" + ], + "type": "phrases" }, "query": { - "match_phrase": { - "event.module": "apache_tomcat" + "bool": { + "minimum_should_match": 1, + "should": [ + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.session" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.cache" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.connection_pool" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.memory" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.request" + } + }, + { + "match_phrase": { + "data_stream.dataset": "apache_tomcat.thread_pool" + } + } + ] } } } @@ -51,11 +88,6 @@ "embeddableConfig": { "attributes": { "references": [ - { - "id": "metrics-*", - "name": "indexpattern-datasource-layer-99998251-2f00-4a88-bf98-07e7d8e3ac81", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "indexpattern-datasource-layer-207a8774-23b1-43df-831f-56cb6d093dc0", @@ -63,7 +95,7 @@ }, { "id": "metrics-*", - "name": "f3e87a81-2a03-49e7-b465-ae2e5540cfd7", + "name": "indexpattern-datasource-layer-99998251-2f00-4a88-bf98-07e7d8e3ac81", "type": "index-pattern" } ], @@ -137,30 +169,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "f3e87a81-2a03-49e7-b465-ae2e5540cfd7", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.session" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.session" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -193,8 +202,7 @@ }, "panelIndex": "06854553-1f37-41b0-972c-380acf5cb39f", "title": "Number of Applications [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -204,11 +212,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-e6ec4f57-529c-490f-86c3-5ae4140dc908", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "791b20c2-6ace-42e3-a393-51b4f378bd2a", - "type": "index-pattern" } ], "state": { @@ -288,30 +291,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "791b20c2-6ace-42e3-a393-51b4f378bd2a", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.cache" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.cache" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -380,8 +360,7 @@ }, "panelIndex": "b8716edd-6941-4cba-9f1a-b3a08c7fc647", "title": "Top 5 requests per application over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -397,11 +376,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-e4ff0e97-e884-4a2e-859a-f16a579acd75", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "e03e36e7-2153-4e6b-ad73-0b3f58c89969", - "type": "index-pattern" } ], "state": { @@ -604,30 +578,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "e03e36e7-2153-4e6b-ad73-0b3f58c89969", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.request" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.request" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -660,8 +611,7 @@ }, "panelIndex": "9e8b29e7-3679-4e44-a585-f4cf7f17044f", "title": "Average request processing time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -671,11 +621,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-7c4da97e-7d47-4847-87ae-0fbdcc983343", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "38cc0910-5849-444d-ba26-a9dab625f549", - "type": "index-pattern" } ], "state": { @@ -745,30 +690,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "38cc0910-5849-444d-ba26-a9dab625f549", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.connection_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.connection_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -836,8 +758,7 @@ }, "panelIndex": "ba5d9b2e-689c-4472-aa89-bc355a5cc780", "title": "Connections over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -847,11 +768,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-b09c20e6-d7d3-4fe2-8490-2c6feedb02c9", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "44b26cb6-1625-4950-9cd5-a079004b991b", - "type": "index-pattern" } ], "state": { @@ -933,30 +849,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "44b26cb6-1625-4950-9cd5-a079004b991b", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.memory" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.memory" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -1009,8 +902,7 @@ }, "panelIndex": "38423062-d16c-4911-a9e9-dfdfba9d19b5", "title": "Memory usage over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -1020,11 +912,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-365e11cb-9eed-4fd4-a335-2b8ee3f454c5", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "c9861b14-6ccb-4a1a-b38f-4d7c01febfc8", - "type": "index-pattern" } ], "state": { @@ -1106,30 +993,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "c9861b14-6ccb-4a1a-b38f-4d7c01febfc8", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.request" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.request" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -1182,8 +1046,7 @@ }, "panelIndex": "5862d24f-ecf5-41fd-93b4-3d214e834361", "title": "Throughput over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" }, { "embeddableConfig": { @@ -1194,11 +1057,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-bdd64b4a-4147-4624-8e56-78dbbddd5986", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "1a9a387d-da2b-46c0-9d67-d84642c4450d", - "type": "index-pattern" } ], "state": { @@ -1319,30 +1177,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "1a9a387d-da2b-46c0-9d67-d84642c4450d", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.thread_pool" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.thread_pool" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -1395,35 +1230,27 @@ "i": "8d71c0de-16f1-4231-97ff-0bf7e1af5db0", "w": 24, "x": 0, - "y": 34 + "y": 28 }, "panelIndex": "8d71c0de-16f1-4231-97ff-0bf7e1af5db0", "title": "Thread distribution by server over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.8.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Overview ", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-19T08:01:33.946Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:09:11.916Z", "id": "apache_tomcat-c8ec7280-1a57-11ee-8c1a-099fb2bcb823", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "06854553-1f37-41b0-972c-380acf5cb39f:indexpattern-datasource-layer-99998251-2f00-4a88-bf98-07e7d8e3ac81", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "06854553-1f37-41b0-972c-380acf5cb39f:indexpattern-datasource-layer-207a8774-23b1-43df-831f-56cb6d093dc0", @@ -1431,7 +1258,7 @@ }, { "id": "metrics-*", - "name": "06854553-1f37-41b0-972c-380acf5cb39f:f3e87a81-2a03-49e7-b465-ae2e5540cfd7", + "name": "06854553-1f37-41b0-972c-380acf5cb39f:indexpattern-datasource-layer-99998251-2f00-4a88-bf98-07e7d8e3ac81", "type": "index-pattern" }, { @@ -1439,11 +1266,6 @@ "name": "b8716edd-6941-4cba-9f1a-b3a08c7fc647:indexpattern-datasource-layer-e6ec4f57-529c-490f-86c3-5ae4140dc908", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "b8716edd-6941-4cba-9f1a-b3a08c7fc647:791b20c2-6ace-42e3-a393-51b4f378bd2a", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "9e8b29e7-3679-4e44-a585-f4cf7f17044f:indexpattern-datasource-layer-041c5a9d-e816-4c77-ae9f-e31b81d15a8a", @@ -1454,56 +1276,32 @@ "name": "9e8b29e7-3679-4e44-a585-f4cf7f17044f:indexpattern-datasource-layer-e4ff0e97-e884-4a2e-859a-f16a579acd75", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "9e8b29e7-3679-4e44-a585-f4cf7f17044f:e03e36e7-2153-4e6b-ad73-0b3f58c89969", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "ba5d9b2e-689c-4472-aa89-bc355a5cc780:indexpattern-datasource-layer-7c4da97e-7d47-4847-87ae-0fbdcc983343", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "ba5d9b2e-689c-4472-aa89-bc355a5cc780:38cc0910-5849-444d-ba26-a9dab625f549", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "38423062-d16c-4911-a9e9-dfdfba9d19b5:indexpattern-datasource-layer-b09c20e6-d7d3-4fe2-8490-2c6feedb02c9", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "38423062-d16c-4911-a9e9-dfdfba9d19b5:44b26cb6-1625-4950-9cd5-a079004b991b", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "5862d24f-ecf5-41fd-93b4-3d214e834361:indexpattern-datasource-layer-365e11cb-9eed-4fd4-a335-2b8ee3f454c5", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "5862d24f-ecf5-41fd-93b4-3d214e834361:c9861b14-6ccb-4a1a-b38f-4d7c01febfc8", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "8d71c0de-16f1-4231-97ff-0bf7e1af5db0:indexpattern-datasource-layer-bdd64b4a-4147-4624-8e56-78dbbddd5986", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "8d71c0de-16f1-4231-97ff-0bf7e1af5db0:1a9a387d-da2b-46c0-9d67-d84642c4450d", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "controlGroup_389cb789-1fc8-43c8-b276-08d02bae4cee:optionsListDataView", "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c97374d0-bb78-11ed-812e-b1288b469a47.json b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c97374d0-bb78-11ed-812e-b1288b469a47.json index 378b5d3c072e..dd74b4f746a8 100644 --- a/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c97374d0-bb78-11ed-812e-b1288b469a47.json +++ b/packages/apache_tomcat/kibana/dashboard/apache_tomcat-c97374d0-bb78-11ed-812e-b1288b469a47.json @@ -17,9 +17,9 @@ "meta": { "alias": null, "disabled": false, - "field": "event.dataset", + "field": "data_stream.dataset", "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", + "key": "data_stream.dataset", "negate": false, "params": { "query": "apache_tomcat.request" @@ -28,7 +28,7 @@ }, "query": { "match_phrase": { - "event.dataset": "apache_tomcat.request" + "data_stream.dataset": "apache_tomcat.request" } } } @@ -131,8 +131,7 @@ }, "panelIndex": "df3b5039-6960-47fe-a408-8c59b82d0a83", "title": "Maximum time to process a request [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -142,11 +141,6 @@ "id": "metrics-*", "name": "indexpattern-datasource-layer-528b2da5-ff7d-4fb7-a62c-e3d64b70df91", "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "00da956e-dc3c-45f9-ab7f-2a3e0e1bb1e0", - "type": "index-pattern" } ], "state": { @@ -246,30 +240,7 @@ "layers": {} } }, - "filters": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "index": "00da956e-dc3c-45f9-ab7f-2a3e0e1bb1e0", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.request" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.request" - } - } - } - ], + "filters": [], "internalReferences": [], "query": { "language": "kuery", @@ -315,8 +286,7 @@ }, "panelIndex": "77e484b6-3cf9-4226-a80f-c5100ac0a0af", "title": "Distribution of NIO connectors by total process time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -402,8 +372,7 @@ }, "panelIndex": "df3f56d0-2f45-44e0-b343-2404e987527b", "title": "Total time to process the requests [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -546,8 +515,7 @@ }, "panelIndex": "b43d4e14-e451-4025-9d4e-4cf781f94fba", "title": "Data transferred over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -654,8 +622,7 @@ }, "panelIndex": "5b8374fa-485f-469f-8118-a8d8abc20bfd", "title": "Requests processed over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" }, { "embeddableConfig": { @@ -768,20 +735,17 @@ }, "panelIndex": "53358c42-fbc0-4329-8a1f-7330324cf827", "title": "Number of errors over time [Metrics Apache Tomcat]", - "type": "lens", - "version": "8.7.0" + "type": "lens" } ], "timeRestore": false, "title": "[Metrics Apache Tomcat] Request", "version": 1 }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-05-05T07:24:00.465Z", + "coreMigrationVersion": "8.8.0", + "created_at": "2024-04-13T09:10:03.496Z", "id": "apache_tomcat-c97374d0-bb78-11ed-812e-b1288b469a47", - "migrationVersion": { - "dashboard": "8.7.0" - }, + "managed": false, "references": [ { "id": "metrics-*", @@ -798,11 +762,6 @@ "name": "77e484b6-3cf9-4226-a80f-c5100ac0a0af:indexpattern-datasource-layer-528b2da5-ff7d-4fb7-a62c-e3d64b70df91", "type": "index-pattern" }, - { - "id": "metrics-*", - "name": "77e484b6-3cf9-4226-a80f-c5100ac0a0af:00da956e-dc3c-45f9-ab7f-2a3e0e1bb1e0", - "type": "index-pattern" - }, { "id": "metrics-*", "name": "df3f56d0-2f45-44e0-b343-2404e987527b:indexpattern-datasource-layer-cb8d60de-f6ec-4c20-932f-5869a496730f", @@ -829,5 +788,6 @@ "type": "index-pattern" } ], - "type": "dashboard" + "type": "dashboard", + "typeMigrationVersion": "8.9.0" } \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/search/apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195.json b/packages/apache_tomcat/kibana/search/apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195.json deleted file mode 100644 index 422f73d8e2c8..000000000000 --- a/packages/apache_tomcat/kibana/search/apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "attributes": { - "columns": [ - "apache_tomcat.catalina.subsystem", - "log.level", - "message" - ], - "description": "", - "grid": { - "columns": { - "apache_tomcat.catalina.subsystem": { - "width": 240 - }, - "log.level": { - "width": 78 - } - } - }, - "hideChart": false, - "isTextBasedQuery": false, - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.catalina" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.catalina" - } - } - }, - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "log.level", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "key": "log.level", - "negate": true, - "params": { - "query": "info" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "log.level": "info" - } - } - } - ], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "sort": [ - [ - "@timestamp", - "desc" - ] - ], - "timeRestore": false, - "title": "Catalina logs overview [Logs Apache Tomcat]", - "usesAdHocDataView": false - }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T12:48:07.116Z", - "id": "apache_tomcat-1f3c6e30-dd11-11ed-9f4f-d97c9f37d195", - "migrationVersion": { - "dashboard": "8.0.0", - "search": "8.0.0" - }, - "references": [ - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "type": "index-pattern" - } - ], - "type": "search" -} \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/search/apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c.json b/packages/apache_tomcat/kibana/search/apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c.json deleted file mode 100644 index 8109ba8161e1..000000000000 --- a/packages/apache_tomcat/kibana/search/apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "attributes": { - "columns": [ - "apache_tomcat.localhost.subsystem", - "log.level", - "message" - ], - "description": "", - "grid": { - "columns": { - "apache_tomcat.localhost.subsystem": { - "width": 248 - }, - "log.level": { - "width": 75 - } - } - }, - "hideChart": false, - "isTextBasedQuery": false, - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.localhost" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.localhost" - } - } - }, - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "log.level", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "key": "log.level", - "negate": true, - "params": { - "query": "info" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "log.level": "info" - } - } - } - ], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "sort": [ - [ - "@timestamp", - "desc" - ] - ], - "timeRestore": false, - "title": "Localhost logs overview [Logs Apache Tomcat]", - "usesAdHocDataView": false - }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T12:48:07.116Z", - "id": "apache_tomcat-4d39c820-ddcd-11ed-8080-ddad81fe2c3c", - "migrationVersion": { - "dashboard": "8.0.0", - "search": "8.0.0" - }, - "references": [ - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "type": "index-pattern" - } - ], - "type": "search" -} \ No newline at end of file diff --git a/packages/apache_tomcat/kibana/search/apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f.json b/packages/apache_tomcat/kibana/search/apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f.json deleted file mode 100644 index 0d905f587a72..000000000000 --- a/packages/apache_tomcat/kibana/search/apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "attributes": { - "columns": [ - "source.ip", - "url.original", - "http.response.status_code" - ], - "description": "", - "grid": { - "columns": { - "http.response.status_code": { - "width": 183 - } - } - }, - "hideChart": false, - "isTextBasedQuery": false, - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [ - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "event.dataset", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "key": "event.dataset", - "negate": false, - "params": { - "query": "apache_tomcat.access" - }, - "type": "phrase" - }, - "query": { - "match_phrase": { - "event.dataset": "apache_tomcat.access" - } - } - }, - { - "$state": { - "store": "appState" - }, - "meta": { - "alias": null, - "disabled": false, - "field": "http.response.status_code", - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "key": "http.response.status_code", - "negate": false, - "params": { - "gte": "400", - "lt": "599" - }, - "type": "range", - "value": { - "gte": "400", - "lt": "599" - } - }, - "query": { - "range": { - "http.response.status_code": { - "gte": "400", - "lt": "599" - } - } - } - } - ], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "refreshInterval": { - "pause": true, - "value": 60000 - }, - "sort": [ - [ - "@timestamp", - "desc" - ] - ], - "timeRange": { - "from": "now-1y/d", - "to": "now" - }, - "timeRestore": true, - "title": "Client and Server HTTP error details [Logs Apache Tomcat]", - "usesAdHocDataView": false - }, - "coreMigrationVersion": "8.7.0", - "created_at": "2023-07-24T12:48:07.116Z", - "id": "apache_tomcat-d0957a70-eda4-11ed-909a-2baec7270d1f", - "migrationVersion": { - "dashboard": "8.0.0", - "search": "8.0.0" - }, - "references": [ - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index", - "type": "index-pattern" - }, - { - "id": "logs-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index", - "type": "index-pattern" - } - ], - "type": "search" -} \ No newline at end of file diff --git a/packages/apache_tomcat/manifest.yml b/packages/apache_tomcat/manifest.yml index 82cc50383321..1294b00064e6 100644 --- a/packages/apache_tomcat/manifest.yml +++ b/packages/apache_tomcat/manifest.yml @@ -1,7 +1,7 @@ format_version: "3.0.2" name: apache_tomcat title: Apache Tomcat -version: "1.4.0" +version: "1.5.0" description: Collect and parse logs and metrics from Apache Tomcat servers with Elastic Agent. categories: ["web", "observability"] type: integration