Skip to content

Commit 05e9c87

Browse files
chrisberkhoutchrisberkhout
authored
Merge branch 'main' into aws-securityhub-ignore-empty-value
2 parents 36032ec + 16c9a1d commit 05e9c87

655 files changed

Lines changed: 181492 additions & 5559 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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-publish" ]]; then
8282
fi
8383

8484
if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations" ]]; then
85-
if [[ "${BUILDKITE_STEP_KEY}" == "trigger-publish" ]]; then
86-
# TODO: To be removed
87-
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token ${BUILDKITE_API_TOKEN_PATH})
88-
export BUILDKITE_API_TOKEN
89-
fi
90-
9185
if [[ "${BUILDKITE_STEP_KEY}" == "test-integrations" ]]; then
9286
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
9387
export BUILDKITE_API_TOKEN

‎.buildkite/pipeline.publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ env:
99
JQ_VERSION: '1.7'
1010
# Elastic package settings
1111
# Manage docker output/logs
12-
ELASTIC_PACKAGE_COMPOSE_DISABLE_ANSI: "true"
13-
ELASTIC_PACKAGE_COMPOSE_DISABLE_PULL_PROGRESS_INFORMATION: "true"
12+
ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
1413
# Default license to use by `elastic-package build`
1514
ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
1615
# Link definitions path (full path to be set in the corresponding step)
@@ -37,7 +36,8 @@ steps:
3736
memory: "8G"
3837
env:
3938
ARTIFACTS_FOLDER: "artifacts-to-sign"
40-
DRY_RUN: "true"
39+
# by default it will publish packages
40+
DRY_RUN: "${DRY_RUN:-false}"
4141
depends_on:
4242
- step: "check"
4343
allow_failure: false

‎.buildkite/pipeline.yml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2-
32
env:
43
SETUP_GVM_VERSION: "v0.5.2"
54
LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
65
DOCKER_COMPOSE_VERSION: "v2.24.1"
7-
DOCKER_VERSION: "false"
6+
DOCKER_VERSION: "26.1.0"
87
KIND_VERSION: 'v0.20.0'
98
K8S_VERSION: 'v1.29.0'
109
YQ_VERSION: 'v4.35.2'
@@ -29,22 +28,6 @@ steps:
2928
cpu: "8"
3029
memory: "4G"
3130

