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

Add bundled discovery configs to default config.d for rpm and deb packages #3311

Merged
merged 6 commits into from
Jun 28, 2023

Conversation

rmfitzpatrick
Copy link
Contributor

These changes include updated, commented-out discovery configs to the default /etc/otel/collector/config.d directory for rpm and deb packages. They also include updates to the commented header and integration tests for basic discovery mode validation. These tests aren't going to be included in CI out of the gate, but that's my intention in the near future.

cc @aunshc @theletterf

@rmfitzpatrick rmfitzpatrick requested review from a team as code owners June 23, 2023 21:30
@rmfitzpatrick rmfitzpatrick marked this pull request as draft June 23, 2023 21:31
@@ -0,0 +1,18 @@
# Copy this file to properties.discovery.yaml and add your uncommented discovery properties for use in discovery mode:
# For more information:
# https://github.com/signalfx/splunk-otel-collector/tree/main/internal/confmapprovider/discovery#discovery-properties
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we'll want to link to the official docs after launch, although this one is technical enough to perhaps not require it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can update the headers w/ prod links when the docs are released.

Copy link
Contributor

@jeffreyc-splunk jeffreyc-splunk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The packaging changes LGTM.

@rmfitzpatrick
Copy link
Contributor Author

I will move this to ready once #3321 lands and I update the config.d header language based on feedback from Aunsh.

@rmfitzpatrick rmfitzpatrick marked this pull request as ready for review June 27, 2023 18:51
@rmfitzpatrick rmfitzpatrick merged commit 01b4b7f into main Jun 28, 2023
126 checks passed
@delete-merged-branch delete-merged-branch bot deleted the debconfigd branch June 28, 2023 15:10
@github-actions github-actions bot mentioned this pull request Jul 1, 2024
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.

5 participants