Skip to content

Commit 350e5ce

Browse files
theletterftheletterf
authored
Merge branch 'main' into fix-config-key
2 parents 6aa0277 + 504d379 commit 350e5ce

File tree

18 files changed

+141
-61
lines changed

18 files changed

+141
-61
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,20 @@ env:
1212
# This section is used to define the plugins that will be used in the pipeline.
1313
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
1414
common:
15-
# We are temporarily using the Production CFT environment API key instead of the
16-
# Staging GovCloud one. This is being done until issues with creating deployments in
17-
# Staging GovCloud are fixed. Once those are fixed, uncomment the `vault_ec_key_staging_frh_gov`
18-
# section and delete the `vault_ec_key_prod` section below.
19-
# - vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
20-
# elastic/vault-secrets#v0.1.0:
21-
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
22-
# field: "apiKey"
23-
# env_var: "EC_API_KEY"
24-
- vault_ec_key_prod: &vault_ec_key_prod
15+
- vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
2516
elastic/vault-secrets#v0.1.0:
26-
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
17+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
2718
field: "apiKey"
2819
env_var: "EC_API_KEY"
20+
2921
steps:
3022
- label: Start ESS stack for FIPS integration tests
3123
key: integration-fips-ess
3224
env:
3325
FIPS: "true"
34-
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
35-
# ESS_REGION: "us-gov-east-1"
36-
# TF_VAR_deployment_template_id: "aws-general-purpose"
26+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
27+
ESS_REGION: "us-gov-east-1"
28+
TF_VAR_deployment_template_id: "aws-general-purpose"
3729
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
3830
TF_VAR_docker_images_name_suffix: "-fips"
3931
command: |
@@ -45,7 +37,7 @@ steps:
4537
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
4638
useCustomGlobalHooks: true
4739
plugins:
48-
- *vault_ec_key_prod
40+
- *vault_ec_key_staging_frh_gov
4941

5042
- group: "fips:Stateful:Ubuntu"
5143
key: integration-tests-ubuntu-fips
@@ -73,7 +65,7 @@ steps:
7365
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
7466
instanceType: "m5.2xlarge"
7567
plugins:
76-
- *vault_ec_key_prod
68+
- *vault_ec_key_staging_frh_gov
7769
matrix:
7870
setup:
7971
sudo:
@@ -103,7 +95,7 @@ steps:
10395
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
10496
instanceType: "m6g.2xlarge"
10597
plugins:
106-
- *vault_ec_key_prod
98+
- *vault_ec_key_staging_frh_gov
10799
matrix:
108100
setup:
109101
sudo:
@@ -130,16 +122,16 @@ steps:
130122
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
131123
instanceType: "m5.2xlarge"
132124
plugins:
133-
- *vault_ec_key_prod
125+
- *vault_ec_key_staging_frh_gov
134126

135127
- label: ESS FIPS stack cleanup
136128
depends_on:
137129
- integration-tests-ubuntu-fips
138130
env:
139131
FIPS: "true"
140-
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
141-
# ESS_REGION: "us-gov-east-1"
142-
# TF_VAR_deployment_template_id: "aws-general-purpose"
132+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
133+
ESS_REGION: "us-gov-east-1"
134+
TF_VAR_deployment_template_id: "aws-general-purpose"
143135
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
144136
TF_VAR_docker_images_name_suffix: "-fips"
145137
allow_dependency_failure: true
@@ -151,7 +143,7 @@ steps:
151143
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
152144
useCustomGlobalHooks: true
153145
plugins:
154-
- *vault_ec_key_prod
146+
- *vault_ec_key_staging_frh_gov
155147

156148
- label: Aggregate test reports
157149
depends_on:

‎.buildkite/hooks/pre-command‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-package" ]]; then
3434
fi
3535
fi
3636

37-
if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
37+
if [[ "$BUILDKITE_PIPELINE_SLUG" == "buildkite-elastic-agent-integration-matrix" ]]; then
3838
echo "Setting credentials"
3939
# Set GCP credentials
4040
export GOOGLE_APPLICATION_GCP_SECRET=$(retry 5 vault kv get -format=json -field=data ${CI_GCP_OBS_PATH})
4141
echo "${GOOGLE_APPLICATION_GCP_SECRET}" > ./gcp.json
4242
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ./gcp.json)
4343
export TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE=$(realpath ./gcp.json)
44+
fi
4445

46+
if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
4547
# ESS credentials
4648
export API_KEY_TOKEN=$(vault kv get -field apiKey ${CI_ESS_PATH})
4749
echo ${API_KEY_TOKEN} > ./apiKey

‎.buildkite/hooks/pre-exit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
1414
SNAPSHOT=true mage integration:clean
1515
fi
1616

17-
if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
17+
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]; then
1818
if test -f "$GOOGLE_APPLICATION_CREDENTIALS"; then
1919
rm $GOOGLE_APPLICATION_CREDENTIALS
2020
fi
2121
fi
2222

