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 additional settings to GELF output #1337

Merged
merged 5 commits into from Aug 6, 2015
Merged

Add additional settings to GELF output #1337

merged 5 commits into from Aug 6, 2015

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Aug 4, 2015

This PR adds additional (optional) settings supported by gelfclient 1.3.0 like TCP keep alive to the GELF output.

@joschi joschi added this to the 1.2.0 milestone Aug 4, 2015
@bernd
Copy link
Member

@bernd bernd commented Aug 5, 2015

Can you also add the TLS settings? See #979

@joschi
Copy link
Contributor Author

@joschi joschi commented Aug 5, 2015

Can you also add the TLS settings?

I thought about adding those but it would require placing the trust certificate chain file on each node of a Graylog cluster for which we don't have a convincing story yet – except for the users to copy that file manually/via their configuration management solution. So I decided to leave TLS support out for now.

@bernd bernd self-assigned this Aug 6, 2015
Jochen Schalanda added 2 commits Aug 6, 2015
@bernd
Copy link
Member

@bernd bernd commented Aug 6, 2015

LGTM 👍 Thanks for the updates!

bernd added a commit that referenced this pull request Aug 6, 2015
Add additional settings to GELF output
@bernd bernd merged commit 19f65d0 into master Aug 6, 2015
2 checks passed
2 checks passed
ci Jenkins build graylog2-server-integration-pr 108 has succeeded
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@bernd bernd deleted the gelfclient branch Aug 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants