Skip to content

Commit a923f16

Browse files
michalpristasmichalpristas
committed
resolved conflicts
2 parents 628555d + a5a4a3b commit a923f16

32 files changed

+902
-200
lines changed

‎.agent-versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"testVersions": [
3+
"8.14.1",
34
"8.14.1-SNAPSHOT",
4-
"8.14.0",
55
"8.13.5-SNAPSHOT",
66
"8.13.4",
77
"7.17.22-SNAPSHOT",

‎.buildkite/pipeline.yml

+48
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,51 @@ steps:
232232
image: "family/core-ubuntu-2204"
233233
env:
234234
- GH_VERSION=2.4.0
235+
236+
# Trigger for pull requests
237+
- label: "Trigger Integration tests for Pull request"
238+
if: |
239+
(build.pull_request.id != null && !build.env("GITHUB_PR_LABELS") =~ /skip-it/) ||
240+
build.env("GITHUB_PR_TRIGGER_COMMENT") =~ /.*extended.*/
241+
242+
plugins:
243+
- monorepo-diff#v1.0.1:
244+
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
245+
watch:
246+
- path:
247+
- internal/
248+
- dev-tools/
249+
- pkg/
250+
- testing/
251+
- version/
252+
- specs/
253+
- .agent-versions.json
254+
- .go-version
255+
- .package-version
256+
- go.mod
257+
- go.sum
258+
- magefile.go
259+
- main.go
260+
261+
- .buildkite/integration.pipeline.yml
262+
- .buildkite/pipeline.yml
263+
- .buildkite/scripts/
264+
- .buildkite/hooks/
265+
266+
config:
267+
trigger: "elastic-agent-extended-testing"
268+
build:
269+
commit: "${BUILDKITE_COMMIT}"
270+
branch: "${BUILDKITE_BRANCH}"
271+
env:
272+
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
273+
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
274+
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
275+
276+
# Trigger for branches
277+
- label: "Triggering Integration tests for branches"
278+
if: build.pull_request.id == null
279+
trigger: "elastic-agent-extended-testing"
280+
build:
281+
commit: "${BUILDKITE_COMMIT}"
282+
branch: "${BUILDKITE_BRANCH}"

‎.buildkite/pull-requests.json

+2-19
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,13 @@
99
"set_commit_status": true,
1010
"build_on_commit": true,
1111
"build_on_comment": true,
12-
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
13-
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
12+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it|extended))|^/test\\W*(?:extended|)",
13+
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it|extended))|^/test\\W*(?:extended|)",
1414
"skip_ci_labels": [ "skip-ci" ],
1515
"skip_target_branches": [ ],
1616
"skip_ci_on_only_changed": [ "^.ci/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
1717
"always_require_ci_on_changed": [ ]
1818
},
19-
{
20-
"enabled": true,
21-
"build_drafts": false,
22-
"pipelineSlug": "elastic-agent-extended-testing",
23-
"allow_org_users": true,
24-
"allowed_repo_permissions": ["admin", "write"],
25-
"allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]"],
26-
"set_commit_status": true,
27-
"build_on_commit": true,
28-
"build_on_comment": true,
29-
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
30-
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
31-
"skip_ci_labels": [ "skip-ci", "skip-it" ],
32-
"skip_target_branches": [ ],
33-
"skip_ci_on_only_changed": [ "^.ci/", "^changelog", "^docs/", "\\.md$", "^sonar-project.properties", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
34-
"always_require_ci_on_changed": [ ]
35-
},
3619
{
3720
"enabled": true,
3821
"pipelineSlug": "elastic-agent-package",

‎NOTICE.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -18013,11 +18013,11 @@ Contents of probable licence file $GOMODCACHE/github.com/docker/go-connections@v
1801318013

1801418014
--------------------------------------------------------------------------------
1801518015
Dependency : github.com/elastic/go-docappender/v2
18016-
Version: v2.1.4
18016+
Version: v2.1.2
1801718017
Licence type (autodetected): Apache-2.0
1801818018
--------------------------------------------------------------------------------
1801918019

18020-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.4/LICENSE:
18020+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.2/LICENSE:
1802118021

1802218022
Apache License
1802318023
Version 2.0, January 2004
@@ -18858,11 +18858,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-windows@v1.0
1885818858

1885918859
--------------------------------------------------------------------------------
1886018860
Dependency : github.com/elastic/gosigar
18861-
Version: v0.14.2
18861+
Version: v0.14.3
1886218862
Licence type (autodetected): Apache-2.0
1886318863
--------------------------------------------------------------------------------
1886418864

18865-
Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.2/LICENSE:
18865+
Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.3/LICENSE:
1886618866

1886718867
Apache License
1886818868
Version 2.0, January 2004

‎changelog/fragments/1716320508-add-endpoint-monitoring.yaml

+32
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: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Add monitoring of endpoint usage metrics
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:
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/elastic/elastic-agent/pull/4789
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/elastic/elastic-agent/issues/4083

‎changelog/fragments/1716543099-add-otel-resource-detection-processor.yaml

+32
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: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Makes the `resourcedetection` processor available to users running Elastic Agent in `otel` mode.
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/1718200496-Add-unprivileged-mode-support.yaml

+34
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: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Add unprivileged mode support (beta)
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+
Add new --unprivileged installation option. This option installs the Elastic Agent as a non-root or non-Administrator
21+
user that has limited permissions on the host.
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

‎changelog/fragments/1718268915-increase-remove-timeout.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: bug-fix
2+
summary: Increase removal timeout when uninstall
3+
component: "elastic-agent"

‎dev-tools/notice/overrides.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
{"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
1717
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
1818
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
19-
{"name": "github.com/pascaldekloe/goe", "licenceType": "CC0-1.0"}
19+
{"name": "github.com/pascaldekloe/goe", "licenceFile": "LICENSE", "licenceType": "CC0-1.0"}

‎dev-tools/notice/rules.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"BSD-2-Clause-FreeBSD",
77
"CC0-1.0",
88
"BSD-3-Clause",
9+
"CC0-1.0",
910
"Elastic",
1011
"ISC",
1112
"MIT",

‎go.mod

+17-18
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,19 @@ require (
4242
github.com/mitchellh/hashstructure v1.1.0
4343
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
4444
github.com/oklog/ulid v1.3.1
45+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.102.0
46+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0
47+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.102.0
48+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
49+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0
50+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.102.0
4551
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.102.0
52+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0
53+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0
54+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.102.0
4655
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.102.0
4756
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.102.0
57+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.102.0
4858
github.com/otiai10/copy v1.14.0
4959
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
5060
github.com/pkg/errors v0.9.1
@@ -62,6 +72,11 @@ require (
6272
go.elastic.co/apm/module/apmgorilla v1.15.0
6373
go.elastic.co/ecszap v1.0.1
6474
go.elastic.co/go-licence-detector v0.5.0
75+
go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
76+
go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
77+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1
78+
go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
79+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
6580
go.uber.org/zap v1.27.0
6681
golang.org/x/crypto v0.23.0
6782
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
@@ -89,17 +104,6 @@ require (
89104
require (
90105
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
91106
github.com/distribution/reference v0.5.0 // indirect
92-
// open telemetry dependencies
93-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.102.0
94-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0
95-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.102.0
96-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
97-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0
98-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.102.0
99-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0
100-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0
101-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.102.0
102-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.102.0
103107
go.opentelemetry.io/collector/component v0.102.1
104108
go.opentelemetry.io/collector/confmap v0.102.1
105109
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1
@@ -109,16 +113,11 @@ require (
109113
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1
110114
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1
111115
go.opentelemetry.io/collector/exporter v0.102.1
112-
go.opentelemetry.io/collector/exporter/debugexporter v0.102.1
113-
go.opentelemetry.io/collector/exporter/otlpexporter v0.102.1
114116
go.opentelemetry.io/collector/extension v0.102.1
115-
go.opentelemetry.io/collector/extension/memorylimiterextension v0.102.1
116117
go.opentelemetry.io/collector/featuregate v1.9.0
117118
go.opentelemetry.io/collector/otelcol v0.102.1
118119
go.opentelemetry.io/collector/processor v0.102.1
119-
go.opentelemetry.io/collector/processor/batchprocessor v0.102.1
120120
go.opentelemetry.io/collector/receiver v0.102.1
121-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.102.1
122121
)
123122

124123
require (
@@ -140,11 +139,11 @@ require (
140139
github.com/dnephin/pflag v1.0.7 // indirect
141140
github.com/docker/docker v25.0.5+incompatible // indirect
142141
github.com/docker/go-connections v0.5.0 // indirect
143-
github.com/elastic/go-docappender/v2 v2.1.4 // indirect
142+
github.com/elastic/go-docappender/v2 v2.1.2 // indirect
144143
github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
145144
github.com/elastic/go-structform v0.0.10 // indirect
146145
github.com/elastic/go-windows v1.0.1 // indirect
147-
github.com/elastic/gosigar v0.14.2 // indirect
146+
github.com/elastic/gosigar v0.14.3 // indirect
148147
github.com/elastic/pkcs8 v1.0.0 // indirect
149148
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
150149
github.com/evanphx/json-patch v5.6.0+incompatible // indirect

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,8 @@ github.com/elastic/elastic-integration-corpus-generator-tool v0.5.0/go.mod h1:uf
823823
github.com/elastic/elastic-package v0.77.0/go.mod h1:Xeqx0OOVnKBfFoSHsHmKI74RxgRGiDhU6yXEu8BkJJM=
824824
github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
825825
github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
826-
github.com/elastic/go-docappender/v2 v2.1.4 h1:R6TN4udeC5pap+uA7Lrb3pzeOm03vx6K3+yQdczviH0=
827-
github.com/elastic/go-docappender/v2 v2.1.4/go.mod h1:eixVwyxvjJJLMditD/9630jjPbN6nHtSkVjae8nqJsY=
826+
github.com/elastic/go-docappender/v2 v2.1.2 h1:zkEh+g/CxpJdQR6BqdcApa/A4oRQiiG3iFiIhNCoovs=
827+
github.com/elastic/go-docappender/v2 v2.1.2/go.mod h1:oHi6MsHriWaG8W6T9iyJ/PkEo2+182HIzq+0RRAzzgA=
828828
github.com/elastic/go-elasticsearch/v7 v7.17.7/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
829829
github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
830830
github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
@@ -846,8 +846,8 @@ github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6
846846
github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
847847
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
848848
github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg=
849-
github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
850-
github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
849+
github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo=
850+
github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
851851
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f h1:qo0Nn9G+p7HbG+CmiWwSoiKJ/cyRq59TRn9Z2PRHTi8=
852852
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f/go.mod h1:mVdKBYYwt30xRFjCegbcURHh+3LWOCkQM33fgWbUiRI=
853853
github.com/elastic/package-spec/v2 v2.6.0/go.mod h1:ks9/FaVOS+vCrGRQcDvXAd2FlmB84mrLikbRiO6ACuk=

0 commit comments

Comments
 (0)