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

Rename global "labels" config option to "external_labels". #1129

Merged
merged 1 commit into from
Sep 30, 2015

Conversation

juliusv
Copy link
Member

@juliusv juliusv commented Sep 29, 2015

No description provided.

@brian-brazil
Copy link
Contributor

👍

@@ -206,6 +206,10 @@ func reloadConfig(filename string, rls ...Reloadable) (success bool) {
conf, err := config.LoadFile(filename)
if err != nil {
log.Errorf("Couldn't load configuration (-config.file=%s): %v", filename, err)
// TODO(julius): Remove this notice when releasing 0.17.0 or 0.18.0.
if err.Error() == "unknown fields in global config: labels" {
log.Errorf("NOTE: The 'labels' setting in the global configuration section has been renamed to 'external_labels'. Please update your configuration file accordingly.")
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be worth explaining that the semantics have changed as well and that external_labels don't get attached to time series anymore.

Copy link
Member Author

Choose a reason for hiding this comment

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

Addressed that. I didn't link to the specific release in the CHANGELOG.md, as we are removing RC changelog entries after a final release and thus the link would break with 0.16.0.

@juliusv juliusv force-pushed the rename-global-labels branch from ff4e665 to 61eb33f Compare September 29, 2015 18:52
@juliusv juliusv force-pushed the rename-global-labels branch from 61eb33f to dac26ce Compare September 29, 2015 18:54
@grobie
Copy link
Member

grobie commented Sep 29, 2015

👍

1 similar comment
@fabxc
Copy link
Contributor

fabxc commented Sep 30, 2015

👍

juliusv added a commit that referenced this pull request Sep 30, 2015
Rename global "labels" config option to "external_labels".
@juliusv juliusv merged commit db382b4 into master Sep 30, 2015
@juliusv juliusv deleted the rename-global-labels branch September 30, 2015 09:53
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.

4 participants