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

Mongo & Elasticsearch: extend config templates with more options #424

Merged
merged 2 commits into from May 3, 2017

Conversation

Projects
None yet
2 participants
@gkze
Copy link
Contributor

gkze commented Apr 7, 2017

We need these options in production and are currently overriding the config. We'd like to have these available to configure.

gkze
@olivielpeau
Copy link
Member

olivielpeau left a comment

Thanks @gkze for your contribution!

There's an issue with the indentation of the options you added, could you fix it?

@@ -7,6 +7,9 @@ instances:
<% unless i["pshard_stats"].nil? %>
pshard_stats: <%= i["pshard_stats"] %>
<% end %>
<% unless i["cluster_stats"].nil? %>
cluster_stats: <%= i["cluster_stats"] %>

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Apr 10, 2017

Member

the indentation is not correct here: cluster_stats needs to have the same indentation as the other parameters. Could you correct it?

(same comment for the ssl options of mongo.yaml.erb)

@olivielpeau olivielpeau added the feature label Apr 10, 2017

gkze
@gkze

This comment has been minimized.

Copy link
Contributor Author

gkze commented Apr 11, 2017

Good catch @olivielpeau, thank you. Corrected.

@olivielpeau
Copy link
Member

olivielpeau left a comment

Thanks @gkze! Looks good now 👌

The CI failures are unrelated to your changes, I'll try to find some time to fix them first and then merge your PR

@olivielpeau olivielpeau added this to the 2.10.0 milestone Apr 20, 2017

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented May 3, 2017

For some reason I can't make the CI to re-run against a merge of this PR into the current state of master, so the build still fails.

Merging this, I'll check that the resulting CI build on master is successful.

Thanks @gkze!

@olivielpeau olivielpeau merged commit f9e6d61 into DataDog:master May 3, 2017

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
@gkze

This comment has been minimized.

Copy link
Contributor Author

gkze commented May 3, 2017

Thank you @olivielpeau 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.