Converter static v2 3rd set of integrations #5698
Merged
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 <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
erikbaranowski
commented
Nov 2, 2023
| @@ -18,7 +20,7 @@ var DefaultConfig = Config{ | |||
| type Config struct { | |||
| BlackboxConfigFile string `yaml:"config_file,omitempty"` | |||
| BlackboxTargets []blackbox_exporter.BlackboxTarget `yaml:"blackbox_targets"` | |||
| BlackboxConfig blackbox_config.Config `yaml:"blackbox_config,omitempty"` | |||
| BlackboxConfig util.RawYAML `yaml:"blackbox_config,omitempty"` | |||
There was a problem hiding this comment.
the changes in this file match the changes we already did the integrations v1 to enable to converters to pass the raw yaml to the river output
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
Signed-off-by: erikbaranowski <[email protected]>
erikbaranowski
commented
Nov 3, 2023
| @@ -235,11 +285,10 @@ func (b *IntegrationsConfigBuilder) appendExporterV2(commonConfig *common_v2.Met | |||
| commonConfig.ApplyDefaults(b.cfg.Integrations.ConfigV2.Metrics.Autoscrape) | |||
| scrapeConfig := prom_config.DefaultScrapeConfig | |||
| scrapeConfig.JobName = b.formatJobName(name, commonConfig.InstanceKey) | |||
| scrapeConfig.RelabelConfigs = commonConfig.Autoscrape.RelabelConfigs | |||
| scrapeConfig.RelabelConfigs = append(commonConfig.Autoscrape.RelabelConfigs, relabelConfigs...) | |||
There was a problem hiding this comment.
this fixed a potential bug where I was overwriting the value instead of appending.
thampiotr
approved these changes
Nov 6, 2023
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
This accounts for the remaining integrations from v1 that also exist in v2. There are still some integrations exclusive to v2 that need to be wired up.
Which issue(s) this PR fixes
Notes to the Reviewer
PR Checklist