23-
if [ -n "$TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE" ]; then
23+
if [ -n "${TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE:-}" ]; then
2424
if test -f "$TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE"; then
2525
rm $TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE
2626
fi

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251025075340-e216ddecd7cf
790+
Version: v7.0.0-alpha2.0.20251028191233-a28ab9dc65a4
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251025075340-e216ddecd7cf/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251028191233-a28ab9dc65a4/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -1254,11 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
Version: v0.24.2
1257+
Version: v0.25.0
12581258
Licence type (autodetected): Apache-2.0
12591259
--------------------------------------------------------------------------------
12601260

1261-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.24.2/LICENSE:
1261+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.0/LICENSE:
12621262

12631263
Apache License
12641264
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251025075340-e216ddecd7cf
790+
Version: v7.0.0-alpha2.0.20251028191233-a28ab9dc65a4
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251025075340-e216ddecd7cf/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251028191233-a28ab9dc65a4/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -1254,11 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
Version: v0.24.2
1257+
Version: v0.25.0
12581258
Licence type (autodetected): Apache-2.0
12591259
--------------------------------------------------------------------------------
12601260

1261-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.24.2/LICENSE:
1261+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.0/LICENSE:
12621262

12631263
Apache License
12641264
Version 2.0, January 2004

‎changelog/fragments/1760996949-helm-bool.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Fix quoting of boolean values in Helm charts.
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

‎changelog/fragments/1761660612-enable-otel-self-monitoring.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: enhancement
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Run self-monitoring as otel receivers by default
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
description: |
20+
The inputs used for Elastic Agent's self-monitoring now run as receivers inside a managed otel collector.
21+
This can be switched back by setting `agent.monitoring._runtime_experimental: process`.
22+
23+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
24+
component: elastic-agent
25+
26+
# PR URL; optional; the PR number that added the changeset.
27+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
28+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
29+
# Please provide it if you are adding a fragment for a different PR.
30+
#pr: https://github.com/owner/repo/1234
31+
32+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
33+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
34+
#issue: https://github.com/owner/repo/1234

‎deploy/helm/elastic-agent/templates/agent/_helpers.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,10 @@ Mutate an agent preset based on agent.fleet
258258
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_ENROLLMENT_TOKEN" "value" $.Values.agent.fleet.token) -}}
259259
{{- end -}}
260260
{{- if $.Values.agent.fleet.insecure -}}
261-
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_INSECURE" "value" (quote $.Values.agent.fleet.insecure)) -}}
261+
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_INSECURE" "value" (printf "%t" $.Values.agent.fleet.insecure)) -}}
262262
{{- end -}}
263263
{{- if $.Values.agent.fleet.force -}}
264-
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_FORCE" "value" (quote $.Values.agent.fleet.force)) -}}
264+
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_FORCE" "value" (printf "%t" $.Values.agent.fleet.force)) -}}
265265
{{- end -}}
266266
{{- if $.Values.agent.fleet.tokenName -}}
267267
{{- $extraEnvs = append $extraEnvs (dict "name" "FLEET_TOKEN_NAME" "value" $.Values.agent.fleet.tokenName) -}}

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ require (
1414
github.com/docker/docker v28.4.0+incompatible
1515
github.com/docker/go-units v0.5.0
1616
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251025075340-e216ddecd7cf
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251028191233-a28ab9dc65a4
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.10.0
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2
21-
github.com/elastic/elastic-agent-libs v0.24.2
21+
github.com/elastic/elastic-agent-libs v0.25.0
2222
github.com/elastic/elastic-agent-system-metrics v0.13.3
2323
github.com/elastic/elastic-transport-go/v8 v8.7.0
2424
github.com/elastic/go-elasticsearch/v8 v8.19.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,16 +509,16 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
509509
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
510510
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
511511
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
512-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251025075340-e216ddecd7cf h1:lmn+A1n8mTJvLrphU3Vi6JxZUBsD3YWgrjo7SgxgrFc=
513-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251025075340-e216ddecd7cf/go.mod h1:kIPiDHzoeg2aPTDZ2C5Srlx4YyK6+pTcmyE3ujhcUSk=
512+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251028191233-a28ab9dc65a4 h1:JsCXEA05QK2Ye85sxQecaDeCc83u51UBGfzJefy5bG0=
513+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20251028191233-a28ab9dc65a4/go.mod h1:XntfZKVAguGFKCkMrIpkBkNRpoxiVGuyM0rxYdsbmgE=
514514
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
515515
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
516516
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
517517
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
518518
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
519519
github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk=
520-
github.com/elastic/elastic-agent-libs v0.24.2 h1:BM86jemZV/a2qL2DsQO+tNfGroh/9GzZYAFU7yMiSZU=
521-
github.com/elastic/elastic-agent-libs v0.24.2/go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A=
520+
github.com/elastic/elastic-agent-libs v0.25.0 h1:DZ/92eIjujrXw7u9CxV58MK04P1fGABpMwqDOKCj/z4=
521+
github.com/elastic/elastic-agent-libs v0.25.0/go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A=
522522
github.com/elastic/elastic-agent-system-metrics v0.13.3 h1:VlY3Ezuwi5bPZRsAM97WaJEW78XkXgqmPHcTl1WGMRw=
523523
github.com/elastic/elastic-agent-system-metrics v0.13.3/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U=
524524
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=

0 commit comments

Comments
 (0)