Skip to content

Commit 40c8ebb

Browse files
mmahacekmmahacek
committed
Merge branch 'main' into mm/azure-aad-signin
2 parents 215f2c2 + d7c45f8 commit 40c8ebb

File tree

1,223 files changed

+77473
-11099
lines changed

Some content is hidden

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

1,223 files changed

+77473
-11099
lines changed

‎.buildkite/pipeline.schedule-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
env:
3535
SERVERLESS: "false"
3636
FORCE_CHECK_ALL: "true"
37-
STACK_VERSION: 8.19.7-SNAPSHOT
37+
STACK_VERSION: 8.19.8-SNAPSHOT
3838
PUBLISH_COVERAGE_REPORTS: "true"
3939
depends_on:
4040
- step: "check"
@@ -48,7 +48,7 @@ steps:
4848
env:
4949
SERVERLESS: "false"
5050
FORCE_CHECK_ALL: "true"
51-
STACK_VERSION: 8.19.7-SNAPSHOT
51+
STACK_VERSION: 8.19.8-SNAPSHOT
5252
STACK_LOGSDB_ENABLED: "true"
5353
PUBLISH_COVERAGE_REPORTS: "false"
5454
depends_on:

‎.buildkite/pipeline.schedule-weekly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
env:
2222
SERVERLESS: "false"
2323
FORCE_CHECK_ALL: "true"
24-
STACK_VERSION: 8.19.7-SNAPSHOT
24+
STACK_VERSION: 8.19.8-SNAPSHOT
2525
PUBLISH_COVERAGE_REPORTS: "false"
2626
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
2727
depends_on:

‎.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:

