Skip to content

Commit fe196b3

Browse files
authored
Merge branch 'main' into aws_cloudfront_fix
2 parents f351ea7 + 6c0b0df commit fe196b3

File tree

120 files changed

+10984
-2307
lines changed

Some content is hidden

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

120 files changed

+10984
-2307
lines changed

.buildkite/scripts/common.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ is_pr_affected() {
728728
return 1
729729
fi
730730
if ! is_supported_capability ; then
731-
echo "[${package}] PR is not affected: capabilities not mached with the project (${SERVERLESS_PROJECT})"
731+
echo "[${package}] PR is not affected: capabilities not matched with the project (${SERVERLESS_PROJECT})"
732732
return 1
733733
fi
734734
if [[ "${package}" == "fleet_server" ]]; then
@@ -763,10 +763,19 @@ is_pr_affected() {
763763
# Example:
764764
# https://buildkite.com/elastic/integrations/builds/25606
765765
# https://github.com/elastic/integrations/pull/13810
766-
if git diff --name-only "${commit_merge}" "${to}" | grep -E -v '^(packages/|\.github/(CODEOWNERS|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE|workflows/)|CODE_OF_CONDUCT\.md|README\.md|docs/|catalog-info\.yaml|\.buildkite/(pull-requests\.json|pipeline\.schedule-daily\.yml|pipeline\.schedule-weekly\.yml|pipeline\.backport\.yml))' > /dev/null; then
766+
if git diff --name-only "${commit_merge}" "${to}" | grep -E -v '^(packages/|\.github/(CODEOWNERS|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE|workflows/)|CODE_OF_CONDUCT\.md|README\.md|docs/|catalog-info\.yaml|\.buildkite/(pull-requests\.json|pipeline\.schedule-daily\.yml|pipeline\.schedule-weekly\.yml|pipeline\.backport\.yml|scripts/packages/.+\.sh))' > /dev/null; then
767767
echo "[${package}] PR is affected: found non-package files"
768768
return 0
769769
fi
770+
echoerr "[${package}] git-diff: check custom package checker script file (${commit_merge}..${to})"
771+
# Avoid using "-q" in grep in this pipe, it could cause that some files updated are not detected due to SIGPIPE errors when "set -o pipefail"
772+
# Example:
773+
# https://buildkite.com/elastic/integrations/builds/25606
774+
# https://github.com/elastic/integrations/pull/13810
775+
if git diff --name-only "${commit_merge}" "${to}" | grep -E "^\.buildkite/scripts/packages/${package}.sh" > /dev/null; then
776+
echo "[${package}] PR is affected: found package checker script changes"
777+
return 0
778+
fi
770779
echoerr "[${package}] git-diff: check package files (${commit_merge}..${to})"
771780
# Avoid using "-q" in grep in this pipe, it could cause that some files updated are not detected due to SIGPIPE errors when "set -o pipefail"
772781
# Example:
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then
6+
exit 0
7+
fi
8+
9+
# Fetch active Kibana versions
10+
ACTIVE_KIBANA_VERSIONS=$(curl -sL https://raw.githubusercontent.com/elastic/kibana/main/versions.json | yq '.versions[].version' | xargs)
11+
echo "Active Kibana versions: $ACTIVE_KIBANA_VERSIONS"
12+
13+
# Extract version spec from the manifest
14+
KIBANA_REQ=$(yq .conditions.kibana.version ./packages/security_detection_engine/manifest.yml)
15+
echo "Kibana requirement from the security_detection_engine manifest: $KIBANA_REQ"
16+
17+
# Dump a trivial Go program to filter by semver constrains
18+
TEMP_DIR=$(mktemp -d)
19+
SEMVER_FILTER_PATH="$TEMP_DIR/semver.go"
20+
21+
cat <<'GO' > "$SEMVER_FILTER_PATH"
22+
package main
23+
24+
import (
25+
"strings"
26+
"fmt"
27+
"os"
28+
"github.com/Masterminds/semver/v3"
29+
)
30+
31+
func main() {
32+
c, err := semver.NewConstraint(os.Args[1])
33+
if err != nil {
34+
panic(err)
35+
}
36+
37+
for _, s := range strings.Split(os.Args[2], " ") {
38+
if v, _ := semver.NewVersion(s); c.Check(v) {
39+
fmt.Println(s + "-SNAPSHOT")
40+
}
41+
}
42+
}
43+
GO
44+
45+
# Capture the "returned" array in STACK_VERSIONS
46+
read -r -a STACK_VERSIONS <<< "$(go run "${SEMVER_FILTER_PATH}" "${KIBANA_REQ}" "${ACTIVE_KIBANA_VERSIONS}" | xargs)"
47+
48+
if [[ ! -n "${STACK_VERSIONS+x}" ]]; then
49+
echo "There are no active versions satisfying the constraint ${KIBANA_REQ}."
50+
exit 0
51+
fi
52+
53+
# Trigger OOM testing pipeline for each stack version
54+
for STACK_VERSION in "${STACK_VERSIONS[@]}"
55+
do
56+
echo "--- [security_detection_engine] Trigger OOM testing pipeline against $STACK_VERSION ECH"
57+
58+
cat <<YAML | buildkite-agent pipeline upload
59+
steps:
60+
- key: 'run-oom-testing-$(echo "$STACK_VERSION" | sed 's/\./_/g')$BUILDKITE_BUILD_NUMBER'
61+
label: ":elastic-cloud::bar_chart: [security_detection_engine] Test for OOM issues against $STACK_VERSION ECH"
62+
trigger: "appex-qa-stateful-security-prebuilt-rules-ftr-oom-testing"
63+
async: false
64+
build:
65+
message: "Test security_detection_engine package against $STACK_VERSION ($GITHUB_PR_BASE_OWNER/$GITHUB_PR_BASE_REPO, branch: $GITHUB_PR_BRANCH, commit: $BUILDKITE_COMMIT)"
66+
env:
67+
STACK_VERSION: $STACK_VERSION
68+
ELASTIC_INTEGRATIONS_REPO_COMMIT: $BUILDKITE_COMMIT
69+
YAML
70+
done

.buildkite/scripts/test_one_package.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@ if ! process_package "${package}" ; then
3535
fi
3636
popd > /dev/null
3737

38-
exit "${exit_code}"
38+
if [ "${exit_code}" -ne 0 ] ; then
39+
exit "${exit_code}"
40+
fi
41+
42+
custom_package_checker_script_path="${SCRIPTS_BUILDKITE_PATH}/packages/${package}.sh"
43+
44+
if [ -x "$custom_package_checker_script_path" ]; then
45+
echo "--- [${package}] Run individual package checker"
46+
"$custom_package_checker_script_path"
47+
fi

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/packages/abnormal_security @elastic/security-service-integrations
1414
/packages/activemq @elastic/obs-infraobs-integrations
1515
/packages/admin_by_request_epm @elastic/security-service-integrations
16-
/packages/agentless_hello_world @elastic/agentless-team
16+
/packages/agentless_hello_world @elastic/ingest-managed-jobs
1717
/packages/airflow @elastic/obs-infraobs-integrations
1818
/packages/airlock_digital @elastic/security-service-integrations
1919
/packages/akamai @elastic/security-service-integrations
@@ -275,6 +275,7 @@
275275
/packages/hpe_aruba_cx @elastic/integration-experience
276276
/packages/hta @elastic/sec-applied-ml
277277
/packages/http_endpoint @elastic/security-service-integrations
278+
/packages/httpcheck_otel @elastic/ecosystem
278279
/packages/httpjson @elastic/security-service-integrations
279280
/packages/ibm_qradar @elastic/security-service-integrations
280281
/packages/ibmmq @elastic/obs-infraobs-integrations

.github/ISSUE_TEMPLATE/integration_bug.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ body:
297297
- PostgreSQL [postgresql]
298298
- Prebuilt Security Detection Rules [security_detection_engine]
299299
- Privileged Access Detection [pad]
300+
- Profilingmetrics OpenTelemetry Assets [profilingmetrics_otel]
300301
- Prometheus Input [prometheus_input]
301302
- Prometheus [prometheus]
302303
- Proofpoint ITM [proofpoint_itm]
@@ -322,6 +323,7 @@ body:
322323
- SentinelOne Cloud Funnel [sentinel_one_cloud_funnel]
323324
- SentinelOne [sentinel_one]
324325
- ServiceNow [servicenow]
326+
- Simple HTTP Check [httpcheck_otel]
325327
- Slack Logs [slack]
326328
- Snort [snort]
327329
- Snyk [snyk]

.github/ISSUE_TEMPLATE/integration_feature_request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ body:
297297
- PostgreSQL [postgresql]
298298
- Prebuilt Security Detection Rules [security_detection_engine]
299299
- Privileged Access Detection [pad]
300+
- Profilingmetrics OpenTelemetry Assets [profilingmetrics_otel]
300301
- Prometheus Input [prometheus_input]
301302
- Prometheus [prometheus]
302303
- Proofpoint ITM [proofpoint_itm]
@@ -322,6 +323,7 @@ body:
322323
- SentinelOne Cloud Funnel [sentinel_one_cloud_funnel]
323324
- SentinelOne [sentinel_one]
324325
- ServiceNow [servicenow]
326+
- Simple HTTP Check [httpcheck_otel]
325327
- Slack Logs [slack]
326328
- Snort [snort]
327329
- Snyk [snyk]

packages/agentless_hello_world/manifest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ policy_templates:
2828
is_default: true
2929
organization: observability
3030
division: engineering
31-
team: agentless-team
31+
team: ingest-managed-jobs
3232
inputs:
3333
- type: cel
3434
title: Collect data from EPR endpoint
3535
description: Fetches https://epr.elastic.co every minute.
3636
vars: []
3737
owner:
38-
github: elastic/agentless-team
38+
github: elastic/ingest-managed-jobs
3939
type: elastic

packages/aws/changelog.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# newer versions go on top
2-
- version: "4.4.1"
2+
- version: "4.5.1"
33
changes:
44
- description: Add `cookies` field in cloudfront logs datastream.
55
type: bugfix
6-
link: https://github.com/elastic/integrations/pull/15279
6+
link: https://github.com/elastic/integrations/pull/16122
7+
- version: "4.5.0"
8+
changes:
9+
- description: Prevent updating fleet health status to degraded when the HTTPJSON template value evaluation is empty.
10+
type: enhancement
11+
link: https://github.com/elastic/integrations/pull/15945
712
- version: "4.4.0"
813
changes:
914
- description: Prefer set with copy_from.

packages/aws/data_stream/guardduty/agent/stream/httpjson.yml.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ response.pagination:
4242
target: body.nextToken
4343
value: '[[if (ne .last_response.body.nextToken "")]][[.last_response.body.nextToken]][[end]]'
4444
fail_on_template_error: true
45+
do_not_log_failure: true
4546
- delete:
4647
target: header.Authorization
4748
- set:

packages/aws/data_stream/guardduty/sample_event.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"@timestamp": "2022-11-22T12:22:20.938Z",
33
"agent": {
4-
"ephemeral_id": "7b37f535-5ec4-4b95-a393-f3852061d4ac",
5-
"id": "9e5875f3-d206-43b3-b24e-5a5096e50846",
6-
"name": "docker-fleet-agent",
4+
"ephemeral_id": "9260a8f4-04bb-4bed-8f06-9a1f54eb3d56",
5+
"id": "383f5f90-e651-4a26-b1d8-0ecf81fa72e9",
6+
"name": "elastic-agent-86959",
77
"type": "filebeat",
8-
"version": "8.11.0"
8+
"version": "8.19.4"
99
},
1010
"aws": {
1111
"guardduty": {
@@ -139,16 +139,16 @@
139139
},
140140
"data_stream": {
141141
"dataset": "aws.guardduty",
142-
"namespace": "ep",
142+
"namespace": "40034",
143143
"type": "logs"
144144
},
145145
"ecs": {
146146
"version": "8.11.0"
147147
},
148148
"elastic_agent": {
149-
"id": "9e5875f3-d206-43b3-b24e-5a5096e50846",
149+
"id": "383f5f90-e651-4a26-b1d8-0ecf81fa72e9",
150150
"snapshot": false,
151-
"version": "8.11.0"
151+
"version": "8.19.4"
152152
},
153153
"event": {
154154
"action": "KUBERNETES_API_CALL",
@@ -157,7 +157,7 @@
157157
"dataset": "aws.guardduty",
158158
"end": "2022-11-22T12:22:20.000Z",
159159
"id": "e0c22973b012f3af67ac593443e920ff",
160-
"ingested": "2023-12-14T11:38:35Z",
160+
"ingested": "2025-11-12T05:48:59Z",
161161
"kind": [
162162
"event"
163163
],
@@ -237,4 +237,4 @@
237237
"GeneratedFindingUserGroup"
238238
]
239239
}
240-
}
240+
}

0 commit comments

Comments
 (0)