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

Override and pass in additional grafana agent config keys #161

Merged
merged 1 commit into from
Sep 13, 2022

Conversation

patmaddox
Copy link
Contributor

#159 was missing a commit that we had on a different branch when testing. Sorry for not being more careful there.

This permits template_file to be overridden, and for additional variables to be passed through to the template file.

Change description

The config currently passes an explicit list of keys to grafana agent config. Any keys not in that list will not get sent.

This change allows us to send additional grafana agent config keys that will be passed through to the template file.

It's necessary to enable the functionality of #159 - without it, a template_file config won't get passed to the grafana agent config.

Checklist

We have deployed this branch to production and confirmed that it fixes the problem described above.

  • I have added unit tests to cover my changes.
  • I have added documentation to cover my changes.
  • My changes have passed unit tests and have been tested E2E in an example project.

This permits template_file to be overridden, and for additional
variables to be passed through to the template file.
@patmaddox
Copy link
Contributor Author

@akoutmos what can I do to help get this merged?

@akoutmos
Copy link
Owner

Sorry about that @patmaddox. Totally forgot about this one! Looks good to me. Will merge once CI passes!

@coveralls
Copy link

coveralls commented Sep 13, 2022

Coverage Status

Coverage remained the same at 79.297% when pulling d9fb823 on patmaddox:override-and-add-agent-config into 859cecd on akoutmos:master.

@akoutmos akoutmos merged commit c2e0924 into akoutmos:master Sep 13, 2022
@patmaddox patmaddox deleted the override-and-add-agent-config branch September 16, 2022 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants