Fix metrics sourcetype annotation #1375
Open
+51
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml
Outdated
Show resolved
Hide resolved
jvoravong
reviewed
Oct 14, 2024
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Fixed updating metrics' sourcetype with annotations | ||
| # One or more tracking issues related to the change | ||
| issues: [] |
There was a problem hiding this comment.
Suggested change
| issues: [] | |
| issues: [1375] |
jvoravong
reviewed
Oct 14, 2024
| @@ -563,7 +563,7 @@ Manage Splunk OTel Collector Logging with these supported annotations. | |||
| * Filter logs using pod and/or namespace annotation | |||
| * If `logsCollection.containers.useSplunkIncludeAnnotation` is `false` (default: false), set `splunk.com/exclude` annotation to `true` on pod and/or namespace to exclude its logs from ingested. | |||
| * If `logsCollection.containers.useSplunkIncludeAnnotation` is `true` (default: false), set `splunk.com/include` annotation to `true` on pod and/or namespace to only include its logs from ingested. All other logs will be ignored. | |||
| * Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME`. | |||
| * Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME` for logs and defaults to "httpevent" for metrics. | |||
There was a problem hiding this comment.
Nit: I might suggest updating this to something like this.
Suggested change
| * Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. If not set, it is dynamically generated to be `kube:container:CONTAINER_NAME` for logs and defaults to "httpevent" for metrics. | |
| * Use `splunk.com/sourcetype` annotation on pod to overwrite `sourcetype` field. | |
| * For logs, if not set, it defaults to `kube:container:CONTAINER_NAME`. | |
| * For metrics, if not set, it defaults to `httpevent`. |
jvoravong
reviewed
Oct 14, 2024
| password=setup["splunk_password"]) | ||
| logger.info("Splunk received %s events in the last minute", | ||
| len(events)) | ||
| assert len(events) >= expected |
There was a problem hiding this comment.
This test is failing in CI/CD still, see what you can do about it.
- You might need to add the
splunk.com/sourcetype: "sourcetype-anno"annotation right below here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description: Fixed updating metrics' sourcetype with annotations
Link to Splunk idea:
Testing: Added a new unit test
Documentation: Added
splunk.com/metricsSourceTypetoadvanced-configuration.md