Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default resource metadata config #72

Conversation

tetianakravchenko
Copy link
Contributor

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

Relates elastic/elastic-agent#3636

…de and AddResourceMetadataConfig.Namespace are different objects

Signed-off-by: Tetiana Kravchenko <[email protected]>
@tetianakravchenko tetianakravchenko requested a review from a team as a code owner December 19, 2023 08:49
@tetianakravchenko tetianakravchenko requested review from rdner, fearful-symmetry and gizas and removed request for a team December 19, 2023 08:49
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

@tetianakravchenko tetianakravchenko merged commit 445c44d into elastic:main Dec 20, 2023
3 checks passed
tetianakravchenko added a commit to elastic/beats that referenced this pull request Dec 27, 2023
…init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
mergify bot pushed a commit to elastic/beats that referenced this pull request Dec 27, 2023
…init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 8c4a40f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
mergify bot pushed a commit to elastic/beats that referenced this pull request Dec 27, 2023
…init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 8c4a40f)

# Conflicts:
#	go.sum
tetianakravchenko added a commit to elastic/beats that referenced this pull request Dec 28, 2023
…; use InitDefaults() to init default configuration (#37512)

* Upgrade elastic-agent-autodiscover dependency; use InitDefaults() to init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 8c4a40f)

# Conflicts:
#	go.sum

* fix merge conflicts

Signed-off-by: Tetiana Kravchenko <[email protected]>

* Revert "fix merge conflicts"

This reverts commit 88c08fc.

* fix conflicts only in the go.sum

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
Co-authored-by: Tetiana Kravchenko <[email protected]>
tetianakravchenko added a commit to elastic/beats that referenced this pull request Jan 2, 2024
…; use InitDefaults() to init default configuration (#37511)

* Upgrade elastic-agent-autodiscover dependency; use InitDefaults() to init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 8c4a40f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

* fix conflicts

Signed-off-by: Tetiana Kravchenko <[email protected]>

* update indirect dependencies

Signed-off-by: Tetiana Kravchenko <[email protected]>

* Revert "update indirect dependencies"

This reverts commit 7cd0de8.

* revert accidently removed garble_macho_executable binary

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
Co-authored-by: Tetiana Kravchenko <[email protected]>
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
…init default configuration (elastic#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants