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

Move "beat" (ex-"shipper") config settings to be top level #1570

Merged
merged 2 commits into from
May 9, 2016

Conversation

tsg
Copy link
Contributor

@tsg tsg commented May 4, 2016

Part of #1417. Done in a non-BWC way, because I think it's not worth
complicating the code. I'd rather have a script that migrates the
configuration.

@tsg tsg mentioned this pull request May 4, 2016
14 tasks
# The tags of the shipper are included in their own field with each
# transaction published. Tags make it easy to group servers by different
# logical properties.
#tags: ["service-X", "web-tier"]
Copy link
Member

Choose a reason for hiding this comment

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

@urso @andrewkroh I remember we discussed once if we should perhaps move these unter a "meta" namespace. Now that we break BC anyways? But not 100% convinced we should do it.

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 think we introduced them in 5.0-alpha1, so it wouldn't even be a real BWC change.

Copy link
Member

Choose a reason for hiding this comment

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

In case we also use filebeat.prospector.0.meta.fields it would be. But it makes path even longer.

Side note: How nice is the above that I can write a config example in one line :-)

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 see, if we do it everywhere, yes. To me, it's not worth making these config paths longer, especially since we just add "meta", which is everyone's guess what it means :)

Copy link
Member

Choose a reason for hiding this comment

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

Lets just keep it as it is.

@ruflin
Copy link
Member

ruflin commented May 4, 2016

LGTM. See comments.

@tsg
Copy link
Contributor Author

tsg commented May 4, 2016

@ruflin i rebased on top of master. There's still a change in the topbeat template, but not mertricbeat.

@urso
Copy link

urso commented May 4, 2016

LGTM

@ruflin
Copy link
Member

ruflin commented May 6, 2016

@tsg I suggest to remove geoip as part of a second PR because then we have a specific commit / pr we can reference to for the BC break.

I restarted the appveyor build but the failing could be related to this change ...

Part of elastic#1417. Done in a non-BWC way, because I think it's not worth
complicating the code. I'd rather have a script that migrates the
configuration.
@tsg tsg force-pushed the config_move_beat_to_toplevel branch 2 times, most recently from 6aeb2b5 to d1274a2 Compare May 9, 2016 10:38
The list has grown quite long, switching to ucfg validation for this would be nice.
Also added explicit key names to config.
@tsg tsg force-pushed the config_move_beat_to_toplevel branch from d1274a2 to 845cd14 Compare May 9, 2016 10:59
@tsg
Copy link
Contributor Author

tsg commented May 9, 2016

This should be ready for merging.

@ruflin ruflin merged commit d51884b into elastic:master May 9, 2016
@tsg tsg deleted the config_move_beat_to_toplevel branch August 25, 2016 10:34
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