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

Fix an issue with the static to flow converter for blackbox exporter … #5476

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

erikbaranowski
Copy link
Contributor

…modules

config not being included in the river output.

PR Description

Which issue(s) this PR fixes

Fixes #5451

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added
  • Tests updated
  • Config converters updated

…modules

  config not being included in the river output.

Signed-off-by: erikbaranowski <[email protected]>

func TestUnmarshalRiverWithInlineConfigYaml(t *testing.T) {
riverCfg := `
config = "modules:\n http_2xx:\n prober: http\n timeout: 5s\n"
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 decided to include this similar test since it validates and demonstrates the traditional yaml format in use for this argument.

@erikbaranowski erikbaranowski marked this pull request as ready for review October 13, 2023 19:42
@erikbaranowski erikbaranowski requested review from a team as code owners October 13, 2023 19:42
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

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

LGTM!

ProbeTimeoutOffset float64 `yaml:"probe_timeout_offset,omitempty"`
BlackboxConfigFile string `yaml:"config_file,omitempty"`
BlackboxTargets []BlackboxTarget `yaml:"blackbox_targets"`
BlackboxConfig util.RawYAML `yaml:"blackbox_config,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

As an aside:

This would normally be the kind of thing which would be a breaking change to the code API. To me, that's re-enforcing the idea of putting everything in internal/ for 1.0 until we're ready to pick a subset of packages to expose.

@erikbaranowski erikbaranowski merged commit 04b90c6 into main Oct 13, 2023
@erikbaranowski erikbaranowski deleted the converter-blackbox-config-fix branch October 13, 2023 20:21
tpaschalis pushed a commit to tpaschalis/agent that referenced this pull request Oct 16, 2023
…modules (grafana#5476)

config not being included in the river output.

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit 04b90c6)
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Static Mode to Flow Configuration Converter - Blackbox Integration is missing Modules in Conversion Output.
2 participants