Skip to content

Commit ab4ff22

Browse files
btriegerbtrieger
authored
Merge branch 'main' into azure-adfs-signinlogs
2 parents c753d77 + 723a34c commit ab4ff22

File tree

1,000 files changed

+41251
-4424
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,000 files changed

+41251
-4424
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" =~ ^(integrations|integrations-test-stack)$ ]
110110
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
111111
export BUILDKITE_API_TOKEN
112112
fi
113-
114-
if [[ "${BUILDKITE_STEP_KEY}" =~ ^test-integrations- ]]; then
115-
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
116-
export BUILDKITE_API_TOKEN
117-
fi
118113
fi
119114

120115
if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-serverless" ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ steps:
8686
if: |
8787
build.env('TEST_PACKAGES_BASIC_SUBSCRIPTION') == "true"
8888
89-
- label: "Check integrations local stacks - Stack Version v9.3"
89+
- label: "Check integrations local stacks - Stack Version v9.4"
9090
trigger: "integrations"
9191
build:
9292
env:
9393
SERVERLESS: "false"
9494
FORCE_CHECK_ALL: "true"
95-
STACK_VERSION: 9.3.0-SNAPSHOT
95+
STACK_VERSION: 9.4.0-SNAPSHOT
9696
PUBLISH_COVERAGE_REPORTS: "false"
9797
depends_on:
9898
- step: "check"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ steps:
2828
- step: "check"
2929
allow_failure: false
3030

31-
- label: "Check integrations local stacks and non-wolfi images for Elastic Agent - Stack Version v9.3"
31+
- label: "Check integrations local stacks and non-wolfi images for Elastic Agent - Stack Version v9.4"
3232
trigger: "integrations"
3333
build:
3434
env:
3535
SERVERLESS: "false"
3636
FORCE_CHECK_ALL: "true"
37-
STACK_VERSION: 9.3.0-SNAPSHOT
37+
STACK_VERSION: 9.4.0-SNAPSHOT
3838
PUBLISH_COVERAGE_REPORTS: "false"
3939
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
4040
depends_on:

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@
261261
/packages/gcp_metrics @elastic/obs-ds-hosted-services
262262
/packages/gcp_pubsub @elastic/security-service-integrations
263263
/packages/gcp_vertexai @elastic/obs-infraobs-integrations
264+
/packages/gcp_audit_otel @elastic/obs-infraobs-integrations
265+
/packages/gcp_vpcflow_otel @elastic/obs-infraobs-integrations
264266
/packages/gigamon @elastic/security-service-integrations
265267
/packages/github @elastic/security-service-integrations
266268
/packages/gitlab @elastic/security-service-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,10 @@ body:
183183
- Fortinet FortiMail [fortinet_fortimail]
184184
- Fortinet FortiManager Logs [fortinet_fortimanager]
185185
- Fortinet FortiProxy [fortinet_fortiproxy]
186+
- GCP Audit Logs OpenTelemetry Assets [gcp_audit_otel]
186187
- GCP Metrics Input [gcp_metrics]
187188
- GCP Vertex AI [gcp_vertexai]
189+
- GCP VPC Flow Logs OpenTelemetry Assets [gcp_vpcflow_otel]
188190
- Gigamon [gigamon]
189191
- GitHub [github]
190192
- GitLab [gitlab]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,10 @@ body:
183183
- Fortinet FortiMail [fortinet_fortimail]
184184
- Fortinet FortiManager Logs [fortinet_fortimanager]
185185
- Fortinet FortiProxy [fortinet_fortiproxy]
186+
- GCP Audit Logs OpenTelemetry Assets [gcp_audit_otel]
186187
- GCP Metrics Input [gcp_metrics]
187188
- GCP Vertex AI [gcp_vertexai]
189+
- GCP VPC Flow Logs OpenTelemetry Assets [gcp_vpcflow_otel]
188190
- Gigamon [gigamon]
189191
- GitHub [github]
190192
- GitLab [gitlab]

‎docs/ci_pipelines.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ More details about this CI pipeline:
7676
In the following table, there are some examples:
7777

7878
| STACK_VERSION env | Kibana Condition Package | Released | Elastic stack run |
79-
| :---: | :---: | :---: | :---: |
80-
| "" | `^7.16.0 || ^8.0.0` | Yes | `7.16.0` |
81-
| "" | `^8.12.0` | Yes | `8.12.0` |
82-
| "" | `^8.14.1` | Yes | `8.14.1` |
83-
| "" | `^8.15.0` | No | `8.15.0-SNAPSHOT` |
84-
| `8.14.0` | `^8.13.0` | Yes | `8.14.0` |
79+
| :---: | :---: | :---: | :---: |
80+
| "" | `^7.16.0 \|\| ^8.0.0` | Yes | `7.16.0` |
81+
| "" | `^8.12.0` | Yes | `8.12.0` |
82+
| "" | `^8.14.1` | Yes | `8.14.1` |
83+
| "" | `^8.15.0` | No | `8.15.0-SNAPSHOT` |
84+
| `8.14.0` | `^8.13.0` | Yes | `8.14.0` |
8585

8686
If the STACK_VERSION environment variable is defined, just the packages supporting that stack version are tested. For instance:
8787

‎docs/extend/elastic-package.md‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -247,25 +247,6 @@ Use this command to add, remove, and manage multiple config profiles.
247247
Individual user profiles appear in ~/.elastic-package/stack and contain all the config files needed by the "stack" subcommand. Once a new profile is created, it can be specified with the -p flag, or the ELASTIC_PACKAGE_PROFILE environment variable. User profiles are not overwritten on an upgrade of elastic-stack and can be freely modified to allow for different stack configs.
248248

249249

250-
### `elastic-package promote` [_elastic_package_promote]
251-
252-
*Context: global*
253-
254-
Use this command to move packages between the {{package-registry}} snapshot, staging, and production stages.
255-
256-
This command is intended primarily for use by administrators.
257-
258-
It allows for selecting packages for promotion and opens new pull requests to review changes. However, please be aware that the tool checks out an in-memory Git repository and switches over branches (snapshot, staging and production), so it may take longer to promote a larger number of packages.
259-
260-
261-
### `elastic-package publish` [_elastic_package_publish]
262-
263-
*Context: package*
264-
265-
Use this command to publish a new package revision.
266-
267-
The command checks if the package has already been published (whether it’s present in the snapshot/staging/production branch or open as pull request). If the package revision hasn’t been published, it will open a new pull request.
268-
269250
### `elastic-package report` [_elastic_package_report]
270251

271252
*Context: package*

‎go.mod‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Masterminds/semver/v3 v3.4.0
77
github.com/blang/semver v3.5.1+incompatible
88
github.com/cli/go-gh/v2 v2.13.0
9-
github.com/elastic/elastic-package v0.117.1
9+
github.com/elastic/elastic-package v0.118.0
1010
github.com/elastic/go-licenser v0.4.2
1111
github.com/elastic/go-ucfg v0.8.8
1212
github.com/elastic/package-registry v1.34.0
@@ -62,9 +62,9 @@ require (
6262
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
6363
github.com/charmbracelet/x/term v0.2.1 // indirect
6464
github.com/cli/safeexec v1.0.0 // indirect
65-
github.com/clipperhouse/displaywidth v0.3.1 // indirect
65+
github.com/clipperhouse/displaywidth v0.6.0 // indirect
6666
github.com/clipperhouse/stringish v0.1.1 // indirect
67-
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
67+
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
6868
github.com/cloudflare/circl v1.6.1 // indirect
6969
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
7070
github.com/creack/pty v1.1.19 // indirect
@@ -79,7 +79,7 @@ require (
7979
github.com/elastic/go-windows v1.0.2 // indirect
8080
github.com/elastic/gojsonschema v1.2.1 // indirect
8181
github.com/elastic/kbncontent v0.1.4 // indirect
82-
github.com/elastic/package-spec/v3 v3.5.4 // indirect
82+
github.com/elastic/package-spec/v3 v3.5.5 // indirect
8383
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
8484
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
8585
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -103,6 +103,7 @@ require (
103103
github.com/go-openapi/strfmt v0.21.3 // indirect
104104
github.com/go-openapi/swag v0.23.0 // indirect
105105
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
106+
github.com/gobwas/glob v0.2.3 // indirect
106107
github.com/gogo/protobuf v1.3.2 // indirect
107108
github.com/google/btree v1.1.3 // indirect
108109
github.com/google/gnostic-models v0.7.0 // indirect
@@ -157,8 +158,8 @@ require (
157158
github.com/oklog/ulid v1.3.1 // indirect
158159
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
159160
github.com/olekukonko/errors v1.1.0 // indirect
160-
github.com/olekukonko/ll v0.1.2 // indirect
161-
github.com/olekukonko/tablewriter v1.1.1 // indirect
161+
github.com/olekukonko/ll v0.1.3 // indirect
162+
github.com/olekukonko/tablewriter v1.1.2 // indirect
162163
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
163164
github.com/pkg/xattr v0.4.10 // indirect
164165
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
@@ -178,7 +179,7 @@ require (
178179
github.com/shopspring/decimal v1.4.0 // indirect
179180
github.com/spf13/afero v1.15.0 // indirect
180181
github.com/spf13/cast v1.7.0 // indirect
181-
github.com/spf13/cobra v1.10.1 // indirect
182+
github.com/spf13/cobra v1.10.2 // indirect
182183
github.com/spf13/pflag v1.0.10 // indirect
183184
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
184185
github.com/stretchr/objx v0.5.2 // indirect
@@ -210,7 +211,7 @@ require (
210211
go.opentelemetry.io/otel/trace v1.38.0 // indirect
211212
go.uber.org/multierr v1.11.0 // indirect
212213
go.uber.org/zap v1.27.1 // indirect
213-
go.yaml.in/yaml/v2 v2.4.2 // indirect
214+
go.yaml.in/yaml/v2 v2.4.3 // indirect
214215
go.yaml.in/yaml/v3 v3.0.4 // indirect
215216
golang.org/x/crypto v0.46.0 // indirect
216217
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
@@ -228,26 +229,26 @@ require (
228229
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
229230
google.golang.org/grpc v1.77.0 // indirect
230231
google.golang.org/protobuf v1.36.10 // indirect
231-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
232+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
232233
gopkg.in/inf.v0 v0.9.1 // indirect
233234
gopkg.in/yaml.v2 v2.4.0 // indirect
234-
helm.sh/helm/v3 v3.19.2 // indirect
235+
helm.sh/helm/v3 v3.19.4 // indirect
235236
howett.net/plist v1.0.1 // indirect
236-
k8s.io/api v0.34.2 // indirect
237-
k8s.io/apiextensions-apiserver v0.34.0 // indirect
238-
k8s.io/apimachinery v0.34.2 // indirect
239-
k8s.io/cli-runtime v0.34.2 // indirect
240-
k8s.io/client-go v0.34.2 // indirect
241-
k8s.io/component-base v0.34.0 // indirect
237+
k8s.io/api v0.35.0 // indirect
238+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
239+
k8s.io/apimachinery v0.35.0 // indirect
240+
k8s.io/cli-runtime v0.35.0 // indirect
241+
k8s.io/client-go v0.35.0 // indirect
242+
k8s.io/component-base v0.34.2 // indirect
242243
k8s.io/klog/v2 v2.130.1 // indirect
243-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
244-
k8s.io/kubectl v0.34.0 // indirect
245-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
244+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
245+
k8s.io/kubectl v0.34.2 // indirect
246+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
246247
modernc.org/libc v1.66.10 // indirect
247248
modernc.org/mathutil v1.7.1 // indirect
248249
modernc.org/memory v1.11.0 // indirect
249250
modernc.org/sqlite v1.40.1 // indirect
250-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
251+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
251252
sigs.k8s.io/kustomize/api v0.20.1 // indirect
252253
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
253254
sigs.k8s.io/randfill v1.0.0 // indirect

0 commit comments

Comments
 (0)