Merge branch 'master' of https://github.com/DataDog/dd-agent

DataDog · Apr 9, 2014 · eed6e91 · eed6e91
2 parents b29abea + db106fa
commit eed6e91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/config.py b/config.py
@@ -324,7 +324,7 @@ def get_config(parse_args=True, cfg_path=None, options=None):
         # Dogstatsd config
         dogstatsd_defaults = {
             'dogstatsd_port': 8125,
-            'dogstatsd_target': 'http://localhost:17123',
+            'dogstatsd_target': 'http://' + agentConfig['bind_host'] + ':17123',
             'dogstatsd_interval': dogstatsd_interval,
             'dogstatsd_agregator_bucket_size': dogstatsd_agregator_bucket_size,
             'dogstatsd_normalize': 'yes',

diff --git a/datadog.conf.example b/datadog.conf.example
@@ -3,9 +3,6 @@
 # The host of the Datadog intake server to send Agent data to
 dd_url: https://app.datadoghq.com
 
-# The loopback address the Agent will bind
-# bind_host: localhost
-
 # If you need a proxy to connect to the Internet, provide the settings here
 # proxy_host: my-proxy.com
 # proxy_port: 3128
@@ -57,6 +54,10 @@ use_mount: no
 # Default to the simple http client
 # use_curl_http_client: False
 
+# The loopback address the Forwarder and Dogstatsd will bind.
+# Optional, it is mainly used when running the agent on Openshift
+# bind_host: localhost
+
 # ========================================================================== #
 # Pup configuration
 # ========================================================================== #