‎.buildkite/scripts/packages/security_detection_engine.sh‎

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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +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/ingest-managed-jobs
1617
/packages/airflow @elastic/obs-infraobs-integrations
1718
/packages/airlock_digital @elastic/security-service-integrations
1819
/packages/akamai @elastic/security-service-integrations
@@ -85,8 +86,10 @@
8586
/packages/aws_bedrock/data_stream/invocation @elastic/security-service-integrations
8687
/packages/aws_bedrock/data_stream/runtime @elastic/obs-infraobs-integrations
8788
/packages/aws_billing @elastic/obs-infraobs-integrations
89+
/packages/aws_cloudtrail_otel @elastic/obs-infraobs-integrations
8890
/packages/aws_logs @elastic/obs-ds-hosted-services
8991
/packages/aws_mq @elastic/obs-infraobs-integrations
92+
/packages/aws_bedrock_agentcore @elastic/obs-infraobs-integrations
9093
/packages/aws_vpcflow_otel @elastic/obs-infraobs-integrations
9194
/packages/awsfargate @elastic/obs-infraobs-integrations
9295
/packages/awsfirehose @elastic/obs-ds-hosted-services
@@ -175,9 +178,9 @@
175178
/packages/citrix_waf @elastic/integration-experience
176179
/packages/claroty_ctd @elastic/security-service-integrations
177180
/packages/claroty_xdome @elastic/security-service-integrations
178-
/packages/cloud_asset_inventory @elastic/cloud-security-posture
181+
/packages/cloud_asset_inventory @elastic/contextual-security
179182
/packages/cloud_defend @elastic/sec-linux-platform
180-
/packages/cloud_security_posture @elastic/cloud-security-posture
183+
/packages/cloud_security_posture @elastic/contextual-security
181184
/packages/cloudflare @elastic/security-service-integrations
182185
/packages/cloudflare_logpush @elastic/security-service-integrations
183186
/packages/cockroachdb @elastic/obs-infraobs-integrations
@@ -368,6 +371,7 @@
368371
/packages/prisma_access @elastic/security-service-integrations
369372
/packages/prisma_cloud @elastic/security-service-integrations
370373
/packages/problemchild @elastic/ml-ui @elastic/sec-applied-ml
374+
/packages/profilingmetrics_otel @elastic/ingest-otel-data
371375
/packages/prometheus @elastic/obs-infraobs-integrations
372376
/packages/prometheus/data_stream/collector @elastic/obs-infraobs-integrations
373377
/packages/prometheus/data_stream/query @elastic/obs-infraobs-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ body:
1919
- Active Directory Entity Analytics [entityanalytics_ad]
2020
- ActiveMQ [activemq]
2121
- Admin By Request EPM [admin_by_request_epm]
22+
- Agentless Hello World [agentless_hello_world]
2223
- Airflow [airflow]
2324
- Airlock Digital [airlock_digital]
2425
- Akamai [akamai]
2526
- AlienVault OTX [ti_otx]
27+
- Amazon Bedrock AgentCore [aws_bedrock_agentcore]
2628
- Amazon Bedrock [aws_bedrock]
2729
- Amazon Data Firehose [awsfirehose]
2830
- Amazon MQ [aws_mq]
@@ -42,6 +44,7 @@ body:
4244
- Auditd Manager [auditd_manager]
4345
- Auth0 [auth0]
4446
- authentik [authentik]
47+
- AWS CloudTrail Logs OpenTelemetry Assets [aws_cloudtrail_otel]
4548
- AWS Cost and Usage Report (CUR 2.0) [aws_billing]
4649
- AWS ELB OpenTelemetry Assets [aws_elb_otel]
4750
- AWS Fargate (for ECS clusters) [awsfargate]
@@ -259,6 +262,7 @@ body:
259262
- MySQL [mysql]
260263
- Nagios XI [nagios_xi]
261264
- NATS [nats]
265+
- Neon Cyber [neon_cyber]
262266
- NetFlow Records [netflow]
263267
- Netskope [netskope]
264268
- Network Beaconing Identification [beaconing]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ body:
1919
- Active Directory Entity Analytics [entityanalytics_ad]
2020
- ActiveMQ [activemq]
2121
- Admin By Request EPM [admin_by_request_epm]
22+
- Agentless Hello World [agentless_hello_world]
2223
- Airflow [airflow]
2324
- Airlock Digital [airlock_digital]
2425
- Akamai [akamai]
2526
- AlienVault OTX [ti_otx]
27+
- Amazon Bedrock AgentCore [aws_bedrock_agentcore]
2628
- Amazon Bedrock [aws_bedrock]
2729
- Amazon Data Firehose [awsfirehose]
2830
- Amazon MQ [aws_mq]
@@ -42,6 +44,7 @@ body:
4244
- Auditd Manager [auditd_manager]
4345
- Auth0 [auth0]
4446
- authentik [authentik]
47+
- AWS CloudTrail Logs OpenTelemetry Assets [aws_cloudtrail_otel]
4548
- AWS Cost and Usage Report (CUR 2.0) [aws_billing]
4649
- AWS ELB OpenTelemetry Assets [aws_elb_otel]
4750
- AWS Fargate (for ECS clusters) [awsfargate]
@@ -259,6 +262,7 @@ body:
259262
- MySQL [mysql]
260263
- Nagios XI [nagios_xi]
261264
- NATS [nats]
265+
- Neon Cyber [neon_cyber]
262266
- NetFlow Records [netflow]
263267
- Netskope [netskope]
264268
- Network Beaconing Identification [beaconing]

‎.github/workflows/bump-elastic-stack-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626

2727
- name: Install Updatecli in the runner
28-
uses: updatecli/updatecli-action@719e3592d124cbf826da704cbe557e1221dd4bba #v2.94.0
28+
uses: updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635 #v2.96.0
2929

3030
- name: Select diff action
3131
if: ${{ github.event_name == 'pull_request' }}

‎.github/workflows/catalog-info.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
contents: read
1919
packages: read
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

2323
- uses: elastic/oblt-actions/elastic/validate-catalog@v1
2424

0 commit comments

Comments
 (0)