add more complete river identifier validation and sanitization #4998
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
Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
rfratto
reviewed
Aug 29, 2023
Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
rfratto
approved these changes
Aug 30, 2023
erikbaranowski
added a commit
that referenced
this pull request
Sep 6, 2023
* use river functions to validate and sanitize river identifiers Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> (cherry picked from commit ce3fe1c) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
erikbaranowski
added a commit
that referenced
this pull request
Sep 6, 2023
* add tracking and comparison of latest healthy content before loading a module (#5054) * add tracking and comparison of latest healthy content before loading a module * add tracking and check for arguments in module loaders Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> (cherry picked from commit 597bb6b) * add changelog version header Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * fix(http): allow override default user-agent header for http.remote (#5059) (cherry picked from commit 1eb5817) * fix(agentctl): prevent panic when validating integration-included cfg file (#5070) * fix(agentctl): prevent panic when validating integration-included cfg file Also add unit tests to prevent regression * doc(changelog): add new BUGFIXES entry (cherry picked from commit acc06f6) * loki.process: fix deadlock in case of frequent updates (#5065) Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> (cherry picked from commit 501cf69) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * loki.process: make deadlock test condition less sensitive (#5096) Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> (cherry picked from commit 7b15144) * integrations/eventhandler: remove double-logging of events (#5100) This removes the info-level log line indicating that an event is logged. When agent logs are being collected, this makes the event appear as if it was double-collected, as the event appears both in the logs sent directly to Loki and in the agent logs. (cherry picked from commit 276355e) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * Operator: update default reloader version * misc: use github.com/grafana/river (#4949) (cherry picked from commit 9a12485) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * add more complete river identifier validation and sanitization (#4998) * use river functions to validate and sanitize river identifiers Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> (cherry picked from commit ce3fe1c) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * Converter fix identifiers (#5102) * catch some places missing river label sanitization Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> (cherry picked from commit 6991ff2) Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * refactor promtail converter sd configs so they reuse prometheus conve… (#5069) * refactor promtail converter sd configs so they reuse prometheus converter functionality Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * cleanup words Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * unexport a bunch of stuff that isn't needed outside the prometheusconvert package Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * don't do SD targets in backwards order during converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * get rid of static SD boilerplate --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Co-authored-by: Piotr Gwizdala <17101802+thampiotr@users.noreply.github.com> (cherry picked from commit 89b334e) * update test for older go version ordering Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> * Add a couple more unsupported fields to the prometheus converter Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --------- Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com> Co-authored-by: Đỗ Trọng Hải <41283691+hainenber@users.noreply.github.com> Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com> Co-authored-by: Robert Fratto <robertfratto@gmail.com> Co-authored-by: Craig Peterson <192540+captncraig@users.noreply.github.com>
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR Description
Which issue(s) this PR fixes
Notes to the Reviewer
PR Checklist