[service_discovery] enabling service discovery via named pipe. #113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[service_discovery] fixing configuration. [service_discovery] store SD configs in its own cache. [service_discovery] use named pipes to receive service discovery configs. [service_discovery] parsing pipe input into config. [service_discovery] move relevant options to AppConfig. [service_discovery] fixing up service discovery config traversal. [service_discovery] only remove config from list if not a service discovery received config. [logging] prettify logging statement.
truthbk
force-pushed
the
jaime/pipedsd
branch
from
521f51f to
67bb963
Compare
hkaj
reviewed
Nov 17, 2016
There was a problem hiding this comment.
added some minor comments, also 2 things to consider:
- this should probably come with a test or two
/tmpis a risky choice, sometimes the agent doesn't have access to it. I guess we can keep it and if failures are reported switch to/opt/datadog-agent/runwith a fallback to/tmpif it doesn't exit.
| @@ -19,6 +29,9 @@ | |||
| import org.apache.log4j.Appender; | |||
| import org.apache.log4j.Level; | |||
| import org.apache.log4j.Logger; | |||
| import org.apache.commons.lang3.CharEncoding; | |||
| import org.apache.commons.io.FileUtils; | |||
| import org.apache.commons.io.filefilter.WildcardFileFilter; | |||
There was a problem hiding this comment.
pretty sure some of these aren't used anywhere, you should open the project in eclipse and let it clean them up for you
| int len = sd_pipe.available(); | ||
| byte[] buffer = new byte[len]; | ||
| sd_pipe.read(buffer); | ||
| reinit.set(process_service_discovery(buffer)); |
There was a problem hiding this comment.
we should either use setReinit or remove it
|
Tests failed on a certificate issue on maven's repos, re-triggered them. Once they pass, SHIPIT. |
hkaj
approved these changes
Nov 21, 2016
truthbk
force-pushed
the
jaime/pipedsd
branch
from
aa99991 to
b849b59
Compare
…n older java 1.6. [jmxfetch][service_discovery] fixing regex to be more Java6 friendly.
truthbk
force-pushed
the
jaime/pipedsd
branch
from
b849b59 to
6b6301f
Compare
|
No changes to the logic. Just added a couple simple tests. We're green, so merging! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Enables service discovery for JMXfetch.
Once a service discovery config is detected by the agent it will be pushed as YAML via a named pipe:
dd-service_discoverythat lives in /tmp by default.If multiple changes are detected, these will be submitted to JMXfetch in a single write operation to avoid race conditions. The pipe should take care of locking from the reading and writing ends, so we can guarantee all configs will be read on the JMXfetch in a single iteration and thus help avoid having multiple versions of the same config in the pipe at any given time. We will then do the chopping up of the various configurations read with a simple String.split(SD_CONFIGURATION_SEPARATOR) operaion.
Motivation
Enabling Service Discovery for JMXfetch integrations.
Testing Guidelines
An overview on testing
is available in our contribution guidelines.
Additional Notes
Related PR: DataDog/dd-agent#3010