From 803b362f85c0a7c58d0e44fa1c58ab0327b28a0b Mon Sep 17 00:00:00 2001 From: ev1yehor <146825775+ev1yehor@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:11:50 +0300 Subject: [PATCH 1/2] Add GH vault plugin bot to allowed list (#5069) --- .buildkite/pull-requests.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json index c33e5e6febc..73ecf0d6a20 100644 --- a/.buildkite/pull-requests.json +++ b/.buildkite/pull-requests.json @@ -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, @@ -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, @@ -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, From 9b9102f80a51d41c4bc3b36ae1846790a1f52a2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:02:33 +0200 Subject: [PATCH 2/2] Bump github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor from 0.5.1 to 0.6.0 (#5074) * Bump github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor Bumps [github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor](https://github.com/elastic/opentelemetry-collector-components) from 0.5.1 to 0.6.0. - [Release notes](https://github.com/elastic/opentelemetry-collector-components/releases) - [Commits](https://github.com/elastic/opentelemetry-collector-components/compare/processor/elasticinframetricsprocessor/v0.5.1...processor/elasticinframetricsprocessor/v0.6.0) --- updated-dependencies: - dependency-name: github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Update NOTICE.txt * Update otel README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- internal/pkg/otel/README.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6425e1ccc7d..0a3c56f7b47 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 @@ -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 diff --git a/go.mod b/go.mod index bfe3d4f173b..c409e1398ea 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 diff --git a/go.sum b/go.sum index 65ae97fca2b..f30d6428d61 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/pkg/otel/README.md b/internal/pkg/otel/README.md index 419e6dc0fb7..408b41058a1 100644 --- a/internal/pkg/otel/README.md +++ b/internal/pkg/otel/README.md @@ -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|