diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index f257865f73a..5bc90820b05 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -59,17 +59,11 @@ pipeline { try { dir("${BASE_DIR}/packages/${it}") { sh(label: "Check integration: ${it}", script: '../../build/elastic-package check -v') - // Check if there are test folders present, so the CI job runner can spawn the Elastic stack - // locally and run tests for the integration. The condition prevents from spawning the stack - // unnecessarily (while no tests are defined). - def r = sh(label: "Find test folders", script: 'find . -d -name test | grep .', returnStatus: true) - if (r == 0) { - sh(label: "Boot up the Elastic stack", script: '../../build/elastic-package stack up -d -v') - sh(label: "Test integration: ${it}", script: ''' - eval "$(../../build/elastic-package stack shellinit)" - ../../build/elastic-package test -v --report-format xUnit --report-output file - ''') - } + sh(label: "Boot up the Elastic stack", script: '../../build/elastic-package stack up -d -v') + sh(label: "Test integration: ${it}", script: ''' + eval "$(../../build/elastic-package stack shellinit)" + ../../build/elastic-package test -v --report-format xUnit --report-output file + ''') } } finally { dir("${BASE_DIR}") { diff --git a/go.mod b/go.mod index af40d95d7a7..7bde0dc02b7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/blang/semver v3.5.1+incompatible - github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f + github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d github.com/elastic/package-registry v0.13.0 github.com/magefile/mage v1.10.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ae045701bc1..4e18b278e22 100644 --- a/go.sum +++ b/go.sum @@ -84,8 +84,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f h1:nSZjPaTsPTUoOCM2aGxgTLrZb0mf56gxuWAlECI/cRk= -github.com/elastic/elastic-package v0.0.0-20210114174512-e4b08c480f1f/go.mod h1:lphRg8ZgCi63Nd3vpKy29oqx2N/mme2VdTSHpN1ZNnk= +github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d h1:KYFFjqV2c2Yz1XL1815XyB4omlDd2597ua/usgqCVcI= +github.com/elastic/elastic-package v0.0.0-20210118134226-ec5c00a8ad4d/go.mod h1:lphRg8ZgCi63Nd3vpKy29oqx2N/mme2VdTSHpN1ZNnk= github.com/elastic/go-elasticsearch/v7 v7.9.0 h1:UEau+a1MiiE/F+UrDj60kqIHFWdzU1M2y/YtBU2NC2M= github.com/elastic/go-elasticsearch/v7 v7.9.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/elastic/go-ucfg v0.8.3/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo= diff --git a/packages/apache/kibana/dashboard/apache-Logs-Apache-Dashboard.json b/packages/apache/kibana/dashboard/apache-Logs-Apache-Dashboard.json new file mode 100644 index 00000000000..7332f02b4d2 --- /dev/null +++ b/packages/apache/kibana/dashboard/apache-Logs-Apache-Dashboard.json @@ -0,0 +1,229 @@ +{ + "attributes": { + "description": "Logs Apache integration dashboard", + "hits": 0, + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "highlightAll": true, + "query": { + "language": "kuery", + "query": "" + }, + "version": true + } + }, + "optionsJSON": { + "darkTheme": false, + "useMargins": true + }, + "panelsJSON": [ + { + "embeddableConfig": { + "enhancements": {}, + "mapBounds": { + "bottom_right": { + "lat": -3.864254615721396, + "lon": 205.3125 + }, + "top_left": { + "lat": 67.7427590666639, + "lon": -205.6640625 + } + }, + "mapCenter": [ + 40.713955826286046, + -0.17578125 + ], + "mapCollar": { + "bottom_right": { + "lat": -39.667755, + "lon": 180 + }, + "top_left": { + "lat": 90, + "lon": -180 + }, + "zoom": 2 + }, + "mapZoom": 2 + }, + "gridData": { + "h": 12, + "i": "1", + "w": 35, + "x": 13, + "y": 0 + }, + "panelIndex": "1", + "panelRefName": "panel_0", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 12, + "i": "2", + "w": 32, + "x": 0, + "y": 20 + }, + "panelIndex": "2", + "panelRefName": "panel_1", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 12, + "i": "3", + "w": 16, + "x": 32, + "y": 20 + }, + "panelIndex": "3", + "panelRefName": "panel_2", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 8, + "i": "4", + "w": 8, + "x": 40, + "y": 12 + }, + "panelIndex": "4", + "panelRefName": "panel_3", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 8, + "i": "5", + "w": 48, + "x": 0, + "y": 32 + }, + "panelIndex": "5", + "panelRefName": "panel_4", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 8, + "i": "6", + "w": 40, + "x": 0, + "y": 12 + }, + "panelIndex": "6", + "panelRefName": "panel_5", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "columns": [ + "source.address", + "log.level", + "apache2.error.integration", + "message" + ], + "enhancements": {}, + "sort": [ + "@timestamp", + "desc" + ] + }, + "gridData": { + "h": 12, + "i": "7", + "w": 48, + "x": 0, + "y": 40 + }, + "panelIndex": "7", + "panelRefName": "panel_6", + "version": "7.9.3" + }, + { + "embeddableConfig": { + "enhancements": {} + }, + "gridData": { + "h": 5, + "i": "f5d1286d-411a-4759-a2e2-0b3227b93cfa", + "w": 13, + "x": 0, + "y": 0 + }, + "panelIndex": "f5d1286d-411a-4759-a2e2-0b3227b93cfa", + "panelRefName": "panel_7", + "version": "7.9.3" + } + ], + "timeRestore": false, + "title": "[Logs Apache] Access and error logs", + "version": 1 + }, + "id": "apache-Logs-Apache-Dashboard", + "migrationVersion": { + "dashboard": "7.11.0" + }, + "references": [ + { + "id": "apache-access-unique-IPs-map", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "apache-response-codes-of-top-URLs", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "apache-browsers", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "apache-operating-systems", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "apache-error-logs-over-time", + "name": "panel_4", + "type": "visualization" + }, + { + "id": "apache-response-codes-over-time", + "name": "panel_5", + "type": "visualization" + }, + { + "id": "apache-errors-log", + "name": "panel_6", + "type": "search" + }, + { + "id": "apache-ed44f820-3a10-11eb-8946-296aab7b13db", + "name": "panel_7", + "type": "visualization" + } + ], + "type": "dashboard" +} \ No newline at end of file diff --git a/packages/apache/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status.json b/packages/apache/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status.json index 15315a0e3cc..35a2998fd1e 100644 --- a/packages/apache/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status.json +++ b/packages/apache/kibana/dashboard/apache-Metrics-Apache-HTTPD-server-status.json @@ -31,7 +31,7 @@ }, "panelIndex": "1", "panelRefName": "panel_0", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -46,7 +46,7 @@ }, "panelIndex": "3", "panelRefName": "panel_1", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -61,7 +61,7 @@ }, "panelIndex": "4", "panelRefName": "panel_2", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -76,7 +76,7 @@ }, "panelIndex": "4cc4755f-49a7-43c1-8a21-0a78291f0b3f", "panelRefName": "panel_3", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -91,7 +91,7 @@ }, "panelIndex": "7b7a1f18-e274-4f4e-a3b3-3760e7896897", "panelRefName": "panel_4", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -106,7 +106,7 @@ }, "panelIndex": "01794c9e-0ce3-4e1e-bc87-6c15b6434ba8", "panelRefName": "panel_5", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -121,7 +121,7 @@ }, "panelIndex": "e2b2dd17-dcda-4b17-b250-dd30c596f7f6", "panelRefName": "panel_6", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -136,7 +136,7 @@ }, "panelIndex": "f90d54d8-034c-4cfd-8640-0e8f10c2ca99", "panelRefName": "panel_7", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -151,7 +151,7 @@ }, "panelIndex": "3b23e577-34f6-4cd0-b636-01581b8ce1c0", "panelRefName": "panel_8", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -159,14 +159,14 @@ }, "gridData": { "h": 15, - "i": "4204480f-8c9f-426f-b3f7-0714a70d418b", + "i": "100b598b-4223-4a6b-95d9-ee94147fa5ac", "w": 24, "x": 24, - "y": 35 + "y": 20 }, - "panelIndex": "4204480f-8c9f-426f-b3f7-0714a70d418b", + "panelIndex": "100b598b-4223-4a6b-95d9-ee94147fa5ac", "panelRefName": "panel_9", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -181,7 +181,7 @@ }, "panelIndex": "a7dc6253-4f39-4aae-984f-3108d1cf3cfb", "panelRefName": "panel_10", - "version": "7.12.0" + "version": "7.9.3" }, { "embeddableConfig": { @@ -189,14 +189,14 @@ }, "gridData": { "h": 15, - "i": "93ef1f8c-4f12-4196-a5ac-4de7d042c462", + "i": "4204480f-8c9f-426f-b3f7-0714a70d418b", "w": 24, "x": 24, - "y": 20 + "y": 35 }, - "panelIndex": "93ef1f8c-4f12-4196-a5ac-4de7d042c462", + "panelIndex": "4204480f-8c9f-426f-b3f7-0714a70d418b", "panelRefName": "panel_11", - "version": "7.12.0" + "version": "7.9.3" } ], "timeRestore": false, @@ -254,7 +254,7 @@ "type": "visualization" }, { - "id": "apache-7724cf20-3a39-11eb-8946-296aab7b13db", + "id": "apache-a45311f0-3a34-11eb-8946-296aab7b13db", "name": "panel_9", "type": "visualization" }, @@ -264,9 +264,9 @@ "type": "visualization" }, { - "id": "apache-179c1d70-5658-11eb-9cb2-034acbb6d060", + "id": "apache-7724cf20-3a39-11eb-8946-296aab7b13db", "name": "panel_11", - "type": "lens" + "type": "visualization" } ], "type": "dashboard" diff --git a/packages/apache/kibana/lens/apache-179c1d70-5658-11eb-9cb2-034acbb6d060.json b/packages/apache/kibana/lens/apache-179c1d70-5658-11eb-9cb2-034acbb6d060.json deleted file mode 100644 index 2af4f7135fc..00000000000 --- a/packages/apache/kibana/lens/apache-179c1d70-5658-11eb-9cb2-034acbb6d060.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "attributes": { - "description": "Lens", - "state": { - "datasourceStates": { - "indexpattern": { - "layers": { - "e0f6b09d-3316-472c-a7d6-f63ce7c8626e": { - "columnOrder": [ - "11518d24-0db1-4fff-9241-72ec45204b20", - "1b0e51e5-1bfa-4cc2-8765-355930cc14cd" - ], - "columns": { - "11518d24-0db1-4fff-9241-72ec45204b20": { - "dataType": "date", - "isBucketed": true, - "label": "@timestamp", - "operationType": "date_histogram", - "params": { - "interval": "auto" - }, - "scale": "interval", - "sourceField": "@timestamp" - }, - "1b0e51e5-1bfa-4cc2-8765-355930cc14cd": { - "customLabel": true, - "dataType": "number", - "isBucketed": false, - "label": "Bytes per sec", - "operationType": "avg", - "scale": "ratio", - "sourceField": "apache.status.bytes_per_sec" - } - }, - "incompleteColumns": {} - } - } - } - }, - "filters": [], - "query": { - "language": "kuery", - "query": "" - }, - "visualization": { - "axisTitlesVisibilitySettings": { - "x": true, - "yLeft": true, - "yRight": true - }, - "fittingFunction": "None", - "gridlinesVisibilitySettings": { - "x": true, - "yLeft": true, - "yRight": true - }, - "layers": [ - { - "accessors": [ - "1b0e51e5-1bfa-4cc2-8765-355930cc14cd" - ], - "layerId": "e0f6b09d-3316-472c-a7d6-f63ce7c8626e", - "position": "top", - "seriesType": "line", - "showGridlines": false, - "xAccessor": "11518d24-0db1-4fff-9241-72ec45204b20" - } - ], - "legend": { - "isVisible": true, - "position": "right" - }, - "preferredSeriesType": "line", - "tickLabelsVisibilitySettings": { - "x": true, - "yLeft": true, - "yRight": true - }, - "valueLabels": "hide" - } - }, - "title": "Bytes per sec [Metrics Apache]", - "visualizationType": "lnsXY" - }, - "id": "apache-179c1d70-5658-11eb-9cb2-034acbb6d060", - "migrationVersion": { - "lens": "7.11.0" - }, - "references": [ - { - "id": "metrics-*", - "name": "indexpattern-datasource-current-indexpattern", - "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "indexpattern-datasource-layer-e0f6b09d-3316-472c-a7d6-f63ce7c8626e", - "type": "index-pattern" - } - ], - "type": "lens" -} \ No newline at end of file diff --git a/packages/apache/kibana/search/apache-access-logs.json b/packages/apache/kibana/search/apache-access-logs.json new file mode 100644 index 00000000000..5d2d2e31b56 --- /dev/null +++ b/packages/apache/kibana/search/apache-access-logs.json @@ -0,0 +1,55 @@ +{ + "attributes": { + "columns": [ + "source.address", + "http.request.method", + "url.original", + "http.response.status_code" + ], + "description": "", + "hits": 0, + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "highlight": { + "fields": { + "*": {} + }, + "fragment_size": 2147483647, + "post_tags": [ + "@/kibana-highlighted-field@" + ], + "pre_tags": [ + "@kibana-highlighted-field@" + ], + "require_field_match": false + }, + "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", + "query": { + "language": "kuery", + "query": "data_stream.dataset:apache.access" + } + } + }, + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "title": "Apache access logs [Logs Apache]", + "version": 1 + }, + "id": "apache-access-logs", + "migrationVersion": { + "search": "7.9.3" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + } + ], + "type": "search" +} \ No newline at end of file diff --git a/packages/apache/kibana/search/apache-errors-log.json b/packages/apache/kibana/search/apache-errors-log.json new file mode 100644 index 00000000000..ff5742a3738 --- /dev/null +++ b/packages/apache/kibana/search/apache-errors-log.json @@ -0,0 +1,55 @@ +{ + "attributes": { + "columns": [ + "source.address", + "log.level", + "apache2.error.integration", + "message" + ], + "description": "", + "hits": 0, + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "highlight": { + "fields": { + "*": {} + }, + "fragment_size": 2147483647, + "post_tags": [ + "@/kibana-highlighted-field@" + ], + "pre_tags": [ + "@kibana-highlighted-field@" + ], + "require_field_match": false + }, + "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", + "query": { + "language": "kuery", + "query": "data_stream.dataset:apache.error" + } + } + }, + "sort": [ + [ + "@timestamp", + "desc" + ] + ], + "title": "Apache errors log [Logs Apache]", + "version": 1 + }, + "id": "apache-errors-log", + "migrationVersion": { + "search": "7.9.3" + }, + "references": [ + { + "id": "logs-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + } + ], + "type": "search" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-22057f20-3a12-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-22057f20-3a12-11eb-8946-296aab7b13db.json index f1d9532db44..c7d57448835 100644 --- a/packages/apache/kibana/visualization/apache-22057f20-3a12-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-22057f20-3a12-11eb-8946-296aab7b13db.json @@ -2,7 +2,13 @@ "attributes": { "description": "", "kibanaSavedObjectMeta": { - "searchSourceJSON": {} + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } }, "title": "Uptime [Metrics Apache]", "uiStateJSON": {}, @@ -65,7 +71,7 @@ }, "id": "apache-22057f20-3a12-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [], "type": "visualization" diff --git a/packages/apache/kibana/visualization/apache-320cd980-3a36-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-320cd980-3a36-11eb-8946-296aab7b13db.json index d1dae6f7b06..66fe71c6f41 100644 --- a/packages/apache/kibana/visualization/apache-320cd980-3a36-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-320cd980-3a36-11eb-8946-296aab7b13db.json @@ -139,7 +139,7 @@ }, "id": "apache-320cd980-3a36-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-47820ce0-3a1d-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-47820ce0-3a1d-11eb-8946-296aab7b13db.json index fc08b79eddd..232a587a63d 100644 --- a/packages/apache/kibana/visualization/apache-47820ce0-3a1d-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-47820ce0-3a1d-11eb-8946-296aab7b13db.json @@ -2,7 +2,13 @@ "attributes": { "description": "", "kibanaSavedObjectMeta": { - "searchSourceJSON": {} + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } }, "title": "Total accesses [Metrics Apache]", "uiStateJSON": {}, @@ -76,7 +82,7 @@ }, "id": "apache-47820ce0-3a1d-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [], "type": "visualization" diff --git a/packages/apache/kibana/visualization/apache-7724cf20-3a39-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-7724cf20-3a39-11eb-8946-296aab7b13db.json index 001833e68d6..6c7e554b748 100644 --- a/packages/apache/kibana/visualization/apache-7724cf20-3a39-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-7724cf20-3a39-11eb-8946-296aab7b13db.json @@ -176,7 +176,7 @@ }, "id": "apache-7724cf20-3a39-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-7d68f730-3a39-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-7d68f730-3a39-11eb-8946-296aab7b13db.json index 6c9a1897192..0f925bc2709 100644 --- a/packages/apache/kibana/visualization/apache-7d68f730-3a39-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-7d68f730-3a39-11eb-8946-296aab7b13db.json @@ -128,7 +128,7 @@ }, "id": "apache-7d68f730-3a39-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-805d7bb0-3a10-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-805d7bb0-3a10-11eb-8946-296aab7b13db.json index bcdad1661c6..c6634841935 100644 --- a/packages/apache/kibana/visualization/apache-805d7bb0-3a10-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-805d7bb0-3a10-11eb-8946-296aab7b13db.json @@ -43,7 +43,7 @@ }, "id": "apache-805d7bb0-3a10-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-99666080-3a20-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-99666080-3a20-11eb-8946-296aab7b13db.json index 64431343e57..fcf0f34c90c 100644 --- a/packages/apache/kibana/visualization/apache-99666080-3a20-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-99666080-3a20-11eb-8946-296aab7b13db.json @@ -2,7 +2,13 @@ "attributes": { "description": "", "kibanaSavedObjectMeta": { - "searchSourceJSON": {} + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } }, "title": "Total egress [Metrics Apache]", "uiStateJSON": {}, @@ -77,7 +83,7 @@ }, "id": "apache-99666080-3a20-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [], "type": "visualization" diff --git a/packages/apache/kibana/visualization/apache-HTTPD-CPU.json b/packages/apache/kibana/visualization/apache-HTTPD-CPU.json index a4dffc502a1..dc0b8c84969 100644 --- a/packages/apache/kibana/visualization/apache-HTTPD-CPU.json +++ b/packages/apache/kibana/visualization/apache-HTTPD-CPU.json @@ -251,7 +251,7 @@ }, "id": "apache-HTTPD-CPU", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-HTTPD-Load1-slash-5-slash-15.json b/packages/apache/kibana/visualization/apache-HTTPD-Load1-slash-5-slash-15.json index fe05f2d5e90..8d0ba87a59d 100644 --- a/packages/apache/kibana/visualization/apache-HTTPD-Load1-slash-5-slash-15.json +++ b/packages/apache/kibana/visualization/apache-HTTPD-Load1-slash-5-slash-15.json @@ -204,7 +204,7 @@ }, "id": "apache-HTTPD-Load1-slash-5-slash-15", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-HTTPD-Scoreboard.json b/packages/apache/kibana/visualization/apache-HTTPD-Scoreboard.json index 0d773bf863d..1167e1092af 100644 --- a/packages/apache/kibana/visualization/apache-HTTPD-Scoreboard.json +++ b/packages/apache/kibana/visualization/apache-HTTPD-Scoreboard.json @@ -420,7 +420,7 @@ }, "id": "apache-HTTPD-Scoreboard", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-a45311f0-3a34-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-a45311f0-3a34-11eb-8946-296aab7b13db.json new file mode 100644 index 00000000000..ec859d0cc0b --- /dev/null +++ b/packages/apache/kibana/visualization/apache-a45311f0-3a34-11eb-8946-296aab7b13db.json @@ -0,0 +1,152 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "savedSearchRefName": "search_0", + "title": "Bytes per sec [Metrics Apache]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": { + "customLabel": "Bytes per sec", + "field": "apache.status.bytes_per_sec" + }, + "schema": "metric", + "type": "avg" + }, + { + "enabled": true, + "id": "2", + "params": { + "drop_partials": false, + "extended_bounds": {}, + "field": "@timestamp", + "interval": "auto", + "min_doc_count": 1, + "scaleMetricValues": false, + "timeRange": { + "from": "now-15m", + "to": "now" + }, + "useNormalizedEsInterval": true + }, + "schema": "segment", + "type": "date_histogram" + } + ], + "params": { + "addLegend": true, + "addTimeMarker": false, + "addTooltip": true, + "categoryAxes": [ + { + "id": "CategoryAxis-1", + "labels": { + "filter": true, + "show": true, + "truncate": 100 + }, + "position": "bottom", + "scale": { + "type": "linear" + }, + "show": true, + "style": {}, + "title": {}, + "type": "category" + } + ], + "defaultYExtents": false, + "drawLinesBetweenPoints": true, + "grid": { + "categoryLines": false + }, + "interpolate": "linear", + "labels": {}, + "legendPosition": "right", + "radiusRatio": 9, + "row": true, + "scale": "linear", + "seriesParams": [ + { + "data": { + "id": "1", + "label": "Bytes per sec" + }, + "drawLinesBetweenPoints": true, + "interpolate": "linear", + "lineWidth": 2, + "mode": "normal", + "show": true, + "showCircles": false, + "type": "line", + "valueAxis": "ValueAxis-1" + } + ], + "setYExtents": false, + "shareYAxis": true, + "showCircles": true, + "smoothLines": false, + "thresholdLine": { + "color": "#E7664C", + "show": false, + "style": "full", + "value": 10, + "width": 1 + }, + "times": [], + "type": "line", + "valueAxes": [ + { + "id": "ValueAxis-1", + "labels": { + "filter": false, + "rotate": 0, + "show": true, + "truncate": 100 + }, + "name": "LeftAxis-1", + "position": "left", + "scale": { + "mode": "normal", + "type": "linear" + }, + "show": true, + "style": {}, + "title": { + "text": "Bytes per sec" + }, + "type": "value" + } + ], + "yAxis": {} + }, + "title": "Bytes per sec [Metrics Apache]", + "type": "line" + } + }, + "id": "apache-a45311f0-3a34-11eb-8946-296aab7b13db", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-HTTPD", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-access-unique-IPs-map.json b/packages/apache/kibana/visualization/apache-access-unique-IPs-map.json new file mode 100644 index 00000000000..4504b84a680 --- /dev/null +++ b/packages/apache/kibana/visualization/apache-access-unique-IPs-map.json @@ -0,0 +1,85 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Unique IPs map [Logs Apache]", + "uiStateJSON": { + "mapCenter": [ + 14.944784875088372, + 5.09765625 + ] + }, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": { + "field": "source.address" + }, + "schema": "metric", + "type": "cardinality" + }, + { + "enabled": true, + "id": "2", + "params": { + "autoPrecision": true, + "field": "source.geo.location" + }, + "schema": "segment", + "type": "geohash_grid" + } + ], + "listeners": {}, + "params": { + "addTooltip": true, + "heatBlur": 15, + "heatMaxZoom": 16, + "heatMinOpacity": 0.1, + "heatNormalizeData": true, + "heatRadius": 25, + "isDesaturated": true, + "legendPosition": "bottomright", + "mapCenter": [ + 15, + 5 + ], + "mapType": "Scaled Circle Markers", + "mapZoom": 2, + "wms": { + "enabled": false, + "options": { + "attribution": "Maps provided by USGS", + "format": "image/png", + "layers": "0", + "styles": "", + "transparent": true, + "version": "1.3.0" + }, + "url": "https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer" + } + }, + "title": "Apache access unique IPs map", + "type": "tile_map" + } + }, + "id": "apache-access-unique-IPs-map", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-access-logs", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-browsers.json b/packages/apache/kibana/visualization/apache-browsers.json new file mode 100644 index 00000000000..5cc8e7bc521 --- /dev/null +++ b/packages/apache/kibana/visualization/apache-browsers.json @@ -0,0 +1,73 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Browsers breakdown [Logs Apache]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": { + "field": "source.address" + }, + "schema": "metric", + "type": "cardinality" + }, + { + "enabled": true, + "id": "2", + "params": { + "field": "user_agent.name", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "segment", + "type": "terms" + }, + { + "enabled": true, + "id": "3", + "params": { + "field": "user_agent.version", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "segment", + "type": "terms" + } + ], + "listeners": {}, + "params": { + "addLegend": true, + "addTooltip": true, + "isDonut": true, + "legendPosition": "bottom", + "shareYAxis": true + }, + "title": "Apache browsers", + "type": "pie" + } + }, + "id": "apache-browsers", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-access-logs", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-ed44f820-3a10-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-ed44f820-3a10-11eb-8946-296aab7b13db.json new file mode 100644 index 00000000000..bc84a0c66dd --- /dev/null +++ b/packages/apache/kibana/visualization/apache-ed44f820-3a10-11eb-8946-296aab7b13db.json @@ -0,0 +1,56 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "title": "Apache Hostname [Logs Apache]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "controls": [ + { + "fieldName": "host.hostname", + "id": "1607512709833", + "indexPatternRefName": "control_0_index_pattern", + "label": "Hostname", + "options": { + "dynamicOptions": true, + "multiselect": false, + "order": "desc", + "size": 5, + "type": "terms" + }, + "parent": "", + "type": "list" + } + ], + "pinFilters": false, + "updateFiltersOnChange": true, + "useTimeFilter": false + }, + "title": "Apache Hostname [Logs Apache]", + "type": "input_control_vis" + } + }, + "id": "apache-ed44f820-3a10-11eb-8946-296aab7b13db", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "logs-*", + "name": "control_0_index_pattern", + "type": "index-pattern" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-error-logs-over-time.json b/packages/apache/kibana/visualization/apache-error-logs-over-time.json new file mode 100644 index 00000000000..bb97fac6a74 --- /dev/null +++ b/packages/apache/kibana/visualization/apache-error-logs-over-time.json @@ -0,0 +1,77 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Error logs over time [Logs Apache]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": {}, + "schema": "metric", + "type": "count" + }, + { + "enabled": true, + "id": "2", + "params": { + "extended_bounds": {}, + "field": "@timestamp", + "interval": "auto", + "min_doc_count": 1 + }, + "schema": "segment", + "type": "date_histogram" + }, + { + "enabled": true, + "id": "3", + "params": { + "field": "log.level", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "group", + "type": "terms" + } + ], + "listeners": {}, + "params": { + "addLegend": true, + "addTimeMarker": false, + "addTooltip": true, + "defaultYExtents": false, + "legendPosition": "right", + "mode": "stacked", + "scale": "linear", + "setYExtents": false, + "shareYAxis": true, + "times": [], + "yAxis": {} + }, + "title": "Apache error logs over time", + "type": "histogram" + } + }, + "id": "apache-error-logs-over-time", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-errors-log", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-f4ffec70-3a36-11eb-8946-296aab7b13db.json b/packages/apache/kibana/visualization/apache-f4ffec70-3a36-11eb-8946-296aab7b13db.json index 1ec8f29d2b2..fad15583fb8 100644 --- a/packages/apache/kibana/visualization/apache-f4ffec70-3a36-11eb-8946-296aab7b13db.json +++ b/packages/apache/kibana/visualization/apache-f4ffec70-3a36-11eb-8946-296aab7b13db.json @@ -167,7 +167,7 @@ }, "id": "apache-f4ffec70-3a36-11eb-8946-296aab7b13db", "migrationVersion": { - "visualization": "7.11.0" + "visualization": "7.9.3" }, "references": [ { diff --git a/packages/apache/kibana/visualization/apache-operating-systems.json b/packages/apache/kibana/visualization/apache-operating-systems.json new file mode 100644 index 00000000000..196f983cd6a --- /dev/null +++ b/packages/apache/kibana/visualization/apache-operating-systems.json @@ -0,0 +1,73 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Operating systems breakdown [Logs Apache]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": { + "field": "source.address" + }, + "schema": "metric", + "type": "cardinality" + }, + { + "enabled": true, + "id": "2", + "params": { + "field": "user_agent.os.name", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "segment", + "type": "terms" + }, + { + "enabled": true, + "id": "3", + "params": { + "field": "user_agent.os.version", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "segment", + "type": "terms" + } + ], + "listeners": {}, + "params": { + "addLegend": true, + "addTooltip": true, + "isDonut": true, + "legendPosition": "bottom", + "shareYAxis": true + }, + "title": "Apache operating systems", + "type": "pie" + } + }, + "id": "apache-operating-systems", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-access-logs", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-response-codes-of-top-URLs.json b/packages/apache/kibana/visualization/apache-response-codes-of-top-URLs.json new file mode 100644 index 00000000000..6b8eb933027 --- /dev/null +++ b/packages/apache/kibana/visualization/apache-response-codes-of-top-URLs.json @@ -0,0 +1,80 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Top URLs by response code [Logs Apache]", + "uiStateJSON": { + "vis": { + "colors": { + "200": "#7EB26D", + "404": "#EF843C" + } + } + }, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": {}, + "schema": "metric", + "type": "count" + }, + { + "enabled": true, + "id": "3", + "params": { + "customLabel": "URL", + "field": "url.original", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "split", + "type": "terms" + }, + { + "enabled": true, + "id": "2", + "params": { + "field": "http.response.status_code", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "segment", + "type": "terms" + } + ], + "listeners": {}, + "params": { + "addLegend": true, + "addTooltip": true, + "isDonut": false, + "legendPosition": "right", + "row": false, + "shareYAxis": true + }, + "title": "Apache response codes of top URLs", + "type": "pie" + } + }, + "id": "apache-response-codes-of-top-URLs", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-access-logs", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/kibana/visualization/apache-response-codes-over-time.json b/packages/apache/kibana/visualization/apache-response-codes-over-time.json new file mode 100644 index 00000000000..8f36ed2601e --- /dev/null +++ b/packages/apache/kibana/visualization/apache-response-codes-over-time.json @@ -0,0 +1,84 @@ +{ + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [] + } + }, + "savedSearchRefName": "search_0", + "title": "Response codes over time [Logs Apache]", + "uiStateJSON": { + "vis": { + "colors": { + "200": "#629E51", + "404": "#EF843C" + } + } + }, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": {}, + "schema": "metric", + "type": "count" + }, + { + "enabled": true, + "id": "2", + "params": { + "extended_bounds": {}, + "field": "@timestamp", + "interval": "auto", + "min_doc_count": 1 + }, + "schema": "segment", + "type": "date_histogram" + }, + { + "enabled": true, + "id": "3", + "params": { + "field": "http.response.status_code", + "order": "desc", + "orderBy": "1", + "size": 5 + }, + "schema": "group", + "type": "terms" + } + ], + "listeners": {}, + "params": { + "addLegend": true, + "addTimeMarker": false, + "addTooltip": true, + "defaultYExtents": false, + "legendPosition": "right", + "mode": "stacked", + "scale": "linear", + "setYExtents": false, + "shareYAxis": true, + "times": [], + "yAxis": {} + }, + "title": "Apache response codes over time", + "type": "histogram" + } + }, + "id": "apache-response-codes-over-time", + "migrationVersion": { + "visualization": "7.9.3" + }, + "references": [ + { + "id": "apache-access-logs", + "name": "search_0", + "type": "search" + } + ], + "type": "visualization" +} \ No newline at end of file diff --git a/packages/apache/manifest.yml b/packages/apache/manifest.yml index 231900674d2..9f6f0b85139 100644 --- a/packages/apache/manifest.yml +++ b/packages/apache/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: apache title: Apache -version: 0.3.1 +version: 0.3.2 license: basic description: Apache Integration type: integration @@ -9,7 +9,7 @@ categories: - web release: experimental conditions: - kibana.version: '^7.12.0' + kibana.version: '^7.11.0' screenshots: - src: /img/apache-metrics-overview.png title: Apache metrics overview