Skip to content

[8.19](backport #51804) chore: import autodiscover repository#52208

Open
mergify[bot] wants to merge 3 commits into
8.19from
mergify/bp/8.19/pr-51804
Open

[8.19](backport #51804) chore: import autodiscover repository#52208
mergify[bot] wants to merge 3 commits into
8.19from
mergify/bp/8.19/pr-51804

Conversation

@mergify

@mergify mergify Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Imports the code from elastic-agent-autodiscover repository (back) into beats repository.

This imports all commits done in the elastic-agent-autodiscover repository since extracting it from Beats repository back in 2022. The cutoff commit is elastic/elastic-agent-autodiscover@8187a88. I rewrote the commits to have the [elastic-agent-autodiscover] prefix.

The linter flagged some violations in Beats files that only had import paths changed. I fixed those that were fixable automatically with --fix parameter of golangci-lint and added nolint directives on the other violations to minimize the scope of changes.

Part of:

* [elastic-agent-autodiscover] Add extra resources in k8s informer

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Add data plane team as code owners.

* [elastic-agent-autodiscover] ci: enable orka (#12)

* [elastic-agent-autodiscover] automation: bump golang version (#11)

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.17.10

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.17.11

* [elastic-agent-autodiscover] ci: use windows-2022 and default go-version (#13)

* [elastic-agent-autodiscover] Upgrade containerd to fix depandabot alerts.

* [elastic-agent-autodiscover] Read Go version for CI from .go-version file

* [elastic-agent-autodiscover] Reuse mage targets from elastic-agent-libs

* [elastic-agent-autodiscover] Update lint rules.

See discussion in https://github.com/elastic/beats/pull/31683

* [elastic-agent-autodiscover] Fix new lint warnings.

* [elastic-agent-autodiscover] Upgrade github.com/containerd/containerd to 1.5.13

* [elastic-agent-autodiscover] Add a notice target, generate a notice file.

* [elastic-agent-autodiscover] Fix lint warnings.

Ported in the rule to ignore use of fmt.Println in magefiles.

* [elastic-agent-autodiscover] Add hints' utils to autodiscover library (#19)

Adding hints' helpers from https://github.com/elastic/beats/blob/ba3bce42590dbf722061d7d92bfdb0bd903e9014/libbeat/autodiscover/builder/helper.go to the external library so as to be re-used by elastic-agent.

* [elastic-agent-autodiscover] Move hints helpers under utils and add tests

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Fix linter

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Update README.md

* [elastic-agent-autodiscover] Update README.md

* [elastic-agent-autodiscover] Update README.md

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.17.12

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.4

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.5

* [elastic-agent-autodiscover] Update elastic-agent-libs to v0.2.11.

Upgrades the local version of the linter.

* [elastic-agent-autodiscover] Update linter github action.

* [elastic-agent-autodiscover] Remove obsolete comment in .golangci-lint

* [elastic-agent-autodiscover] add StorageClass resource in k8s informer

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* [elastic-agent-autodiscover] jjbb: use fleet-ci (#27)

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.6

* [elastic-agent-autodiscover] Add util function to return pod labels

* [elastic-agent-autodiscover] Revert "Add util function to return pod labels"

This reverts commit c4a7baeca736128f2036eb2ee139864373c97740.

* [elastic-agent-autodiscover] Add util function to return pod labels

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.7

* [elastic-agent-autodiscover] Create add-issues-to-ingest-board.yml

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.8

* [elastic-agent-autodiscover] add namespace MetaGen to the generic Resource

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* [elastic-agent-autodiscover] clean up some local tests adjustments

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* [elastic-agent-autodiscover] remove comment

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.9

* [elastic-agent-autodiscover] [Automation] Update go release version to 1.18.10

* [elastic-agent-autodiscover] Update copyright year.

* [elastic-agent-autodiscover] golang: bump automation with updatecli and GH actions (#36)

* [elastic-agent-autodiscover] chore: Updated the content of the file "/var/folders/hn/j6gds1qx1f5by...

... sfn0qp0t03c0000gn/T/updatecli/github/elastic/elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/var/folders/hn/j6gds1qx1f5by...

... sfn0qp0t03c0000gn/T/updatecli/github/elastic/elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/var/folders/hn/j6gds1qx1f5by...

... sfn0qp0t03c0000gn/T/updatecli/github/elastic/elastic-agent-autodiscover/go.mod"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] Bump up containderd

* [elastic-agent-autodiscover] lint

* [elastic-agent-autodiscover] Update linter and libs

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] Add replicaset metaGenerator based on watcher

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Add job metaGenerator based on watcher

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] fix types

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Fix references of objects

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Fix resource name format

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Fix tests

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Adjust tests

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] fix docstrings

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Add Jobs tests

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Add rs tests

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Fix test

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Bump golang.org/x/net from 0.0.0-20220225172249-27dd8689420f to 0.7.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220225172249-27dd8689420f to 0.7.0.
- [Commits](https://github.com/golang/net/commits/v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* [elastic-agent-autodiscover] Update notice.

* [elastic-agent-autodiscover] Bump golang.org/x/crypto from 0.0.0-20210817164053-32db794688a5 to 0.1.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20210817164053-32db794688a5 to 0.1.0.
- [Commits](https://github.com/golang/crypto/commits/v0.1.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* [elastic-agent-autodiscover] Bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.12+incompatible to 20.10.24+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v20.10.12...v20.10.24)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* [elastic-agent-autodiscover] Update notice.

* [elastic-agent-autodiscover] Update notice.

* [elastic-agent-autodiscover] Bump github.com/docker/distribution

Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.0+incompatible to 2.8.2+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](https://github.com/docker/distribution/compare/v2.8.0...v2.8.2)

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* [elastic-agent-autodiscover] Update notice.

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] Initial backstage anc buildkite boilerplate

This commit adds the initial boilerplate for initializing the backstage
and buildkite resources.

Signed-off-by: Alexandros, Sapranidis <alexandros@elastic.co>

* [elastic-agent-autodiscover] Re order kubernetes node discovery

* [elastic-agent-autodiscover] Add a test and a note

* [elastic-agent-autodiscover] Update kubernetes/util_test.go

Co-authored-by: Chris Mark <chrismarkou92@gmail.com>

* [elastic-agent-autodiscover] Add changelog

* [elastic-agent-autodiscover] Updated protobuf to 1.29.1

* [elastic-agent-autodiscover] notice

* [elastic-agent-autodiscover] Update catalog-info.yaml

* [elastic-agent-autodiscover] migrate the jenkins pipeline to the Buildkite

* [elastic-agent-autodiscover] change the config of the pull-requiests.json

* [elastic-agent-autodiscover] empty commit for the trigger tests

* [elastic-agent-autodiscover] decrese the perfirmance of the k8s agents

* [elastic-agent-autodiscover] status messages to comments

* [elastic-agent-autodiscover] upgrade Go to 1.20.5

* [elastic-agent-autodiscover] Update .go-version

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/go.mod"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.golangci.yml"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /elastic-agent-autodiscover/.go-version"

Made with ❤️️ by updatecli

* [elastic-agent-autodiscover] increase Buildkite linux agent's memory (#57)

* [elastic-agent-autodiscover] [updatecli][githubrelease] Bump version to 1.20.7 (#56)

# [updatecli][githubrelease] Bump version to 1.20.7

## Report

	Source:
		✔ [gomod] Get version in go.mod format(shell)
		✔ [latestGoVersion] Get Latest Go Release(githubrelease)
		✔ [minor] Get minor version in .go-version(shell)

	Condition:
		✔ [dockerTag] Is docker image golang:1.20.7 published(dockerimage)
✔ [goDefaultVersion-check] Check if defined golang version
differs(shell)

	Target:
		⚠ [update-go-version] Update .go-version(file)
		⚠ [update-golang.ci] Update .golangci.yml(file)
		✔ [update-gomod] Update go.mod(file)

## Changelog

<details><summary>Click to expand</summary>

````

no GitHub Release found for go1.20.7 on "https://github.com/golang/go"

````

</details>

## Remark

This pull request was automatically created using
[Updatecli](https://www.updatecli.io).

Please report any issues with this tool
[here](https://github.com/updatecli/updatecli/issues/)

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] Delete all Jenkins resources and rather use buildkite (#58)

* [elastic-agent-autodiscover] Add development note (#59)

This PR adds a note on how to use the local dependency during the
development process.

* [elastic-agent-autodiscover] Bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 (#61)

Bumps
[github.com/cyphar/filepath-securejoin](https://github.com/cyphar/filepath-securejoin)
from 0.2.3 to 0.2.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/cyphar/filepath-securejoin/releases">github.com/cyphar/filepath-securejoin's
releases</a>.</em></p>
<blockquote>
<h2>v0.2.4</h2>
<p>This release fixes a potential security issue in filepath-securejoin
when used on Windows (GHSA-6xv5-86q9-7xr8, which could be used to
generate paths outside of the provided rootfs in certain cases), as well
as improving the overall behaviour of filepath-securejoin when dealing
with Windows paths that contain volume names. Thanks to Paulo Gomes for
discovering and fixing these issues.</p>
<p>In addition, we've switched (at long last) to GitHub Actions and have
continuous integration testing on Linux, MacOS, and Windows.</p>
<p>Thanks to the following contributors for making this release
possible:</p>
<ul>
<li>Aleksa Sarai <a
href="mailto:cyphar@cyphar.com">cyphar@cyphar.com</a></li>
<li>Paulo Gomes <a
href="mailto:pjbgf@linux.com">pjbgf@linux.com</a></li>
</ul>
<p>Signed-off-by: Aleksa Sarai <a
href="mailto:cyphar@cyphar.com">cyphar@cyphar.com</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/cyphar/filepath-securejoin/commit/2710d06c5b4ba3168beffa0689798d2db12e8ac4"><code>2710d06</code></a>
VERSION: release v0.2.4</li>
<li><a
href="https://github.com/cyphar/filepath-securejoin/commit/68943415e950190ee33bddfa205e42186da87802"><code>6894341</code></a>
merge <a
href="https://redirect.github.com/cyphar/filepath-securejoin/issues/9">#9</a>
into main</li>
<li><a
href="https://github.com/cyphar/filepath-securejoin/commit/c121231e1276e11049547bee5ce68d5a2cfe2d9b"><code>c121231</code></a>
Fix support for Windows</li>
<li><a
href="https://github.com/cyphar/filepath-securejoin/commit/05b64230154f962d518a3a44fcfd7b9b63bab031"><code>05b6423</code></a>
ci: switch to GHA</li>
<li><a
href="https://github.com/cyphar/filepath-securejoin/commit/64536a8a66ae59588c981e2199f1dcf410508e07"><code>64536a8</code></a>
VERSION: back to development</li>
<li>See full diff in <a
href="https://github.com/cyphar/filepath-securejoin/compare/v0.2.3...v0.2.4">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/cyphar/filepath-securejoin&package-manager=go_modules&previous-version=0.2.3&new-version=0.2.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/elastic/elastic-agent-autodiscover/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* [elastic-agent-autodiscover] Regex support for incuding labels and annotations in elastic-agent-autodiscovery library (#60)

This PR introduces the main functionality in order to support the regex expression for kubernetes provider as described here: https://github.com/elastic/elastic-agent/issues/3346

* [elastic-agent-autodiscover] Disable Deployment and Replicaset enrichment by default (#62)

Disabling AddResourceMetadataConfig.Deployment: false and
AddResourceMetadataConfig.Cronjob: false as per discussion here
https://github.com/elastic/elastic-agent-autodiscover/issues/31#issuecomment-1745057020

* [elastic-agent-autodiscover] Bump golang.org/x/net from 0.7.0 to 0.17.0 (#63)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to
0.17.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golang/net/commit/b225e7ca6dde1ef5a5ae5ce922861bda011cfabd"><code>b225e7c</code></a>
http2: limit maximum handler goroutines to MaxConcurrentStreams</li>
<li><a
href="https://github.com/golang/net/commit/88194ad8ab44a02ea952c169883c3f57db6cf9f4"><code>88194ad</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="https://github.com/golang/net/commit/2b60a61f1e4cf3a5ecded0bd7e77ea168289e6de"><code>2b60a61</code></a>
quic: fix several bugs in flow control accounting</li>
<li><a
href="https://github.com/golang/net/commit/73d82efb96cacc0c378bc150b56675fc191894b9"><code>73d82ef</code></a>
quic: handle DATA_BLOCKED frames</li>
<li><a
href="https://github.com/golang/net/commit/5d5a036a503f8accd748f7453c0162115187be13"><code>5d5a036</code></a>
quic: handle streams moving from the data queue to the meta queue</li>
<li><a
href="https://github.com/golang/net/commit/350aad2603e57013fafb1a9e2089a382fe67dc80"><code>350aad2</code></a>
quic: correctly extend peer's flow control window after MAX_DATA</li>
<li><a
href="https://github.com/golang/net/commit/21814e71db756f39b69fb1a3e06350fa555a79b1"><code>21814e7</code></a>
quic: validate connection id transport parameters</li>
<li><a
href="https://github.com/golang/net/commit/a600b3518eed7a9a4e24380b4b249cb986d9b64d"><code>a600b35</code></a>
quic: avoid redundant MAX_DATA updates</li>
<li><a
href="https://github.com/golang/net/commit/ea633599b58dc6a50d33c7f5438edfaa8bc313df"><code>ea63359</code></a>
http2: check stream body is present on read timeout</li>
<li><a
href="https://github.com/golang/net/commit/ddd8598e5694aa5e966e44573a53e895f6fa5eb2"><code>ddd8598</code></a>
quic: version negotiation</li>
<li>Additional commits viewable in <a
href="https://github.com/golang/net/compare/v0.7.0...v0.17.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/net&package-manager=go_modules&previous-version=0.7.0&new-version=0.17.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/elastic/elastic-agent-autodiscover/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* [elastic-agent-autodiscover] Bump github.com/docker/docker from 20.10.24+incompatible to 24.0.7+incompatible (#64)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from
20.10.24+incompatible to 24.0.7+incompatible.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/docker/releases">github.com/docker/docker's
releases</a>.</em></p>
<blockquote>
<h2>v24.0.7</h2>
<h2>24.0.7</h2>
<p>For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:</p>
<ul>
<li><a
href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.7">docker/cli,
24.0.7 milestone</a></li>
<li><a
href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.7">moby/moby,
24.0.7 milestone</a></li>
</ul>
<h3>Bug fixes and enhancements</h3>
<ul>
<li>Write overlay2 layer metadata atomically. <a
href="https://redirect.github.com/moby/moby/pull/46703">moby/moby#46703</a></li>
<li>Fix &quot;Rootful-in-Rootless&quot; Docker-in-Docker on systemd
version 250 and later. <a
href="https://redirect.github.com/moby/moby/pull/46626">moby/moby#46626</a></li>
<li>Fix <code>dockerd-rootless-setuptools.sh</code> when username
contains a backslash. <a
href="https://redirect.github.com/moby/moby/pull/46407">moby/moby#46407</a></li>
<li>Fix a bug that would prevent network sandboxes to be fully deleted
when stopping containers with no network attachments and when
<code>dockerd --bridge=none</code> is used. <a
href="https://redirect.github.com/moby/moby/pull/46702">moby/moby#46702</a></li>
<li>Fix a bug where cancelling an API request could interrupt container
restart. <a
href="https://redirect.github.com/moby/moby/pull/46697">moby/moby#46697</a></li>
<li>Fix an issue where containers would fail to start when providing
<code>--ip-range</code> with a range larger than the subnet. <a
href="https://redirect.github.com/docker/for-mac/issues/6870">docker/for-mac#6870</a></li>
<li>Fix data corruption with zstd output. <a
href="https://redirect.github.com/moby/moby/pull/46709">moby/moby#46709</a></li>
<li>Fix the conditions under which the container's MAC address is
applied. <a
href="https://redirect.github.com/moby/moby/pull/46478">moby/moby#46478</a></li>
<li>Improve the performance of the stats collector. <a
href="https://redirect.github.com/moby/moby/pull/46448">moby/moby#46448</a></li>
<li>Fix an issue with source policy rules ending up in the wrong order.
<a
href="https://redirect.github.com/moby/moby/pull/46441">moby/moby#46441</a></li>
</ul>
<h3>Packaging updates</h3>
<ul>
<li>Add support for Fedora 39 and Ubuntu 23.10. <a
href="https://redirect.github.com/docker/docker-ce-packaging/pull/940">docker/docker-ce-packaging#940</a>,
<a
href="https://redirect.github.com/docker/docker-ce-packaging/pull/955">docker/docker-ce-packaging#955</a></li>
<li>Fix <code>docker.socket</code> not getting disabled when
uninstalling the <code>docker-ce</code> RPM package. <a
href="https://redirect.github.com/docker/docker-ce-packaging/pull/852">docker/docker-ce-packaging#852</a></li>
<li>Upgrade Go to <code>go1.20.10</code>. <a
href="https://redirect.github.com/docker/docker-ce-packaging/pull/951">docker/docker-ce-packaging#951</a></li>
<li>Upgrade containerd to <code>v1.7.6</code> (static binaries only). <a
href="https://redirect.github.com/moby/moby/pull/46103">moby/moby#46103</a></li>
<li>Upgrade the <code>containerd.io</code> package to <a
href="https://github.com/containerd/containerd/releases/tag/v1.6.24"><code>v1.6.24</code></a>.</li>
</ul>
<h3>Security</h3>
<ul>
<li>Deny containers access to <code>/sys/devices/virtual/powercap</code>
by default. This change hardens against <a
href="https://scout.docker.com/v/CVE-2020-8694">CVE-2020-8694</a>, <a
href="https://scout.docker.com/v/CVE-2020-8695">CVE-2020-8695</a>, and
<a href="https://scout.docker.com/v/CVE-2020-12912">CVE-2020-12912</a>,
and an attack known as <a href="https://platypusattack.com/">the
PLATYPUS attack</a>. For more details, see <a
href="https://github.com/moby/moby/security/advisories/GHSA-jq35-85cj-fj4p">advisory</a>,
<a
href="https://github.com/moby/moby/commit/c9ccbfad11a60e703e91b6cca4f48927828c7e35">commit</a>.</li>
</ul>
<h2>v24.0.6</h2>
<h2>24.0.6</h2>
<p>For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:</p>
<ul>
<li><a
href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.6">docker/cli,
24.0.6 milestone</a></li>
<li><a
href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.6">moby/moby,
24.0.6 milestone</a></li>
</ul>
<h3>Bug fixes and enhancements</h3>
<ul>
<li>containerd storage backend: Fix <code>docker ps</code> failing when
a container image is no longer present in the content store. <a
href="https://redirect.github.com/moby/moby/pull/46095">moby/moby#46095</a></li>
<li>containerd storage backend: Fix <code>docker ps -s -a</code> and
<code>docker container prune</code> failing when a container image
config is no longer present in the content store. <a
href="https://redirect.github.com/moby/moby/pull/46097">moby/moby#46097</a></li>
<li>containerd storage backend: Fix <code>docker inspect</code> failing
when a container image config is no longer (or was never) present in the
content store. <a
href="https://redirect.github.com/moby/moby/pull/46244">moby/moby#46244</a></li>
<li>containerd storage backend: Fix diff and export with the
<code>overlayfs</code> snapshotter by using reference-counted rootfs
mounts. <a
href="https://redirect.github.com/moby/moby/pull/46266">moby/moby#46266</a></li>
<li>containerd storage backend: Fix a misleading error message when the
image platforms available locally do not match the desired platform. <a
href="https://redirect.github.com/moby/moby/pull/46300">moby/moby#46300</a></li>
<li>containerd storage backend: Fix the <code>FROM scratch</code>
Dockerfile instruction with the classic builder. <a
href="https://redirect.github.com/moby/moby/pull/46302">moby/moby#46302</a></li>
<li>containerd storage backend: Fix <code>mismatched image rootfs and
manifest layers</code> errors with the classic builder. <a
href="https://redirect.github.com/moby/moby/pull/46310">moby/moby#46310</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/moby/moby/commit/311b9ff0aa93aa55880e1e5f8871c4fb69583426"><code>311b9ff</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/46697">#46697</a>
from thaJeztah/24.0_backport_restart_nocancel</li>
<li><a
href="https://github.com/moby/moby/commit/af608045eef0b87f31a24d21fb7af80de76134aa"><code>af60804</code></a>
Merge pull request from GHSA-jq35-85cj-fj4p</li>
<li><a
href="https://github.com/moby/moby/commit/3cf363e1ee33fe00dbedfdb7d6caf299990d5568"><code>3cf363e</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/46709">#46709</a>
from thaJeztah/24.0_backport_bump_compress</li>
<li><a
href="https://github.com/moby/moby/commit/05d7386665793b7f8398eb80b4e85adff5486035"><code>05d7386</code></a>
daemon: daemon.containerRestart: don't cancel restart on context
cancel</li>
<li><a
href="https://github.com/moby/moby/commit/649c9440f28c7334ee5c9f17889448a81dcc8729"><code>649c944</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/46703">#46703</a>
from thaJeztah/24.0_backport_atomic-layer-data-write</li>
<li><a
href="https://github.com/moby/moby/commit/9b20b1a5fe0919a79cc15f6a3f331f2cdae0a37a"><code>9b20b1a</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/46702">#46702</a>
from thaJeztah/24.0_backport_releaseNetwork_Network...</li>
<li><a
href="https://github.com/moby/moby/commit/dd37b0b960ec4d3da0ca2efe78fa47484d4c6380"><code>dd37b0b</code></a>
vendor: github.com/klauspost/compress v1.17.2</li>
<li><a
href="https://github.com/moby/moby/commit/7058c0d24da8ac9267e52224b6a3beaa24ce5e9f"><code>7058c0d</code></a>
vendor: github.com/klauspost/compress v1.16.5</li>
<li><a
href="https://github.com/moby/moby/commit/57bd38858262922b86ceea37770536ff535fa2af"><code>57bd388</code></a>
daemon: overlay2: Write layer metadata atomically</li>
<li><a
href="https://github.com/moby/moby/commit/05d95fd5038a8a56ff69294a3bdd33b2d2769ba3"><code>05d95fd</code></a>
daemon: release sandbox even when NetworkDisabled</li>
<li>Additional commits viewable in <a
href="https://github.com/docker/docker/compare/v20.10.24...v24.0.7">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/docker/docker&package-manager=go_modules&previous-version=20.10.24+incompatible&new-version=24.0.7+incompatible)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/elastic/elastic-agent-autodiscover/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* [elastic-agent-autodiscover] enable auto-bump golang (#65)

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.20.10 (#66)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.20.10+label%3ACherryPickApproved)
for 1.20.10
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/6768260729

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.20.10&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.20.10</summary>
<pre>no GitHub Release found for go1.20.10 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.20.10&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.20.10</summary>
<pre>no GitHub Release found for go1.20.10 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.20.11 (#67)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.20.11+label%3ACherryPickApproved)
for 1.20.11
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/6836279610

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.20.11&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.20.11</summary>
<pre>no GitHub Release found for go1.20.11 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.20.11&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.20.11</summary>
<pre>no GitHub Release found for go1.20.11 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] Buidlkite: add macos (#68)

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.20.12 (#70)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.20.12+label%3ACherryPickApproved)
for 1.20.12
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/7153247505

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.20.12&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.20.12</summary>
<pre>no GitHub Release found for go1.20.12 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.20.12&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.20.12</summary>
<pre>no GitHub Release found for go1.20.12 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] Fix default resource metadata config (#72)

fix default metadata config: ensure that AddResourceMetadataConfig.Node
and AddResourceMetadataConfig.Namespace are different objects

Relates https://github.com/elastic/elastic-agent/issues/3636

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* [elastic-agent-autodiscover] Bump golang.org/x/crypto from 0.14.0 to 0.17.0 (#73)

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from
0.14.0 to 0.17.0.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/golang/crypto/commit/9d2ee975ef9fe627bf0a6f01c1f69e8ef1d4f05d"><code>9d2ee97</code></a>
ssh: implement strict KEX protocol changes</li>
<li><a
href="https://github.com/golang/crypto/commit/4e5a26183ecb4f9a0f85c8f8dbe7982885435436"><code>4e5a261</code></a>
ssh: close net.Conn on all NewServerConn errors</li>
<li><a
href="https://github.com/golang/crypto/commit/152cdb1503ebc13bc0fbb68f92ee189ebf9e3d00"><code>152cdb1</code></a>
x509roots/fallback: update bundle</li>
<li><a
href="https://github.com/golang/crypto/commit/fdfe1f8531a1adcc300c8eba98cb372044826d62"><code>fdfe1f8</code></a>
ssh: defer channel window adjustment</li>
<li><a
href="https://github.com/golang/crypto/commit/b8ffc16e10063067bac0e15c6d7f7995937503ce"><code>b8ffc16</code></a>
blake2b: drop Go 1.6, Go 1.8 compatibility</li>
<li><a
href="https://github.com/golang/crypto/commit/7e6fbd82c804e1760feb603fe21caecb0af0a124"><code>7e6fbd8</code></a>
ssh: wrap errors from client handshake</li>
<li><a
href="https://github.com/golang/crypto/commit/bda2f3f5cfce3f27039acccd823693f6d67c2a74"><code>bda2f3f</code></a>
argon2: avoid clobbering BP</li>
<li><a
href="https://github.com/golang/crypto/commit/325b735346247f48971d2b37d24dd180a35f391f"><code>325b735</code></a>
ssh/test: skip TestSSHCLIAuth on Windows</li>
<li><a
href="https://github.com/golang/crypto/commit/1eadac50a566dfaa1b603ca15e8ad3cbd1c77b20"><code>1eadac5</code></a>
go.mod: update golang.org/x dependencies</li>
<li><a
href="https://github.com/golang/crypto/commit/b2d7c26edb17864f117d8b0ee73c1843bcc6090f"><code>b2d7c26</code></a>
ssh: add (*Client).DialContext method</li>
<li>Additional commits viewable in <a
href="https://github.com/golang/crypto/compare/v0.14.0...v0.17.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/crypto&package-manager=go_modules&previous-version=0.14.0&new-version=0.17.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/elastic/elastic-agent-autodiscover/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* [elastic-agent-autodiscover] Update notice to 2024. (#74)

What the title says.

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.21.5 (#75)

# [updatecli] Bump Golang version to 1.21.5

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.21.5+label%3ACherryPickApproved)
for 1.21.5
Generated automatically with manual CLI

## Report

	Source:
		✔ [gomod] Get version in go.mod format(shell)
		✔ [latestGoVersion] Get Latest Go Release(githubrelease)
		✔ [minor] Get minor version in .go-version(shell)

	Condition:
		✔ [dockerTag] Is docker image golang:1.21.5 published(dockerimage)
✔ [goDefaultVersion-check] Check if defined golang version
differs(shell)

	Target:
		⚠ [update-go-version] Update .go-version(file)
		⚠ [update-golang.ci] Update .golangci.yml(file)
		⚠ [update-gomod] Update go.mod(file)

## Changelog

<details><summary>Click to expand</summary>

````
no GitHub Release found for go1.21.5 on "https://github.com/golang/go"

````

</details>

## Remark

This pull request was automatically created using
[Updatecli](https://www.updatecli.io).

Please report any issues with this tool
[here](https://github.com/updatecli/updatecli/issues/)

* [elastic-agent-autodiscover] Conditions on podupdater functions of kubernetes autodiscovery (#71)

- Enhancement

## Proposed commit message

- WHAT: Update the PodUpdater fucntion with additonal checks before
actaully triggering Pod watcher restarts
- WHY: There where node and namespace events that dont always inlcude
Metadata changes. We want only update events that change labels and
annotations of node and namespace to trigger pod updates. This leads to
bettwr management of watchers

## How to test this PR locally

See info https://github.com/elastic/beats/issues/37338

## Related issues

- Relates https://github.com/elastic/beats/issues/37338
- Relates https://github.com/elastic/beats/pull/37431

---------

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
Co-authored-by: Giuseppe Santoro <giuseppe.santoro@elastic.co>

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.21.6 (#76)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.21.6+label%3ACherryPickApproved)
for 1.21.6
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/7514558421

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.21.6&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.21.6</summary>
<pre>no GitHub Release found for go1.21.6 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.21.6&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.21.6</summary>
<pre>no GitHub Release found for go1.21.6 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.21.7 (#78)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.21.7+label%3ACherryPickApproved)
for 1.21.7
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/7857106506

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.21.7&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.21.7</summary>
<pre>no GitHub Release found for go1.21.7 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.21.7&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.21.7</summary>
<pre>no GitHub Release found for go1.21.7 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] Add method to return a watcher's event handler (#79)

This PR adds a method to kubernetes Watcher interface in order to return
the event handler of a watcher.

This is needed as part of refactoring of metadata enrichment
(https://github.com/elastic/beats/pull/37332).

* [elastic-agent-autodiscover] [updatecli] Bump Golang version to 1.21.8 (#82)

### What
Bump go release version with the latest release.

### Further details
See
[changelog](https://github.com/golang/go/issues?q=milestone%3AGo1.21.8+label%3ACherryPickApproved)
for 1.21.8
Generated automatically with
https://github.com/elastic/elastic-agent-autodiscover/actions/runs/8216870501

---

<Actions>
<action
id="901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24">
        <h3>Bump golang-version to latest version</h3>
<details
id="1c5f933144e2a3bfbf48011624489c4d9255a0bd4a33c7fd95834f7ffbdbf77a">
            <summary>Update .go-version</summary>
<p>1 file(s) updated with &#34;1.21.8&#34;:&#xA;&#x9;*
.go-version&#xA;</p>
            <details>
                <summary>1.21.8</summary>
<pre>no GitHub Release found for go1.21.8 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
<details
id="3b1d55e344f3f4bab100a1c68665344a238a102d31e80a9cc817751b6a853545">
            <summary>Update .golangci.yml</summary>
<p>1 file(s) updated with &#34;1.21.8&#34;:&#xA;&#x9;*
.golangci.yml&#xA;</p>
            <details>
                <summary>1.21.8</summary>
<pre>no GitHub Release found for go1.21.8 on
&#34;https://github.com/golang/go&#34;</pre>
            </details>
        </details>
    </action>
</Actions>

---

<table>
  <tr>
    <td width="77">
<img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli
logo" width="50" height="50">
    </td>
    <td>
      <p>
Created automatically by <a
href="https://www.updatecli.io/">Updatecli</a>
      </p>
      <details><summary>Options:</summary>
        <br />
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>
        <ul>
<li>If you close this pull request, Updatecli will automatically reopen
it, the next time it runs.</li>
<li>If you close this pull request and delete the base branch, Updatecli
will automatically recreate it, erasing all previous commits made.</li>
        </ul>
        <p>
Feel free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>
If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!
        </p>
      </details>
    </td>
  </tr>
</table>

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>

* [elastic-agent-autodiscover] security: add permissions block to workflows (#80)

## Details

⚠️ This PR was created by an automated tool. Please review the changes
carefully. ⚠️

We want to set the default permissions for workflows to read-only for
contents.
This is a security measure to prevent accidental changes to the
repository.

This change adds a top-level permissions block to all workflows in the
.github/workflows directory.
```yaml
permissions:
  contents: read
```

In some cases workflows might need more permissions than just `contents:
read`.
Please checkout this branch and add the necessary permissions to the
workflows.

If your workflow uses a Personal Access Token (PAT), we can still add
the permissions block,
   but it will not have any effect.

Merging this PR as is might cause workflows that need more permissions
to fail.

If there are any questions, please reach out to the
@elastic/observablt-ci

* [elastic-agent-autodiscover] Introduce checks for not supported annotations for Hints based autodiscover of Elastic Agent (#81)

This PR relates to https://github.com/elastic/elastic-agent/issues/3064
and provides the checks for the supported hints.

* [elastic-agent-autodiscover] Bump google.golang.org/protobuf from 1.29.1 to 1.33.0 (#84)

Bumps google.golang.org/protobuf from 1.29.1 to 1.33.0.

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=google.golang.org/protobuf&package-manager=go_modules&previous-version=1.29.1&new-version=1.33.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/elastic/elastic-agent-autodiscover/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* [elastic-agent-autodiscover] Bump github.com/docker/docker from 24.0.7+incompatible to 24.0.9+incompatible (#85)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from
24.0.7+incompatible to 24.0.9+incompatible.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/docker/releases">github.com/docker/docker's
releases</a>.</em></p>
<blockquote>
<h2>v24.0.9</h2>
<h2>24.0.9</h2>
<p>For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:</p>
<ul>
<li><a
href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.9">docker/cli,
24.0.9 milestone</a></li>
<li><a
href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.9">moby/moby,
24.0.9 milestone</a></li>
</ul>
<h2>Security</h2>
<p>This release contains security fixes for the following CVEs affecting
Docker Engine and its components.</p>
<table>
<thead>
<tr>
<th>CVE</th>
<th>Component</th>
<th>Fix version</th>
<th>Severity</th>
</tr>
</thead>
<tbody>
<tr>
<td><a
href="https://scout.docker.com/v/CVE-2024-21626">CVE-2024-21626</a></td>
<td>runc</td>
<td>1.1.12</td>
<td>High, CVSS 8.6</td>
</tr>
<tr>
<td><a
href="https://scout.docker.com/v/CVE-2024-24557">CVE-2024-24557</a></td>
<td>Docker Engine</td>
<td>24.0.9</td>
<td>Medium, CVSS 6.9</td>
</tr>
</tbody>
</table>
<blockquote>
<p><strong>Important</strong> ⚠️</p>
<p>Note that this release of Docker Engine doesn't include fixes for the
following known vulnerabilities in BuildKit:</p>
<ul>
<li><a
href="https://scout.docker.com/v/CVE-2024-23651">CVE-2024-23651</a></li>
<li><a
href="https://scout.docker.com/v/CVE-2024-23652">CVE-2024-23652</a></li>
<li><a
href="https://scout.docker.com/v/CVE-2024-23653">CVE-2024-23653</a></li>
<li><a
href="https://scout.docker.com/v/CVE-2024-23650">CVE-2024-23650</a></li>
</ul>
<p>To address these vulnerabilities, upgrade to <a
href="https://github.com/docker/docker/blob/HEAD/25.0.md#2502">Docker
Engine v25.0.2</a>.</p>
</blockquote>
<p>For more information about the security issues addressed in this
release, and the unaddressed vulnerabilities in BuildKit, refer to the
<a
href="https://www.docker.com/blog/docker-security-advisory-multiple-vulnerabilities-in-runc-buildkit-and-moby/">blog
post</a>. For details about each vulnerability, see the relevant
security advisory:</p>
<ul>
<li><a
href="https://github.com/opencontainers/runc/security/advisories/GHSA-xr7r-f8xq-vfvv">CVE-2024-21626</a></li>
<li><a
href="https://github.com/moby/moby/security/advisories/GHSA-xw73-rw38-6vjc">CVE-2024-24557</a></li>
</ul>
<h3>Packaging updates</h3>
<ul>
<li>Upgrade runc to <a
href="https://github.com/opencontainers/runc/releases/tag/v1.1.12">v1.1.12</a>.
<a
href="https://redirect.github.com/moby/moby/pull/47269">moby/moby#47269</a></li>
<li>Upgrade containerd to <a
href="https://github.com/containerd/containerd/releases/tag/v1.7.13">v1.7.13</a>
(static binaries only). <a
href="https://redirect.github.com/moby/moby/pull/47280">moby/moby#47280</a></li>
</ul>
<h2>v24.0.8</h2>
<h2>24.0.8</h2>
<p>For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:</p>
<ul>
<li><a
href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.8">docker/cli,
24.0.8 milestone</a></li>
<li><a
href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.8">moby/moby,
24.0.8 milestone</a></li>
</ul>
<h3>Bug fixes and enhancements</h3>
<ul>
<li>Live restore: Containers with auto remove (<code>docker run
--rm</code>) are no longer forcibly removed on engine restart. <a
href="https://redirect.github.com/moby/moby/pull/46869">moby/moby#46857</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/moby/moby/commit/fca702de7f71362c8d103073c7e4a1d0a467fadd"><code>fca702d</code></a>
Merge pull request from GHSA-xw73-rw38-6vjc</li>
<li><a
href="https://github.com/moby/moby/commit/f78a7726d747847e443a5a5a4b4ad8ab31d87d78"><code>f78a772</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/47281">#47281</a>
from thaJeztah/24.0_backport_bump_containerd_binary...</li>
<li><a
href="https://github.com/moby/moby/commit/61afffeeb3d4264db7a697ca8bd3d25824bee182"><code>61afffe</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/47270">#47270</a>
from thaJeztah/24.0_backport_bump_runc_binary_1.1.12</li>
<li><a
href="https://github.com/moby/moby/commit/b38e74c4e095d584e21576e9cc43a355446e5b71"><code>b38e74c</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/47276">#47276</a>
from thaJeztah/24.0_backport_bump_runc_1.1.12</li>
<li><a
href="https://github.com/moby/moby/commit/dac56638adccd215bae6cc23146f29e4697e1e98"><code>dac5663</code></a>
update containerd binary to v1.7.13</li>
<li><a
href="https://github.com/moby/moby/commit/20e1af361628a31afd1af58d25cd6ea4e495669f"><code>20e1af3</code></a>
vendor: github.com/opencontainers/runc v1.1.12</li>
<li><a
href="https://github.com/moby/moby/commit/858919d39968c687de3afb0a0a3a212d60ef2a99"><code>858919d</…
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 22, 2026
@mergify
mergify Bot requested review from a team as code owners July 22, 2026 13:39
@mergify mergify Bot added the backport label Jul 22, 2026
@mergify
mergify Bot requested review from a team as code owners July 22, 2026 13:39
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 22, 2026
@mergify
mergify Bot requested a review from a team as a code owner July 22, 2026 13:39
@mergify

mergify Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of cf032f4 has failed:

On branch mergify/bp/8.19/pr-51804
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit cf032f423.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/CODEOWNERS
	modified:   .github/dependabot.yml
	modified:   NOTICE.txt
	modified:   filebeat/autodiscover/builder/hints/logs.go
	modified:   filebeat/autodiscover/builder/hints/logs_test.go
	modified:   filebeat/tests/integration/translate_ldap_attribute_test.go
	modified:   go.mod
	modified:   go.sum
	modified:   heartbeat/autodiscover/builder/hints/monitors.go
	modified:   libbeat/autodiscover/appender.go
	modified:   libbeat/autodiscover/appender_test.go
	modified:   libbeat/autodiscover/appenders/config/config.go
	modified:   libbeat/autodiscover/appenders/config/config_test.go
	modified:   libbeat/autodiscover/autodiscover.go
	modified:   libbeat/autodiscover/autodiscover_test.go
	modified:   libbeat/autodiscover/builder.go
	modified:   libbeat/autodiscover/builder_test.go
	modified:   libbeat/autodiscover/eventselect.go
	modified:   libbeat/autodiscover/provider.go
	modified:   libbeat/autodiscover/providers/docker/config.go
	modified:   libbeat/autodiscover/providers/docker/docker.go
	modified:   libbeat/autodiscover/providers/docker/docker_integration_test.go
	modified:   libbeat/autodiscover/providers/docker/docker_test.go
	modified:   libbeat/autodiscover/providers/jolokia/discovery.go
	modified:   libbeat/autodiscover/providers/jolokia/jolokia.go
	modified:   libbeat/autodiscover/providers/kubernetes/config.go
	modified:   libbeat/autodiscover/providers/kubernetes/config_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/kubernetes.go
	modified:   libbeat/autodiscover/providers/kubernetes/node_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/pod.go
	modified:   libbeat/autodiscover/providers/kubernetes/pod_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/service.go
	modified:   libbeat/autodiscover/providers/kubernetes/service_test.go
	modified:   libbeat/autodiscover/template/config.go
	modified:   libbeat/autodiscover/template/config_test.go
	modified:   libbeat/processors/add_docker_metadata/add_docker_metadata.go
	modified:   libbeat/processors/add_docker_metadata/add_docker_metadata_integration_test.go
	modified:   libbeat/processors/add_docker_metadata/add_docker_metadata_test.go
	modified:   libbeat/processors/add_docker_metadata/config.go
	modified:   libbeat/processors/add_kubernetes_metadata/config.go
	modified:   libbeat/processors/add_kubernetes_metadata/indexers.go
	modified:   libbeat/processors/add_kubernetes_metadata/indexers_test.go
	modified:   libbeat/tests/compose/wrapper.go
	modified:   libbeat/tests/docker/docker.go
	modified:   metricbeat/autodiscover/appender/kubernetes/token/token.go
	modified:   metricbeat/autodiscover/appender/kubernetes/token/token_test.go
	modified:   metricbeat/autodiscover/builder/hints/metrics.go
	modified:   metricbeat/autodiscover/builder/hints/metrics_test.go
	modified:   metricbeat/module/docker/container/data.go
	modified:   metricbeat/module/docker/docker.go
	modified:   metricbeat/module/docker/event/event_integration_test.go
	modified:   metricbeat/module/docker/helper.go
	modified:   metricbeat/module/docker/helper_test.go
	modified:   metricbeat/module/docker/image/data.go
	modified:   metricbeat/module/kubernetes/event/config.go
	modified:   metricbeat/module/kubernetes/event/event.go
	modified:   metricbeat/module/kubernetes/util/kubernetes.go
	modified:   metricbeat/module/kubernetes/util/kubernetes_test.go
	new file:   pkg/autodiscover/bus/bus.go
	new file:   pkg/autodiscover/bus/bus_test.go
	new file:   pkg/autodiscover/docker/client.go
	new file:   pkg/autodiscover/docker/client_test.go
	new file:   pkg/autodiscover/docker/helpers.go
	new file:   pkg/autodiscover/docker/watcher.go
	new file:   pkg/autodiscover/docker/watcher_test.go
	new file:   pkg/autodiscover/kubernetes/eventhandler.go
	new file:   pkg/autodiscover/kubernetes/informer.go
	new file:   pkg/autodiscover/kubernetes/k8skeystore/kubernetes_keystore.go
	new file:   pkg/autodiscover/kubernetes/k8skeystore/kubernetes_keystore_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/config.go
	new file:   pkg/autodiscover/kubernetes/metadata/job.go
	new file:   pkg/autodiscover/kubernetes/metadata/job_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/metadata.go
	new file:   pkg/autodiscover/kubernetes/metadata/namespace.go
	new file:   pkg/autodiscover/kubernetes/metadata/namespace_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/node.go
	new file:   pkg/autodiscover/kubernetes/metadata/node_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/pod.go
	new file:   pkg/autodiscover/kubernetes/metadata/pod_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/replicaset.go
	new file:   pkg/autodiscover/kubernetes/metadata/replicaset_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/resource.go
	new file:   pkg/autodiscover/kubernetes/metadata/resource_test.go
	new file:   pkg/autodiscover/kubernetes/metadata/service.go
	new file:   pkg/autodiscover/kubernetes/metadata/service_test.go
	new file:   pkg/autodiscover/kubernetes/options.go
	new file:   pkg/autodiscover/kubernetes/types.go
	new file:   pkg/autodiscover/kubernetes/util.go
	new file:   pkg/autodiscover/kubernetes/util_test.go
	new file:   pkg/autodiscover/kubernetes/watcher.go
	new file:   pkg/autodiscover/kubernetes/watcher_test.go
	new file:   pkg/autodiscover/utils/hints.go
	new file:   pkg/autodiscover/utils/hints_test.go
	new file:   pkg/autodiscover/utils/key.go
	modified:   x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go
	modified:   x-pack/filebeat/input/streaming/config.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/elb/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/test/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/nomad/nomad.go
	modified:   x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go
	modified:   x-pack/metricbeat/module/awsfargate/task_stats/container.go
	modified:   x-pack/winlogbeat/module/testing.go
	modified:   x-pack/winlogbeat/module/wintest/docker_test.go
	modified:   x-pack/winlogbeat/module/wintest/simulate_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   filebeat/tests/integration/autodiscover_test.go
	both modified:   heartbeat/autodiscover/builder/hints/monitors_test.go
	both modified:   libbeat/autodiscover/providers/kubernetes/node.go
	both modified:   libbeat/processors/add_kubernetes_metadata/kubernetes.go
	deleted by us:   x-pack/osquerybeat/ext/osquery-extension/pkg/encoding/encoding_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify
mergify Bot requested review from leehinman, lorienhu, orestisfl and samuelvl and removed request for a team July 22, 2026 13:39
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 22, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /test : Run the Buildkite pipeline.

@github-actions github-actions Bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Jul 22, 2026
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 22, 2026
@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant