Skip to content

Commit 8552c3a

Browse files
w0rk3rw0rk3r
authored
Merge branch 'main' into fr-process_name-lowercase
2 parents ef874f1 + 568fe69 commit 8552c3a

227 files changed

Lines changed: 14119 additions & 709 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/hooks/pre-command‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-backport" ]]; then
146146
export GITHUB_USERNAME_SECRET
147147
GITHUB_EMAIL_SECRET=$(retry 5 vault kv get -field email ${GITHUB_TOKEN_VAULT_PATH})
148148
export GITHUB_EMAIL_SECRET
149+
GITHUB_TOKEN=$(retry 5 vault kv get -field token "${GITHUB_TOKEN_VAULT_PATH}")
150+
export GITHUB_TOKEN
149151
fi
150152
fi

‎.buildkite/hooks/pre-exit‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,8 @@ unset_secrets
4545
cleanup
4646

4747
google_cloud_logout_active_account
48+
49+
if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-backport" && "$BUILDKITE_STEP_KEY" == "create-backport-branch" ]]; then
50+
cd "${WORKSPACE}"
51+
git config remote.origin.url "https://github.com/elastic/integrations.git"
52+
fi

‎.buildkite/scripts/backport_branch.sh‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ source .buildkite/scripts/common.sh
44

55
set -euo pipefail
66

7+
cleanup_gh() {
8+
pushd $WORKSPACE > /dev/null
9+
git config remote.origin.url "https://github.com/elastic/integrations.git"
10+
popd > /dev/null
11+
}
12+
13+
trap cleanup_gh EXIT
14+
15+
716
DRY_RUN="$(buildkite-agent meta-data get DRY_RUN --default ${DRY_RUN:-"true"})"
817
BASE_COMMIT="$(buildkite-agent meta-data get BASE_COMMIT --default ${BASE_COMMIT:-""})"
918
PACKAGE_NAME="$(buildkite-agent meta-data get PACKAGE_NAME --default ${PACKAGE_NAME:-""})"
@@ -15,6 +24,20 @@ if [[ -z "$PACKAGE_NAME" ]] || [[ -z "$PACKAGE_VERSION" ]]; then
1524
exit 1
1625
fi
1726

27+
# Report data set in the input step
28+
PARAMETERS=(
29+
"- **DRY_RUN**=$DRY_RUN"
30+
"- **BASE_COMMIT**=$BASE_COMMIT"
31+
"- **PACKAGE_NAME**=$PACKAGE_NAME"
32+
"- **PACKAGE_VERSION**=$PACKAGE_VERSION"
33+
"- **REMOVE_OTHER_PACKAGES**=$REMOVE_OTHER_PACKAGES"
34+
)
35+
36+
# Show each parameter in a different line
37+
echo "Parameters:\n${PARAMETERS[*]}" | tr ' ' '\n' | buildkite-agent annotate \
38+
--style "info" \
39+
--context "context-parameters"
40+
1841
FULL_ZIP_PACKAGE_NAME="${PACKAGE_NAME}-${PACKAGE_VERSION}.zip"
1942
TRIMMED_PACKAGE_VERSION="$(echo "$PACKAGE_VERSION" | cut -d '.' -f -2)"
2043
SOURCE_BRANCH="main"
@@ -81,6 +104,15 @@ removeOtherPackages() {
81104
done
82105
}
83106

107+
update_git_config() {
108+
pushd $WORKSPACE > /dev/null
109+
git config --global user.name "${GITHUB_USERNAME_SECRET}"
110+
git config --global user.email "${GITHUB_EMAIL_SECRET}"
111+
112+
git config remote.origin.url "https://${GITHUB_USERNAME_SECRET}:${GITHUB_TOKEN}@github.com/elastic/integrations.git"
113+
popd > /dev/null
114+
}
115+
84116
updateBackportBranchContents() {
85117
local BUILDKITE_FOLDER_PATH=".buildkite"
86118
local JENKINS_FOLDER_PATH=".ci"
@@ -106,8 +138,7 @@ updateBackportBranchContents() {
106138
fi
107139

108140
echo "Setting up git environment..."
109-
git config --global user.name "${GITHUB_USERNAME_SECRET}"
110-
git config --global user.email "${GITHUB_EMAIL_SECRET}"
141+
update_git_config
111142

112143
echo "Commiting"
113144
git add $BUILDKITE_FOLDER_PATH
@@ -131,6 +162,8 @@ updateBackportBranchContents() {
131162
echo "Pushing..."
132163
git push origin $BACKPORT_BRANCH_NAME
133164
fi
165+
166+
cleanup_gh
134167
}
135168

136169
if ! [[ $PACKAGE_VERSION =~ ^[0-9]+(\.[0-9]+){2}(\-.*)?$ ]]; then

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@
9696
/packages/azure_metrics/data_stream/database_account @elastic/obs-ds-hosted-services
9797
/packages/azure_metrics/data_stream/monitor @elastic/obs-ds-hosted-services
9898
/packages/azure_metrics/data_stream/storage_account @elastic/obs-ds-hosted-services
99+
/packages/azure_network_watcher_nsg @elastic/security-service-integrations
100+
/packages/azure_network_watcher_vnet @elastic/security-service-integrations
99101
/packages/barracuda @elastic/security-service-integrations
100102
/packages/barracuda_cloudgen_firewall @elastic/security-service-integrations
101103
/packages/bbot @elastic/security-service-integrations
@@ -340,8 +342,8 @@
340342
/packages/trendmicro @elastic/security-service-integrations
341343
/packages/udp @elastic/sec-deployment-and-devices
342344
/packages/universal_profiling_agent @elastic/profiling
343-
/packages/universal_profiling_collector @elastic/profiling
344-
/packages/universal_profiling_symbolizer @elastic/profiling
345+
/packages/universal_profiling_collector @elastic/obs-ds-intake-services
346+
/packages/universal_profiling_symbolizer @elastic/obs-ds-intake-services
345347
/packages/vectra_detect @elastic/security-service-integrations
346348
/packages/vsphere @elastic/obs-infraobs-integrations
347349
/packages/websphere_application_server @elastic/obs-infraobs-integrations

‎packages/activemq/data_stream/log/_dev/test/system/test-logfile-config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
service: activemq
22
input: logfile
3+
skip_ignored_fields:
4+
- error.stack_trace
35
data_stream:
46
vars:
57
paths:

‎packages/apache/changelog.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
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/9818
7+
- description: Add secrets support.
8+
type: enhancement
9+
link: https://github.com/elastic/integrations/pull/9818
10+
- description: Add filters to metrics dashboard.
11+
type: enhancement
12+
link: https://github.com/elastic/integrations/pull/9818
13+
- description: Remove duplicated and ambiguous field definitions.
14+
type: bugfix
15+
link: https://github.com/elastic/integrations/pull/9818
16+
- description: Fix normalization as arrays of event.category and event.type fields.
17+
type: bugfix
18+
link: https://github.com/elastic/integrations/pull/9818
219
- version: "1.17.2"
320
changes:
421
- description: Rename field "apache2.error.integration" to "apache.error.module" in the Apache error visualizations.

‎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"

0 commit comments

Comments
 (0)