32-
- label: ":package: Build packages"
33-
key: "build-packages"
34-
command: ".buildkite/scripts/build_packages.sh"
35-
agents:
36-
image: "${LINUX_AGENT_IMAGE}"
37-
cpu: "8"
38-
memory: "8G"
39-
env:
40-
ARTIFACTS_FOLDER: "artifacts-to-sign"
41-
DRY_RUN: "false"
42-
depends_on:
43-
- step: "check"
44-
allow_failure: false
45-
artifact_paths:
46-
- artifacts-to-sign/*.zip
47-
4831
- label: "Trigger integrations"
4932
key: "test-integrations"
5033
command: ".buildkite/scripts/trigger_integrations_in_parallel.sh"

‎.buildkite/scripts/common.sh‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,14 @@ with_docker() {
162162
fi
163163
echo "deb [arch=${architecture} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu ${ubuntu_codename} stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
164164
sudo apt-get update
165-
sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-downgrades -y "docker-ce=${debian_version}"
166-
sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-downgrades -y "docker-ce-cli=${debian_version}"
165+
sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-change-held-packages --allow-downgrades -y "docker-ce=${debian_version}"
166+
sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-change-held-packages --allow-downgrades -y "docker-ce-cli=${debian_version}"
167167
sudo systemctl start docker
168+
169+
echo "- Installed docker client version:"
170+
docker version -f json | jq -r '.Client.Version'
171+
echo "- Installed docker server version:"
172+
docker version -f json | jq -r '.Server.Version'
168173
}
169174

170175
with_docker_compose_plugin() {
@@ -309,7 +314,6 @@ create_kind_cluster() {
309314
kind create cluster --config "${WORKSPACE}/kind-config.yaml" --image "kindest/node:${K8S_VERSION}"
310315
}
311316

312-
313317
delete_kind_cluster() {
314318
echo "--- Delete kind cluster"
315319
kind delete cluster || true
@@ -410,7 +414,6 @@ is_package_excluded() {
410414
return 1
411415
}
412416

413-
414417
is_supported_capability() {
415418
if [ "${SERVERLESS_PROJECT}" == "" ]; then
416419
return 0
@@ -755,6 +758,19 @@ build_zip_package() {
755758
return 0
756759
}
757760

761+
skip_installation_step() {
762+
local package=$1
763+
if ! is_serverless ; then
764+
return 1
765+
fi
766+
767+
if [[ "$package" == "security_detection_engine" ]]; then
768+
return 0
769+
fi
770+
771+
return 1
772+
}
773+
758774
install_package() {
759775
local package=$1
760776
echo "Install package: ${package}"
@@ -814,10 +830,13 @@ run_tests_package() {
814830
fi
815831
fi
816832

817-
echo "--- [${package}] test installation"
818-
if ! install_package "${package}" ; then
819-
return 1
833+
if ! skip_installation_step "${package}" ; then
834+
echo "--- [${package}] test installation"
835+
if ! install_package "${package}" ; then
836+
return 1
837+
fi
820838
fi
839+
821840
echo "--- [${package}] run test suites"
822841
if is_serverless; then
823842
if ! test_package_in_serverless "${package}" ; then
@@ -877,6 +896,10 @@ upload_safe_logs_from_package() {
877896
fi
878897

879898
local package=$1
899+
local retry_count="${BUILDKITE_RETRY_COUNT:-"0"}"
900+
if [[ "${retry_count}" -ne 0 ]]; then
901+
package="${package}_retry_${retry_count}"
902+
fi
880903
local build_directory=$2
881904

882905
local parent_folder="insecure-logs"

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
/packages/aws/data_stream/vpn @elastic/obs-infraobs-integrations
6161
/packages/aws/kibana @elastic/obs-ds-hosted-services @elastic/kibana-visualizations @elastic/obs-infraobs-integrations
6262
/packages/aws/manifest.yml @elastic/obs-ds-hosted-services @elastic/security-service-integrations @elastic/obs-infraobs-integrations
63+
/packages/aws_bedrock @elastic/security-service-integrations
6364
/packages/aws_logs @elastic/obs-ds-hosted-services
6465
/packages/awsfargate @elastic/obs-infraobs-integrations
6566
/packages/awsfirehose @elastic/obs-ds-hosted-services
@@ -97,6 +98,7 @@
9798
/packages/azure_metrics/data_stream/storage_account @elastic/obs-ds-hosted-services
9899
/packages/barracuda @elastic/security-service-integrations
99100
/packages/barracuda_cloudgen_firewall @elastic/security-service-integrations
101+
/packages/bbot @elastic/security-service-integrations
100102
/packages/beaconing @elastic/ml-ui @elastic/sec-applied-ml
101103
/packages/beat @elastic/stack-monitoring
102104
/packages/bitdefender @elastic/security-service-integrations
@@ -137,6 +139,7 @@
137139
/packages/crowdstrike @elastic/security-service-integrations
138140
/packages/cyberark_pta @elastic/security-service-integrations
139141
/packages/cyberarkpas @elastic/security-service-integrations
142+
/packages/cybereason @elastic/security-service-integrations
140143
/packages/cylance @elastic/security-service-integrations
141144
/packages/darktrace @elastic/security-service-integrations
142145
/packages/ded @elastic/ml-ui @elastic/sec-applied-ml
@@ -146,6 +149,7 @@
146149
/packages/elastic_package_registry @elastic/ecosystem
147150
/packages/elasticsearch @elastic/stack-monitoring
148151
/packages/enterprisesearch @elastic/stack-monitoring
152+
/packages/entityanalytics_ad @elastic/security-service-integrations
149153
/packages/entityanalytics_entra_id @elastic/security-service-integrations
150154
/packages/entityanalytics_okta @elastic/security-service-integrations
151155
/packages/eset_protect @elastic/security-service-integrations
@@ -295,14 +299,14 @@
295299
/packages/suricata @elastic/sec-deployment-and-devices
296300
/packages/symantec_edr_cloud @elastic/security-service-integrations
297301
/packages/symantec_endpoint @elastic/security-service-integrations
302+
/packages/symantec_endpoint_security @elastic/security-service-integrations
298303
/packages/synthetics @elastic/obs-ux-infra_services-team
299304
/packages/synthetics_dashboards @elastic/obs-ux-infra_services-team
300305
/packages/sysmon_linux @elastic/sec-linux-platform
301306
/packages/system @elastic/obs-infraobs-integrations
302307
/packages/system/changelog.yml @elastic/obs-infraobs-integrations @elastic/sec-linux-platform @elastic/sec-windows-platform
303308
/packages/system/data_stream/auth @elastic/sec-windows-platform
304309
/packages/system/data_stream/security @elastic/sec-linux-platform @elastic/sec-windows-platform
305-
/packages/system/kibana @elastic/elastic-agent-data-plane @elastic/kibana-visualizations
306310
/packages/system/manifest.yml @elastic/obs-infraobs-integrations @elastic/sec-linux-platform @elastic/sec-windows-platform
307311
/packages/system_audit @elastic/sec-linux-platform
308312
/packages/tanium @elastic/security-service-integrations

‎catalog-info.yaml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
build_tags: false
5151
filter_enabled: true
5252
filter_condition: >-
53-
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
53+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null && build.source == 'api')
5454
repository: elastic/integrations
5555
cancel_intermediate_builds: true
5656
cancel_intermediate_builds_branch_filter: '!main !backport-*'
@@ -99,7 +99,7 @@ spec:
9999
build_tags: false
100100
filter_enabled: true
101101
filter_condition: >-
102-
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
102+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null && build.source == 'api')
103103
repository: elastic/integrations
104104
cancel_intermediate_builds: true
105105
cancel_intermediate_builds_branch_filter: '!main'
@@ -146,7 +146,7 @@ spec:
146146
build_tags: false
147147
filter_enabled: true
148148
filter_condition: >-
149-
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
149+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null && build.source == 'api')
150150
repository: elastic/integrations
151151
cancel_intermediate_builds: true
152152
cancel_intermediate_builds_branch_filter: '!main'
@@ -188,7 +188,7 @@ spec:
188188
build_tags: false
189189
filter_enabled: true
190190
filter_condition: >-
191-
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
191+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null && build.source == 'api')
192192
repository: elastic/integrations
193193
cancel_intermediate_builds: true
194194
cancel_intermediate_builds_branch_filter: '!main'
@@ -222,17 +222,15 @@ spec:
222222
name: integrations-publish
223223
description: 'Pipeline for the Integrations project to publish packages'
224224
spec:
225-
# TODO: add backport-* in `branch_configuration` when these brances are updated
226-
# branch_configuration: "main backport-*"
227-
branch_configuration: "main"
225+
branch_configuration: "main backport-*"
228226
pipeline_file: ".buildkite/pipeline.publish.yml"
229227
provider_settings:
230228
build_pull_request_forks: false
231229
build_pull_requests: false # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
232230
build_tags: false
233231
filter_enabled: true
234232
filter_condition: >-
235-
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
233+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null && build.source == 'api')
236234
repository: elastic/integrations
237235
cancel_intermediate_builds: true
238236
cancel_intermediate_builds_branch_filter: '!main !backport-*'

‎go.mod‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.22.0
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/elastic/elastic-package v0.99.0
7+
github.com/elastic/elastic-package v0.100.0
88
github.com/elastic/go-licenser v0.4.1
99
github.com/elastic/package-registry v1.24.0
1010
github.com/magefile/mage v1.15.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.9.0
13-
golang.org/x/tools v0.20.0
13+
golang.org/x/tools v0.21.0
1414
gopkg.in/yaml.v2 v2.4.0
1515
)
1616

@@ -30,7 +30,7 @@ require (
3030
github.com/PaesslerAG/gval v1.2.1 // indirect
3131
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
3232
github.com/Pallinder/go-randomdata v1.2.0 // indirect
33-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
33+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
3434
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
3535
github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
3636
github.com/andybalholm/brotli v1.0.4 // indirect
@@ -39,22 +39,23 @@ require (
3939
github.com/aymerick/raymond v2.0.2+incompatible // indirect
4040
github.com/beorn7/perks v1.0.1 // indirect
4141
github.com/cbroglie/mustache v1.4.0 // indirect
42-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
42+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4343
github.com/chai2010/gettext-go v1.0.2 // indirect
4444
github.com/cloudflare/circl v1.3.7 // indirect
45+
github.com/creack/pty v1.1.21 // indirect
4546
github.com/creasty/defaults v1.7.0 // indirect
4647
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4748
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4849
github.com/dustin/go-humanize v1.0.1 // indirect
4950
github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0 // indirect
5051
github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
51-
github.com/elastic/go-resource v0.1.1 // indirect
52+
github.com/elastic/go-resource v0.2.0 // indirect
5253
github.com/elastic/go-sysinfo v1.9.0 // indirect
5354
github.com/elastic/go-ucfg v0.8.8 // indirect
5455
github.com/elastic/go-windows v1.0.1 // indirect
5556
github.com/elastic/gojsonschema v1.2.1 // indirect
5657
github.com/elastic/kbncontent v0.1.3 // indirect
57-
github.com/elastic/package-spec/v3 v3.1.3 // indirect
58+
github.com/elastic/package-spec/v3 v3.1.4 // indirect
5859
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5960
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6061
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -139,7 +140,7 @@ require (
139140
github.com/prometheus/procfs v0.12.0 // indirect
140141
github.com/rivo/uniseg v0.4.3 // indirect
141142
github.com/russross/blackfriday/v2 v2.1.0 // indirect
142-
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
143+
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
143144
github.com/shoenig/go-m1cpu v0.1.6 // indirect
144145
github.com/shopspring/decimal v1.3.1 // indirect
145146
github.com/spf13/afero v1.11.0 // indirect
@@ -171,14 +172,14 @@ require (
171172
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
172173
go.uber.org/multierr v1.11.0 // indirect
173174
go.uber.org/zap v1.27.0 // indirect
174-
golang.org/x/crypto v0.22.0 // indirect
175+
golang.org/x/crypto v0.23.0 // indirect
175176
golang.org/x/mod v0.17.0 // indirect
176-
golang.org/x/net v0.24.0 // indirect
177+
golang.org/x/net v0.25.0 // indirect
177178
golang.org/x/oauth2 v0.18.0 // indirect
178179
golang.org/x/sync v0.7.0 // indirect
179-
golang.org/x/sys v0.19.0 // indirect
180-
golang.org/x/term v0.19.0 // indirect
181-
golang.org/x/text v0.14.0 // indirect
180+
golang.org/x/sys v0.20.0 // indirect
181+
golang.org/x/term v0.20.0 // indirect
182+
golang.org/x/text v0.15.0 // indirect
182183
golang.org/x/time v0.5.0 // indirect
183184
google.golang.org/api v0.171.0 // indirect
184185
google.golang.org/appengine v1.6.8 // indirect
@@ -189,16 +190,16 @@ require (
189190
google.golang.org/protobuf v1.33.0 // indirect
190191
gopkg.in/inf.v0 v0.9.1 // indirect
191192
gopkg.in/yaml.v3 v3.0.1 // indirect
192-
helm.sh/helm/v3 v3.14.3 // indirect
193+
helm.sh/helm/v3 v3.14.4 // indirect
193194
howett.net/plist v1.0.0 // indirect
194-
k8s.io/api v0.29.3 // indirect
195+
k8s.io/api v0.30.0 // indirect
195196
k8s.io/apiextensions-apiserver v0.29.0 // indirect
196-
k8s.io/apimachinery v0.29.3 // indirect
197-
k8s.io/cli-runtime v0.29.3 // indirect
198-
k8s.io/client-go v0.29.3 // indirect
197+
k8s.io/apimachinery v0.30.0 // indirect
198+
k8s.io/cli-runtime v0.30.0 // indirect
199+
k8s.io/client-go v0.30.0 // indirect
199200
k8s.io/component-base v0.29.0 // indirect
200-
k8s.io/klog/v2 v2.110.1 // indirect
201-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
201+
k8s.io/klog/v2 v2.120.1 // indirect
202+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
202203
k8s.io/kubectl v0.29.0 // indirect
203204
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
204205
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)