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

Add flag for environment vars substitution in config file #796

Merged
merged 1 commit into from
Jun 25, 2021

Conversation

Ashmita152
Copy link
Contributor

Setting default value to false to keep backward compatibility

Signed-off-by: Ashmita Bohara ashmita.bohara152@gmail.com

What this PR does:

Which issue(s) this PR fixes:
Fixes #788

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@CLAassistant
Copy link

CLAassistant commented Jun 25, 2021

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

Thanks for working on this one @Ashmita152! 🚀 I've left a few comments.

docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
cmd/tempo/main.go Outdated Show resolved Hide resolved
cmd/tempo/main.go Outdated Show resolved Hide resolved
Setting default value to false to keep backward compatibility

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @Ashmita152!

Copy link
Member

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the contribution!

@annanay25 annanay25 merged commit ae81eca into grafana:main Jun 25, 2021
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.

Support environment variable expansion in config file
4 participants