updated datadog config to latest revision

templates/datadog.conf.erb

@@ -3,8 +3,8 @@
 # The host of the Datadog intake server to send agent data to 
 dd_url: <%= dd_url %>
 
-# The Datadog api key to associate your agent's data with your organization.
-# Can be found here:
+# The Datadog api key to associate your agent's data with your organization. 
+# Can be found here: 
 # https://app.datadoghq.com/account/settings
 api_key: <%= api_key %>
 
@@ -15,7 +15,16 @@ agent_key:
 # to the /tmp/ directory.  
 debug_mode: no 
 
-hostname: <%= hostname %>
+
+# Force the hostname to whatever you want.
+hostname: <%= fqdn %>
+
+# Use the amazon EC2 instance-id instead of hostname (unless hostname is
+# explicitly set)
+use_ec2_instance_id: no
+
+# Change port the agent is listening to
+# listen_port: 17123
 
 # ========================================================================== #
 # Service-specific configuration                                             #
@@ -48,9 +57,11 @@ hostname: <%= hostname %>
 # MySQL host
 #mysql_server:
 
-# MySQL user. It only runs "SHOW STATUS" queries, which doesn't require
-# any privileges, so you should consider creating a separate, unprivileged 
-# user
+# MySQL user. It runs "SHOW STATUS" and "SHOW REPLICATION STATUS" queries.
+# You should consider creating a separate user, e.g. datadog.
+# The latter requires the "REPLICATION CLIENT" privileges using a command like:
+# GRANT REPLICATION CLIENT ON *.* TO datadog;
+# http://dev.mysql.com/doc/refman/5.1/en/privileges-provided.html#priv_replication-client
 #mysql_user:
 
 # MySQL user's password
@@ -122,6 +133,7 @@ hostname: <%= hostname %>
 # -------------------------------------------------------------------------- #
 
 # Path to Hudson's home directory
+# Make sure the dd-agent user can read this directory
 #hudson_home: /var/lib/hudson/
 
 
@@ -130,6 +142,7 @@ hostname: <%= hostname %>
 # -------------------------------------------------------------------------- #
 
 # Path to Nagios's event log file
+# Make sure the dd-agent user can read this file
 #nagios_log: /var/log/nagios3/nagios.log
 
 
@@ -194,11 +207,40 @@ hostname: <%= hostname %>
 #  Rails                                                                     
 # -------------------------------------------------------------------------- #
 
-#rails_logs: /var/log/myrailsapp.lof
+#rails_logs: /var/log/myrailsapp.log
 
 # -------------------------------------------------------------------------- #
 #  Memcache                                                                     
 # -------------------------------------------------------------------------- #
 
 #memcache_server: localhost
 #memcache_port: 11211
+
+# -------------------------------------------------------------------------- #
+#  Dogstream (log file parser)                                                                     
+# -------------------------------------------------------------------------- #
+
+# Comma-separated list of logs to parse and optionally custom parsers to use.
+# The form should look like this:
+#
+#   dogstreams: /path/to/log1:parsers:custom_parser, /path/to/log2, /path/to/log3, ...
+#
+# Each entry is a path to a log file and optionally a Python module/function pair
+# separated by colons. 
+#
+# Custom parsers should take a 2 parameters, a logger object and 
+# a string parameter of the current line to parse. It should return a tuple of 
+# the form:
+#   (metric (str), timestamp (unix timestamp), value (float), attributes (dict))
+# where attributes should at least contain the key 'metric_type', specifying
+# whether the given metric is a 'counter' or 'gauge'.
+#
+# In order for the agent to find the custom line parser functions, the modules
+# must exist in the agent's PYTHONPATH. You can set this as an environment
+# variable when starting the agent.
+#
+# If this value isn't specified, the default parser assumes this log format:
+#     metric timestamp value key0=val0 key1=val1 ...
+#
+
+