[target-allocator] Fix bug found when using relabel-config filterStrategy with serviceMonitors #1232
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
moh-osman3
force-pushed
the
mohosman/issue-1231/servicemonitors-relabel-filter
branch
from
5577956 to
aa8201e
Compare
secustor
reviewed
Nov 9, 2022
moh-osman3
force-pushed
the
mohosman/issue-1231/servicemonitors-relabel-filter
branch
from
2e57707 to
08a34e6
Compare
jaronoff97
reviewed
Nov 14, 2022
Comment on lines
92
to
103
| func (tf *RelabelConfigTargetFilter) replaceRelabelConfig(cfg []*relabel.Config) []*relabel.Config { | ||
| outCfg := make([]*relabel.Config, len(cfg)) | ||
| out, err := yaml2.Marshal(cfg) | ||
| if err != nil { | ||
| tf.log.V(2).Info("Error Marshaling", "error", err) | ||
| return cfg | ||
| } | ||
|
|
||
| byteArr := replaceShard([]byte(out)) | ||
| err = yaml2.Unmarshal(byteArr, &outCfg) | ||
| if err != nil { | ||
| tf.log.Info("Error Unmarshalling", "error", err) | ||
| return cfg | ||
| } | ||
|
|
||
| return outCfg | ||
| } | ||
|
|
There was a problem hiding this comment.
rather than marshaling and then unmarshaling, it's probably more efficient to just iterate through the relabel config list and do the replacement.
There was a problem hiding this comment.
Thanks for the review! Changed according to this suggestion.
| // See this thread [https://github.com/open-telemetry/opentelemetry-operator/pull/1124/files#r983145795] | ||
| // for why SHARD == 0 is a necessary substitution. Otherwise the keep action that uses this env variable, | ||
| // would not match the regex and all targets end up dropped. | ||
| shard := "0" |
There was a problem hiding this comment.
nit: also should include that shard will always be 0 here, and it doesn't make sense to read the SHARD from the environment.
moh-osman3
force-pushed
the
mohosman/issue-1231/servicemonitors-relabel-filter
branch
from
cdccb88 to
e993c52
Compare
moh-osman3
requested review from
jaronoff97 and
secustor
and removed request for
jaronoff97
secustor
approved these changes
Nov 17, 2022
moh-osman3
force-pushed
the
mohosman/issue-1231/servicemonitors-relabel-filter
branch
from
e993c52 to
2554098
Compare
|
@jaronoff97 can this be merged? |
jaronoff97
approved these changes
Nov 21, 2022
There was a problem hiding this comment.
@pavolloffay once the conflicts are fixed, this should be good to go! (cc @moh-osman3)
moh-osman3
force-pushed
the
mohosman/issue-1231/servicemonitors-relabel-filter
branch
from
2554098 to
52cfabc
Compare
Just finished resolving merge conflicts and retested in my cluster! Thanks for the review y'all! |
pavolloffay
approved these changes
Nov 22, 2022
6 tasks
ItielOlenick
pushed a commit
to ItielOlenick/opentelemetry-operator
that referenced
this pull request
May 1, 2024
…tegy with serviceMonitors (open-telemetry#1232) * env variable substitution for * remove unnessary env variable lookup and gofmt * fix linter issues * addressing review feedback * add to unit test * addressing feedback * change go.mod to use later version of prometheus * run gofmt * rebasing go.mod and running go mod tidy
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.
Resolves #1231
Also adds to go.mod
to use the latest version of prometheus. This should avoid other dependencies bringing in older versions of prometheus, which is missing a relabel method I'm using.