Skip to content

Commit d59b7af

Browse files
jsorianojsoriano
committed
Migrate Apache package to spec v3
1 parent 2294f97 commit d59b7af

20 files changed

+286
-233
lines changed

‎packages/apache/changelog.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
# newer versions go on top
2+
- version: "1.18.0"
3+
changes:
4+
- description: Prepare package for serverless.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/
7+
- description: Add secrets support
8+
type: enhancement
9+
link: https://github.com/elastic/integrations/pull/
10+
- description: Remove duplicated and ambiguous field definitions
11+
type: bugfix
12+
link: https://github.com/elastic/integrations/pull/
13+
- description: Fix normalization as arrays of event.category and event.type fields
14+
type: bugfix
15+
link: https://github.com/elastic/integrations/pull/
216
- version: "1.17.1"
317
changes:
418
- description: Update grok for accepting user-identity.

‎packages/apache/data_stream/access/_dev/test/pipeline/test-access-basic.log-expected.json‎

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
"version": "8.5.1"
1414
},
1515
"event": {
16-
"category": "web",
16+
"category": [
17+
"web"
18+
],
1719
"created": "2020-04-28T11:07:58.223Z",
18-
"ingested": "2024-04-26T05:46:25.296250288Z",
20+
"ingested": "2024-05-08T10:22:19.872114404Z",
1921
"kind": "event",
2022
"original": "::1 - - [26/Dec/2016:16:16:29 +0200] \"GET /favicon.ico HTTP/1.1\" 404 209",
2123
"outcome": "failure"
@@ -61,9 +63,11 @@
6163
"version": "8.5.1"
6264
},
6365
"event": {
64-
"category": "web",
66+
"category": [
67+
"web"
68+
],
6569
"created": "2020-04-28T11:07:58.223Z",
66-
"ingested": "2024-04-26T05:46:25.296284705Z",
70+
"ingested": "2024-05-08T10:22:19.872146631Z",
6771
"kind": "event",
6872
"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\"",
6973
"outcome": "failure"
@@ -122,9 +126,11 @@
122126
"version": "8.5.1"
123127
},
124128
"event": {
125-
"category": "web",
129+
"category": [
130+
"web"
131+
],
126132
"created": "2020-04-28T11:07:58.223Z",
127-
"ingested": "2024-04-26T05:46:25.296289743Z",
133+
"ingested": "2024-05-08T10:22:19.872151737Z",
128134
"kind": "event",
129135
"original": "::1 - - [26/Dec/2016:16:16:48 +0200] \"-\" 408 -",
130136
"outcome": "failure"
@@ -158,9 +164,11 @@
158164
"version": "8.5.1"
159165
},
160166
"event": {
161-
"category": "web",
167+
"category": [
168+
"web"
169+
],
162170
"created": "2020-04-28T11:07:58.223Z",
163-
"ingested": "2024-04-26T05:46:25.296293311Z",
171+
"ingested": "2024-05-08T10:22:19.872156019Z",
164172
"kind": "event",
165173
"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\" \"-\"",
166174
"outcome": "failure"
@@ -219,9 +227,11 @@
219227
"version": "8.5.1"
220228
},
221229
"event": {
222-
"category": "web",
230+
"category": [
231+
"web"
232+
],
223233
"created": "2020-04-28T11:07:58.223Z",
224-
"ingested": "2024-04-26T05:46:25.296296691Z",
234+
"ingested": "2024-05-08T10:22:19.872160167Z",
225235
"kind": "event",
226236
"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\" \"-\"",
227237
"outcome": "success"
@@ -280,9 +290,11 @@
280290
"version": "8.5.1"
281291
},
282292
"event": {
283-
"category": "web",
293+
"category": [
294+
"web"
295+
],
284296
"created": "2020-04-28T11:07:58.223Z",
285-
"ingested": "2024-04-26T05:46:25.296300048Z",
297+
"ingested": "2024-05-08T10:22:19.872164337Z",
286298
"kind": "event",
287299
"original": "127.0.0.1 - - [02/Feb/2019:05:38:45 +0100] \"-\" 408 152 \"-\" \"-\"",
288300
"outcome": "failure"
@@ -329,9 +341,11 @@
329341
"version": "8.5.1"
330342
},
331343
"event": {
332-
"category": "web",
344+
"category": [
345+
"web"
346+
],
333347
"created": "2020-04-28T11:07:58.223Z",
334-
"ingested": "2024-04-26T05:46:25.296303835Z",
348+
"ingested": "2024-05-08T10:22:19.872168538Z",
335349
"kind": "event",
336350
"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=\"-\"",
337351
"outcome": "success"
@@ -396,9 +410,11 @@
396410
"version": "8.5.1"
397411
},
398412
"event": {
399-
"category": "web",
413+
"category": [
414+
"web"
415+
],
400416
"created": "2020-04-28T11:07:58.223Z",
401-
"ingested": "2024-04-26T05:46:25.296310193Z",
417+
"ingested": "2024-05-08T10:22:19.872172626Z",
402418
"kind": "event",
403419
"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\"",
404420
"outcome": "success"
@@ -484,9 +500,11 @@
484500
"version": "8.5.1"
485501
},
486502
"event": {
487-
"category": "web",
503+
"category": [
504+
"web"
505+
],
488506
"created": "2020-04-28T11:07:58.223Z",
489-
"ingested": "2024-04-26T05:46:25.296313609Z",
507+
"ingested": "2024-05-08T10:22:19.872176723Z",
490508
"kind": "event",
491509
"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\"",
492510
"outcome": "success"
@@ -562,9 +580,11 @@
562580
"version": "8.5.1"
563581
},
564582
"event": {
565-
"category": "web",
583+
"category": [
584+
"web"
585+
],
566586
"created": "2020-04-28T11:07:58.223Z",
567-
"ingested": "2024-04-26T05:46:25.296316938Z",
587+
"ingested": "2024-05-08T10:22:19.872180798Z",
568588
"kind": "event",
569589
"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\"",
570590
"outcome": "success"
@@ -622,9 +642,11 @@
622642
"version": "8.5.1"
623643
},
624644
"event": {
625-
"category": "web",
645+
"category": [
646+
"web"
647+
],
626648
"created": "2020-04-28T11:07:58.223Z",
627-
"ingested": "2024-04-26T05:46:25.296320274Z",
649+
"ingested": "2024-05-08T10:22:19.872184902Z",
628650
"kind": "event",
629651
"original": "127.0.0.1 user-identity frank [10/Oct/2000:13:55:36 -0700] \"GET /apache_pb.gif HTTP/1.0\" 200 2326",
630652
"outcome": "success"

‎packages/apache/data_stream/access/_dev/test/pipeline/test-access-darwin.log-expected.json‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
"version": "8.5.1"
1414
},
1515
"event": {
16-
"category": "web",
16+
"category": [
17+
"web"
18+
],
1719
"created": "2020-04-28T11:07:58.223Z",
18-
"ingested": "2024-04-26T05:46:25.447843628Z",
20+
"ingested": "2024-05-08T10:22:20.139680586Z",
1921
"kind": "event",
2022
"original": "::1 - - [26/Dec/2016:16:16:28 +0200] \"GET / HTTP/1.1\" 200 45",
2123
"outcome": "success"
@@ -60,9 +62,11 @@
6062
"version": "8.5.1"
6163
},
6264
"event": {
63-
"category": "web",
65+
"category": [
66+
"web"
67+
],
6468
"created": "2020-04-28T11:07:58.223Z",
65-
"ingested": "2024-04-26T05:46:25.447895323Z",
69+
"ingested": "2024-05-08T10:22:20.139715385Z",
6670
"kind": "event",
6771
"original": "::1 - - [26/Dec/2016:16:16:29 +0200] \"GET /favicon.ico HTTP/1.1\" 404 209",
6872
"outcome": "failure"
@@ -108,9 +112,11 @@
108112
"version": "8.5.1"
109113
},
110114
"event": {
111-
"category": "web",
115+
"category": [
116+
"web"
117+
],
112118
"created": "2020-04-28T11:07:58.223Z",
113-
"ingested": "2024-04-26T05:46:25.447905030Z",
119+
"ingested": "2024-05-08T10:22:20.139720504Z",
114120
"kind": "event",
115121
"original": "::1 - - [26/Dec/2016:16:16:48 +0200] \"-\" 408 -",
116122
"outcome": "failure"
@@ -144,9 +150,11 @@
144150
"version": "8.5.1"
145151
},
146152
"event": {
147-
"category": "web",
153+
"category": [
154+
"web"
155+
],
148156
"created": "2020-04-28T11:07:58.223Z",
149-
"ingested": "2024-04-26T05:46:25.447912585Z",
157+
"ingested": "2024-05-08T10:22:20.139724615Z",
150158
"kind": "event",
151159
"original": "89.160.20.156 - - [26/Dec/2016:18:23:35 +0200] \"GET / HTTP/1.1\" 200 45",
152160
"outcome": "success"
@@ -209,9 +217,11 @@
209217
"version": "8.5.1"
210218
},
211219
"event": {
212-
"category": "web",
220+
"category": [
221+
"web"
222+
],
213223
"created": "2020-04-28T11:07:58.223Z",
214-
"ingested": "2024-04-26T05:46:25.447919912Z",
224+
"ingested": "2024-05-08T10:22:20.139728696Z",
215225
"kind": "event",
216226
"original": "89.160.20.156 - - [26/Dec/2016:18:23:41 +0200] \"GET /notfound HTTP/1.1\" 404 206",
217227
"outcome": "failure"
@@ -274,9 +284,11 @@
274284
"version": "8.5.1"
275285
},
276286
"event": {
277-
"category": "web",
287+
"category": [
288+
"web"
289+
],
278290
"created": "2020-04-28T11:07:58.223Z",
279-
"ingested": "2024-04-26T05:46:25.447927217Z",
291+
"ingested": "2024-05-08T10:22:20.139732611Z",
280292
"kind": "event",
281293
"original": "89.160.20.156 - - [26/Dec/2016:18:23:45 +0200] \"GET /hmm HTTP/1.1\" 404 201",
282294
"outcome": "failure"

‎packages/apache/data_stream/access/_dev/test/pipeline/test-access-ssl-request.log-expected.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
"version": "8.5.1"
1818
},
1919
"event": {
20-
"category": "web",
20+
"category": [
21+
"web"
22+
],
2123
"created": "2020-04-28T11:07:58.223Z",
22-
"ingested": "2024-04-26T05:46:25.568940509Z",
24+
"ingested": "2024-05-08T10:22:20.342081887Z",
2325
"kind": "event",
24-
"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"
26+
"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"
2527
},
2628
"http": {
2729
"request": {
@@ -48,9 +50,9 @@
4850
},
4951
"url": {
5052
"extension": "php",
51-
"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",
53+
"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",
5254
"path": "/nagiosxi/ajaxhelper.php",
53-
"query": "cmd=getxicoreajax\u0026amp;opts={\"func\":\"get_admin_tasks_html\",\"args\":\"\"}\u0026amp;nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21"
55+
"query": "cmd=getxicoreajax&opts={\"func\":\"get_admin_tasks_html\",\"args\":\"\"}&nsp=b5c7d5d4b6f7d0cf0c92f9cbdf737f6a5c838218425e6ae21"
5456
}
5557
},
5658
{
@@ -70,11 +72,13 @@
7072
"version": "8.5.1"
7173
},
7274
"event": {
73-
"category": "web",
75+
"category": [
76+
"web"
77+
],
7478
"created": "2020-04-28T11:07:58.223Z",
75-
"ingested": "2024-04-26T05:46:25.568967013Z",
79+
"ingested": "2024-05-08T10:22:20.342133974Z",
7680
"kind": "event",
77-
"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\" -"
81+
"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\" -"
7882
},
7983
"http": {
8084
"request": {
@@ -114,9 +118,9 @@
114118
},
115119
"url": {
116120
"extension": "php",
117-
"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",
121+
"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",
118122
"path": "/appl/ajaxhelper.php",
119-
"query": "cmd=getxicoreajax\u0026opts={\"func\":\"get_pagetop_alert_content_html\",\"args\":\"\"}\u0026nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d"
123+
"query": "cmd=getxicoreajax&opts={\"func\":\"get_pagetop_alert_content_html\",\"args\":\"\"}&nsp=c2700eab9797eda8a9f65a3ab17a6adbceccd60a6cca7708650a5923950d"
120124
}
121125
}
122126
]

0 commit comments

Comments
 (0)