-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
795c013
commit 4eea2ac
Showing
11 changed files
with
231 additions
and
437 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,9 @@ FROM debian:jessie | |
| MAINTAINER Datadog <[email protected]> | ||
|
|
||
| ENV DOCKER_DD_AGENT=yes \ | ||
| AGENT_VERSION=1:5.16.0-1 | ||
| AGENT_VERSION=1:5.16.0-1 \ | ||
| PATH="/opt/datadog-agent/embedded/bin:/opt/datadog-agent/bin:${PATH}" \ | ||
| PYTHONPATH=/opt/datadog-agent/agent | ||
|
|
||
| # Install the Agent | ||
| RUN echo "deb http://apt.datadoghq.com/ stable main" > /etc/apt/sources.list.d/datadog.list \ | ||
|
|
@@ -15,15 +17,13 @@ RUN echo "deb http://apt.datadoghq.com/ stable main" > /etc/apt/sources.list.d/d | |
| && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
|
|
||
| # Configure the Agent | ||
| # 1. Listen to statsd (8125) and traces (8126) from other containers | ||
| # 2. Turn syslog off | ||
| # 1. Turn syslog off by using the DD_CONF_LOG_TO_SYSLOG env var | ||
| # 3. Remove dd-agent user from supervisor configuration | ||
| # 4. Remove dd-agent user from init.d configuration | ||
| # 5. Fix permission on /etc/init.d/datadog-agent | ||
| ENV DD_CONF_LOG_TO_SYSLOG=no \ | ||
| NON_LOCAL_TRAFFIC=yes | ||
| RUN mv /etc/dd-agent/datadog.conf.example /etc/dd-agent/datadog.conf \ | ||
| && sed -i -e"s/^.*non_local_traffic:.*$/non_local_traffic: yes/" /etc/dd-agent/datadog.conf \ | ||
| && sed -i -e"s/^.*log_to_syslog:.*$/log_to_syslog: no/" /etc/dd-agent/datadog.conf \ | ||
| && sed -i "/user=dd-agent/d" /etc/dd-agent/supervisor.conf \ | ||
| && sed -i 's/AGENTUSER="dd-agent"/AGENTUSER="root"/g' /etc/init.d/datadog-agent \ | ||
| && rm /etc/dd-agent/conf.d/network.yaml.default \ | ||
| || chmod +x /etc/init.d/datadog-agent | ||
|
|
@@ -45,5 +45,6 @@ HEALTHCHECK --interval=5m --timeout=3s --retries=1 \ | |
| -c /etc/dd-agent/supervisor.conf status | awk '{print $2}' | egrep -v 'RUNNING|EXITED' | wc -l) \ | ||
| -eq 0 || exit 1 | ||
|
|
||
| ADD config_builder.py /config_builder.py | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
| CMD ["supervisord", "-n", "-c", "/etc/dd-agent/supervisor.conf"] | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| #!/opt/datadog-agent/embedded/bin/python | ||
| ''' | ||
| This script is used to generate the configuration of the datadog agent, its | ||
| integrations and other moving parts. | ||
| ''' | ||
|
|
||
| from os import getenv, environ | ||
| import logging | ||
| from urllib2 import urlopen, URLError, HTTPError | ||
| from socket import getdefaulttimeout, setdefaulttimeout | ||
| from ConfigParser import ConfigParser | ||
|
|
||
| class ConfBuilder(object): | ||
| ''' | ||
| This class manages the configuration files | ||
| ''' | ||
| def __init__(self): | ||
| # excludes from the generic variables parsing the ones that have a | ||
| # certain logic warpped around them | ||
| self.exclude_from_generic = [ | ||
| 'DD_API_KEY', 'DD_API_KEY_FILE', 'DD_HOME', | ||
| 'DD_START_AGENT', 'DD_LOGS_STDOUT' | ||
| ] | ||
| self.datadog_conf_file = '/etc/dd-agent/datadog.conf' | ||
| self.supervisor_conf_file = '/etc/dd-agent/supervisor.conf' | ||
| dd_home = getenv('DD_HOME') | ||
| if dd_home is not None: | ||
| self.datadog_conf_file = '{}/agent/datadog.conf'.format(dd_home) | ||
| self.supervisor_conf_file = '{}/agent/supervisor.conf'.format(dd_home) | ||
| # This will store the config parser object that is used in the different functions | ||
| self.config = None | ||
|
|
||
| def load_config(self, config_file): | ||
| ''' | ||
| Loads a config file using ConfigParser | ||
| ''' | ||
| self.config = ConfigParser() | ||
| # import existing config from file | ||
| with open(config_file, 'rb') as cfd: | ||
| self.config.readfp(cfd) | ||
|
|
||
| def save_config(self, config_file): | ||
| ''' | ||
| Saves a ConfigParser object (self.config) to the given file | ||
| ''' | ||
| if self.config is None: | ||
| logging.error('config object needs to be created before saving anything') | ||
| exit(1) | ||
| with open(config_file, 'wb') as cfd: | ||
| self.config.write(cfd) | ||
|
|
||
| def build_supervisor_conf(self): | ||
| ''' | ||
| Builds the supervisor.conf based on the environment variables | ||
| ''' | ||
| self.load_config(self.supervisor_conf_file) | ||
|
|
||
| _logs_stdout = getenv('DD_LOGS_STDOUT', getenv('LOGS_STDOUT', 'no')) | ||
| for _section in self.config.sections(): | ||
| if self.config.has_option(_section, 'user'): | ||
| self.config.remove_option(_section, 'user') | ||
| if _logs_stdout == 'yes': | ||
| for _opt in self.config.options(_section): | ||
| if _opt.endswith('_logfile'): | ||
| self.config.remove_option(_section, _opt) | ||
| if _section.startswith('program:'): | ||
| self.set_property('stdout_logfile', '/dev/stdout', _section) | ||
| self.set_property('stdout_logfile_maxbytes', '0', _section) | ||
| self.set_property('stderr_logfile', '/dev/stderr', _section) | ||
| self.set_property('stderr_logfile_maxbytes', '0', _section) | ||
|
|
||
| if getenv('KUBERNETES') is not None or getenv('MESOS_MASTER') is not None or getenv('MESOS_SLAVE') is not None: | ||
| # expose supervisord as a health check | ||
| if not self.config.has_section('inet_http_server'): | ||
| self.config.add_section('inet_http_server') | ||
| self.set_property('port', '0.0.0.0:9001', 'inet_http_server') | ||
|
|
||
| self.save_config(self.supervisor_conf_file) | ||
|
|
||
| def build_datadog_conf(self): | ||
| ''' | ||
| Builds the datadog.conf based on the environment variables | ||
| ''' | ||
| self.load_config(self.datadog_conf_file) | ||
|
|
||
| ##### Core config ##### | ||
| self.set_api_key() | ||
| self.set_from_env_mapping('DD_HOSTNAME', 'hostname') | ||
| self.set_from_env_mapping('EC2_TAGS', 'collect_ec2_tags') | ||
| # The TAGS env variable superseeds DD_TAGS | ||
| self.set_from_env_mapping('DD_TAGS', 'tags') | ||
| self.set_from_env_mapping('TAGS', 'tags') | ||
| # The LOG_LEVEL env variable superseeds DD_LOG_LEVEL | ||
| self.set_from_env_mapping('DD_LOG_LEVEL', 'log_level') | ||
| self.set_from_env_mapping('LOG_LEVEL', 'log_level') | ||
| self.set_from_env_mapping('NON_LOCAL_TRAFFIC', 'non_local_traffic', action='store_true') | ||
| self.set_from_env_mapping('DD_URL', 'dd_url') | ||
| self.set_from_env_mapping('STATSD_METRIC_NAMESPACE', 'statsd_metric_namespace') | ||
| self.set_from_env_mapping('USE_DOGSTATSD', 'use_dogstatsd') | ||
| ##### Proxy config ##### | ||
| self.set_from_env_mapping('PROXY_HOST', 'proxy_host') | ||
| self.set_from_env_mapping('PROXY_PORT', 'proxy_port') | ||
| self.set_from_env_mapping('PROXY_USER', 'proxy_user') | ||
| self.set_from_env_mapping('PROXY_PASSWORD', 'proxy_password') | ||
| ##### Service discovery ##### | ||
| self.set_from_env_mapping('SD_BACKEND', 'service_discovery_backend') | ||
| self.set_sd_backend_host() | ||
| self.set_from_env_mapping('SD_BACKEND_PORT', 'sd_backend_port') | ||
| self.set_from_env_mapping('SD_TEMPLATE_DIR', 'sd_template_dir') | ||
| self.set_from_env_mapping('SD_CONSUL_TOKEN', 'consul_token') | ||
| self.set_from_env_mapping('SD_BACKEND_USER', 'sd_backend_username') | ||
| self.set_from_env_mapping('SD_BACKEND_PASSWORD', 'sd_backend_password') | ||
| # Magic trick to automatically add properties not yet define in the doc | ||
| self.set_generics('DD_CONF_') | ||
|
|
||
| self.save_config(self.datadog_conf_file) | ||
|
|
||
| def set_api_key(self): | ||
| ''' | ||
| Used for building datadog.conf | ||
| Gets the API key from the environment or the key file | ||
| and sets it in the configuration | ||
| ''' | ||
| api_key = getenv('DD_API_KEY', getenv('API_KEY', '')) | ||
| keyfile = getenv('DD_API_KEY_FILE') | ||
| if keyfile is not None: | ||
| try: | ||
| with open(keyfile, 'r') as kfile: | ||
| api_key = kfile.read() | ||
| except IOError: | ||
| logging.warning('Unable to read the content of they key file specified in DD_API_KEY_FILE') | ||
| if len(api_key) <= 0: | ||
| logging.error('You must set API_KEY environment variable or include a DD_API_KEY_FILE to run the Datadog Agent container') | ||
| exit(1) | ||
| self.set_property('api_key', api_key) | ||
|
|
||
| def set_from_env_mapping(self, env_var_name, property_name, section='Main', action=None): | ||
| ''' | ||
| Sets a property using the corresponding environment variable if it exists | ||
| It also returns the value in case you want to play with it | ||
| If action is specified to 'store_true', whatever the content of the | ||
| env variable is (if exists), the value of the property will be true | ||
| ''' | ||
| _val = getenv(env_var_name) | ||
| if _val is not None: | ||
| if action == 'store_true': | ||
| _val = 'true' | ||
| self.set_property(property_name, _val, section) | ||
| return _val | ||
| return None | ||
|
|
||
| def set_sd_backend_host(self): | ||
| ''' | ||
| Used for building datadog.conf | ||
| Sets sd_config_backend and sd_backend_host depending on the environment | ||
| ''' | ||
| _config_backend = getenv('SD_CONFIG_BACKEND', 'sd_config_backend') | ||
| if _config_backend is not None: | ||
| _backend_host = getenv('SD_BACKEND_HOST', 'sd_backend_host') | ||
| if _backend_host is None: | ||
| _timeout = getdefaulttimeout() | ||
| try: | ||
| setdefaulttimeout(1) | ||
| _ec2_ip = urlopen('http://169.254.169.254/latest/meta-data/local-ipv4') | ||
| self.set_property('sd_backend_host', _ec2_ip.read()) | ||
| except (URLError, HTTPError): | ||
| pass # silent fail on purpose | ||
| setdefaulttimeout(_timeout) | ||
|
|
||
| def set_generics(self, prefix='DD_CONF_'): | ||
| ''' | ||
| Looks for environment variables starting by the given prefix and consider that the | ||
| rest of the variable name is the name of the property to set | ||
| ''' | ||
| for dd_var in environ: | ||
| if dd_var.startswith(prefix) and dd_var.upper() not in self.exclude_from_generic: | ||
| if len(dd_var) > 0: | ||
| self.set_property(dd_var[len(prefix):].lower(), environ[dd_var]) | ||
|
|
||
| def set_property(self, property_name, property_value, section='Main'): | ||
| ''' | ||
| Sets the given property to the given value in the configuration | ||
| ''' | ||
| if self.config is None: | ||
| logging.error('config object needs to be created before setting properties') | ||
| exit(1) | ||
| self.config.set(section, property_name, property_value) | ||
|
|
||
| if __name__ == '__main__': | ||
| cfg = ConfBuilder() | ||
| cfg.build_datadog_conf() |
Oops, something went wrong.