Skip to content

Commit

Permalink
Merge branch 'main' into bump-version-8.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jlind23 authored Jul 8, 2024
2 parents 04e5d51 + 9b9102f commit 94cc1c2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"pipelineSlug": "elastic-agent",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]"],
"allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"],
"set_commit_status": true,
"build_on_commit": true,
"build_on_comment": true,
Expand All @@ -21,7 +21,7 @@
"pipelineSlug": "elastic-agent-package",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["dependabot[bot]", "mergify[bot]"],
"allowed_list": ["dependabot[bot]", "mergify[bot]", "elastic-vault-github-plugin-prod[bot]"],
"set_commit_status": false,
"build_on_commit": false,
"build_on_comment": true,
Expand All @@ -37,7 +37,7 @@
"pipelineSlug": "elastic-agent-binary-dra",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["dependabot[bot]", "mergify[bot]"],
"allowed_list": ["dependabot[bot]", "mergify[bot]", "elastic-vault-github-plugin-prod[bot]"],
"set_commit_status": false,
"build_on_commit": false,
"build_on_comment": true,
Expand Down
8 changes: 4 additions & 4 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2670,11 +2670,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
Version: v0.5.1
Version: v0.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.5.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor@v0.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -20091,11 +20091,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/opentelemetry-lib
Version: v0.6.1
Version: v0.7.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.6.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.7.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/elastic/go-sysinfo v1.14.0
github.com/elastic/go-ucfg v0.8.8
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.6.0
github.com/fatih/color v1.16.0
github.com/fsnotify/fsnotify v1.7.0
github.com/gofrs/flock v0.8.1
Expand Down Expand Up @@ -148,7 +148,7 @@ require (
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/opentelemetry-lib v0.6.1 // indirect
github.com/elastic/opentelemetry-lib v0.7.0 // indirect
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f h1:qo0Nn9G+p7HbG+CmiWwSoiKJ/cyRq59TRn9Z2PRHTi8=
github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f/go.mod h1:mVdKBYYwt30xRFjCegbcURHh+3LWOCkQM33fgWbUiRI=
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1 h1:DtRPj288iHCZPjBUfxhgHS8SWM1p2TtBadbHjZBpZck=
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.5.1/go.mod h1:/eTf2omfsfYQOw+nGK2NzByPMNmwq2xBFmcnREOQMBI=
github.com/elastic/opentelemetry-lib v0.6.1 h1:Ayx82UH+oXF2222wmKTcRcq0todI6btpd8KF1tz1ZQ8=
github.com/elastic/opentelemetry-lib v0.6.1/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.6.0 h1:BOQ2NGl2wLtAAjGyAz/+UJByhy0k6wHrhrtCMr2I6+0=
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.6.0/go.mod h1:645TtN9alBSeZniKDIvtfoKaqcBlsX+K8lAUew/2Icg=
github.com/elastic/opentelemetry-lib v0.7.0 h1:sarbwqZJ9sx+B1zUl6qmf93/j7ggDAidc5CYKsIsQQk=
github.com/elastic/opentelemetry-lib v0.7.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
github.com/elastic/package-spec/v2 v2.6.0/go.mod h1:ks9/FaVOS+vCrGRQcDvXAd2FlmB84mrLikbRiO6ACuk=
github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA=
github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0=
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/otel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| elasticinframetricsprocessor | v0.5.1|
| elasticinframetricsprocessor | v0.6.0|
| attributesprocessor | v0.104.0|
| filterprocessor | v0.104.0|
| k8sattributesprocessor | v0.104.0|
Expand Down

0 comments on commit 94cc1c2

Please sign in to comment.