Skip to content

Commit eb04952

Browse files
author
lucian-ioan
committed
merge main
2 parents 8a60172 + 80eedb5 commit eb04952

File tree

625 files changed

+181074
-5626
lines changed

Some content is hidden

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

625 files changed

+181074
-5626
lines changed

‎.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: 1 addition & 2 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)

‎.buildkite/pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ env:
33
SETUP_GVM_VERSION: "v0.5.2"
44
LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
55
DOCKER_COMPOSE_VERSION: "v2.24.1"
6-
DOCKER_VERSION: "false"
6+
DOCKER_VERSION: "26.1.0"
77
KIND_VERSION: 'v0.20.0'
88
K8S_VERSION: 'v1.29.0'
99
YQ_VERSION: 'v4.35.2'

‎.buildkite/scripts/common.sh‎

Lines changed: 7 additions & 2 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() {

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 2 deletions
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
@@ -95,6 +96,8 @@
9596
/packages/azure_metrics/data_stream/database_account @elastic/obs-ds-hosted-services
9697
/packages/azure_metrics/data_stream/monitor @elastic/obs-ds-hosted-services
9798
/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
98101
/packages/barracuda @elastic/security-service-integrations
99102
/packages/barracuda_cloudgen_firewall @elastic/security-service-integrations
100103
/packages/bbot @elastic/security-service-integrations
@@ -138,6 +141,7 @@
138141
/packages/crowdstrike @elastic/security-service-integrations
139142
/packages/cyberark_pta @elastic/security-service-integrations
140143
/packages/cyberarkpas @elastic/security-service-integrations
144+
/packages/cybereason @elastic/security-service-integrations
141145
/packages/cylance @elastic/security-service-integrations
142146
/packages/darktrace @elastic/security-service-integrations
143147
/packages/ded @elastic/ml-ui @elastic/sec-applied-ml
@@ -297,6 +301,7 @@
297301
/packages/suricata @elastic/sec-deployment-and-devices
298302
/packages/symantec_edr_cloud @elastic/security-service-integrations
299303
/packages/symantec_endpoint @elastic/security-service-integrations
304+
/packages/symantec_endpoint_security @elastic/security-service-integrations
300305
/packages/synthetics @elastic/obs-ux-infra_services-team
301306
/packages/synthetics_dashboards @elastic/obs-ux-infra_services-team
302307
/packages/sysmon_linux @elastic/sec-linux-platform
@@ -337,8 +342,8 @@
337342
/packages/trendmicro @elastic/security-service-integrations
338343
/packages/udp @elastic/sec-deployment-and-devices
339344
/packages/universal_profiling_agent @elastic/profiling
340-
/packages/universal_profiling_collector @elastic/profiling
341-
/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
342347
/packages/vectra_detect @elastic/security-service-integrations
343348
/packages/vsphere @elastic/obs-infraobs-integrations
344349
/packages/websphere_application_server @elastic/obs-infraobs-integrations

‎catalog-info.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,7 @@ 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

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