Skip to content

[Apache] Migrate package to spec v3 #9818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsoriano merged 9 commits into from
May 14, 2024
Merged

[Apache] Migrate package to spec v3 #9818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d59b7af
Migrate Apache package to spec v3
jsoriano May 8, 2024
2b8a5da
Fix changelog
jsoriano May 8, 2024
84a8030
Fix filters in metrics dashboards
jsoriano May 8, 2024
b370ec2
Add changelog entry for dashboard
jsoriano May 8, 2024
2d0a6f0
nitpicking
jsoriano May 8, 2024
a431750
Reference panels by value
jsoriano May 8, 2024
e9d3683
Add validation exceptions back
jsoriano May 8, 2024
84ab125
Don't store SSL config as secret by now
jsoriano May 9, 2024
72ea997
Merge remote-tracking branch 'origin/main' into apache-spec-v3
jsoriano May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/apache/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
# newer versions go on top
- version: "1.18.0"
changes:
- description: Prepare package for serverless.
type: enhancement
link: https://github.com/elastic/integrations/pull/9818
- description: Add secrets support.
type: enhancement
link: https://github.com/elastic/integrations/pull/9818
- description: Add filters to metrics dashboard.
type: enhancement
link: https://github.com/elastic/integrations/pull/9818
- description: Remove duplicated and ambiguous field definitions.
type: bugfix
link: https://github.com/elastic/integrations/pull/9818
- description: Fix normalization as arrays of event.category and event.type fields.
type: bugfix
link: https://github.com/elastic/integrations/pull/9818
- version: "1.17.2"
changes:
- description: Rename field "apache2.error.integration" to "apache.error.module" in the Apache error visualizations.
Expand Down
66 changes: 44 additions & 22 deletions packages/apache/data_stream/access/_dev/test/pipeline/test-access-basic.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296250288Z",
"ingested": "2024-05-08T10:22:19.872114404Z",
"kind": "event",
"original": "::1 - - [26/Dec/2016:16:16:29 +0200] \"GET /favicon.ico HTTP/1.1\" 404 209",
"outcome": "failure"
Expand Down Expand Up @@ -61,9 +63,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296284705Z",
"ingested": "2024-05-08T10:22:19.872146631Z",
"kind": "event",
"original": "192.168.33.1 - - [26/Dec/2016:16:22:13 +0000] \"GET /hello HTTP/1.1\" 404 499 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:50.0) Gecko/20100101 Firefox/50.0\"",
"outcome": "failure"
Expand Down Expand Up @@ -122,9 +126,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296289743Z",
"ingested": "2024-05-08T10:22:19.872151737Z",
"kind": "event",
"original": "::1 - - [26/Dec/2016:16:16:48 +0200] \"-\" 408 -",
"outcome": "failure"
Expand Down Expand Up @@ -158,9 +164,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296293311Z",
"ingested": "2024-05-08T10:22:19.872156019Z",
"kind": "event",
"original": "172.17.0.1 - - [29/May/2017:19:02:48 +0000] \"GET /stringpatch HTTP/1.1\" 404 612 \"-\" \"Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2\" \"-\"",
"outcome": "failure"
Expand Down Expand Up @@ -219,9 +227,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296296691Z",
"ingested": "2024-05-08T10:22:19.872160167Z",
"kind": "event",
"original": "monitoring-server - - [29/May/2017:19:02:48 +0000] \"GET /status HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2\" \"-\"",
"outcome": "success"
Expand Down Expand Up @@ -280,9 +290,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296300048Z",
"ingested": "2024-05-08T10:22:19.872164337Z",
"kind": "event",
"original": "127.0.0.1 - - [02/Feb/2019:05:38:45 +0100] \"-\" 408 152 \"-\" \"-\"",
"outcome": "failure"
Expand Down Expand Up @@ -329,9 +341,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296303835Z",
"ingested": "2024-05-08T10:22:19.872168538Z",
"kind": "event",
"original": "monitoring-server - - [29/May/2017:19:02:48 +0000] \"GET /A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4 HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2\" X-Forwarded-For=\"-\"",
"outcome": "success"
Expand Down Expand Up @@ -396,9 +410,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296310193Z",
"ingested": "2024-05-08T10:22:19.872172626Z",
"kind": "event",
"original": "89.160.20.112 - - [29/May/2017:19:02:48 +0000] \"GET /A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4 HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2\" X-Forwarded-For=\"10.0.0.2,10.0.0.1\"",
"outcome": "success"
Expand Down Expand Up @@ -484,9 +500,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296313609Z",
"ingested": "2024-05-08T10:22:19.872176723Z",
"kind": "event",
"original": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6 - - [29/May/2017:19:02:48 +0000] \"GET /A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4 HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120716 Firefox/15.0a2\" X-Forwarded-For=\"10.225.192.17, 10.2.2.121\"",
"outcome": "success"
Expand Down Expand Up @@ -562,9 +580,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296316938Z",
"ingested": "2024-05-08T10:22:19.872180798Z",
"kind": "event",
"original": "monitoring-server - - [17/May/2022:21:41:43 +0000] \"GET / HTTP/1.1\" 200 45 \"-\" \"curl/7.79.1\" X-Forwarded-For=\"192.168.0.2\"",
"outcome": "success"
Expand Down Expand Up @@ -622,9 +642,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.296320274Z",
"ingested": "2024-05-08T10:22:19.872184902Z",
"kind": "event",
"original": "127.0.0.1 user-identity frank [10/Oct/2000:13:55:36 -0700] \"GET /apache_pb.gif HTTP/1.0\" 200 2326",
"outcome": "success"
Expand Down
36 changes: 24 additions & 12 deletions packages/apache/data_stream/access/_dev/test/pipeline/test-access-darwin.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447843628Z",
"ingested": "2024-05-08T10:22:20.139680586Z",
"kind": "event",
"original": "::1 - - [26/Dec/2016:16:16:28 +0200] \"GET / HTTP/1.1\" 200 45",
"outcome": "success"
Expand Down Expand Up @@ -60,9 +62,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447895323Z",
"ingested": "2024-05-08T10:22:20.139715385Z",
"kind": "event",
"original": "::1 - - [26/Dec/2016:16:16:29 +0200] \"GET /favicon.ico HTTP/1.1\" 404 209",
"outcome": "failure"
Expand Down Expand Up @@ -108,9 +112,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447905030Z",
"ingested": "2024-05-08T10:22:20.139720504Z",
"kind": "event",
"original": "::1 - - [26/Dec/2016:16:16:48 +0200] \"-\" 408 -",
"outcome": "failure"
Expand Down Expand Up @@ -144,9 +150,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447912585Z",
"ingested": "2024-05-08T10:22:20.139724615Z",
"kind": "event",
"original": "89.160.20.156 - - [26/Dec/2016:18:23:35 +0200] \"GET / HTTP/1.1\" 200 45",
"outcome": "success"
Expand Down Expand Up @@ -209,9 +217,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447919912Z",
"ingested": "2024-05-08T10:22:20.139728696Z",
"kind": "event",
"original": "89.160.20.156 - - [26/Dec/2016:18:23:41 +0200] \"GET /notfound HTTP/1.1\" 404 206",
"outcome": "failure"
Expand Down Expand Up @@ -274,9 +284,11 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.447927217Z",
"ingested": "2024-05-08T10:22:20.139732611Z",
"kind": "event",
"original": "89.160.20.156 - - [26/Dec/2016:18:23:45 +0200] \"GET /hmm HTTP/1.1\" 404 201",
"outcome": "failure"
Expand Down
24 changes: 14 additions & 10 deletions ...es/apache/data_stream/access/_dev/test/pipeline/test-access-ssl-request.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.568940509Z",
"ingested": "2024-05-08T10:22:20.342081887Z",
"kind": "event",
"original": "[10/Aug/2018:09:45:56 +0200] 172.30.0.119 TLSv1.2 ECDHE-RSA-AES128-GCM-SHA256 \"GET /nagiosxi/ajaxhelper.php?cmd=getxicoreajax\u0026amp;opts=%7B%22func%22%3A%22get_admin_tasks_html%22%2C%22args%22%3A%22%22%7D\u0026amp;nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21 HTTP/1.1\" 1375"
"original": "[10/Aug/2018:09:45:56 +0200] 172.30.0.119 TLSv1.2 ECDHE-RSA-AES128-GCM-SHA256 \"GET /nagiosxi/ajaxhelper.php?cmd=getxicoreajax&opts=%7B%22func%22%3A%22get_admin_tasks_html%22%2C%22args%22%3A%22%22%7D&nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21 HTTP/1.1\" 1375"
},
"http": {
"request": {
Expand All @@ -48,9 +50,9 @@
},
"url": {
"extension": "php",
"original": "/nagiosxi/ajaxhelper.php?cmd=getxicoreajax\u0026amp;opts=%7B%22func%22%3A%22get_admin_tasks_html%22%2C%22args%22%3A%22%22%7D\u0026amp;nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21",
"original": "/nagiosxi/ajaxhelper.php?cmd=getxicoreajax&opts=%7B%22func%22%3A%22get_admin_tasks_html%22%2C%22args%22%3A%22%22%7D&nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21",
"path": "/nagiosxi/ajaxhelper.php",
"query": "cmd=getxicoreajax\u0026amp;opts={\"func\":\"get_admin_tasks_html\",\"args\":\"\"}\u0026amp;nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21"
"query": "cmd=getxicoreajax&opts={\"func\":\"get_admin_tasks_html\",\"args\":\"\"}&nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21"
}
},
{
Expand All @@ -70,11 +72,13 @@
"version": "8.5.1"
},
"event": {
"category": "web",
"category": [
"web"
],
"created": "2020-04-28T11:07:58.223Z",
"ingested": "2024-04-26T05:46:25.568967013Z",
"ingested": "2024-05-08T10:22:20.342133974Z",
"kind": "event",
"original": "[16/Oct/2019:11:53:47 +0200] 89.160.20.156 TLSv1.2 ECDHE-RSA-AES128-GCM-SHA256 \"GET /appl/ajaxhelper.php?cmd=getxicoreajax\u0026opts=%7B%22func%22%3A%22get_pagetop_alert_content_html%22%2C%22args%22%3A%22%22%7D\u0026nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d HTTP/1.1\" -"
"original": "[16/Oct/2019:11:53:47 +0200] 89.160.20.156 TLSv1.2 ECDHE-RSA-AES128-GCM-SHA256 \"GET /appl/ajaxhelper.php?cmd=getxicoreajax&opts=%7B%22func%22%3A%22get_pagetop_alert_content_html%22%2C%22args%22%3A%22%22%7D&nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d HTTP/1.1\" -"
},
"http": {
"request": {
Expand Down Expand Up @@ -114,9 +118,9 @@
},
"url": {
"extension": "php",
"original": "/appl/ajaxhelper.php?cmd=getxicoreajax\u0026opts=%7B%22func%22%3A%22get_pagetop_alert_content_html%22%2C%22args%22%3A%22%22%7D\u0026nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d",
"original": "/appl/ajaxhelper.php?cmd=getxicoreajax&opts=%7B%22func%22%3A%22get_pagetop_alert_content_html%22%2C%22args%22%3A%22%22%7D&nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d",
"path": "/appl/ajaxhelper.php",
"query": "cmd=getxicoreajax\u0026opts={\"func\":\"get_pagetop_alert_content_html\",\"args\":\"\"}\u0026nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d"
"query": "cmd=getxicoreajax&opts={\"func\":\"get_pagetop_alert_content_html\",\"args\":\"\"}&nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d"
}
}
]
Expand Down
Loading