Add pup

config.py

@@ -12,7 +12,6 @@
 # CONSTANTS
 DATADOG_CONF = "datadog.conf"
 DEFAULT_CHECK_FREQUENCY = 15 # seconds
-STATSD_FREQUENCY = 2 # seconds
 
 def get_parsed_args():
     parser = OptionParser()
@@ -145,11 +144,7 @@ def get_config(parse_args = True, cfg_path=None, init_logging=False):
                 agentConfig['pup_url'] = config.get('Main', 'pup_url')
             else:
                 agentConfig['pup_url'] = 'http://localhost:17125'
-
-        # Increases the frequency of statsd metrics when only sending to Pup
-        if not agentConfig['use_dd'] and agentConfig['use_pup']:
-            dogstatsd_interval = STATSD_FREQUENCY
-
+
         if not agentConfig['use_dd'] and not agentConfig['use_pup']:
             sys.stderr.write("Please specify at least one endpoint to send metrics to. This can be done in datadog.conf.")
             exit(2)

ddagent.py

@@ -105,21 +105,21 @@ def get_url(self, endpoint):
         return self._application._agentConfig[endpoint] + '/intake/'
 
     def flush(self):
-        for current_idx, endpoint in enumerate(self._endpoints):
-            logging.debug("End point: %s" % endpoint)
-            req = tornado.httpclient.HTTPRequest(self.get_url(endpoint), 
-                 method = "POST", body = self.get_data() )
+        for endpoint in self._endpoints:
+            url = self.get_url(endpoint)
+            logging.info("Sending metrics to endpoint %s at %s" % (endpoint, url))
+            req = tornado.httpclient.HTTPRequest(url, method="POST", body=self.get_data())
+
             # Send Transaction to the endpoint
             http = tornado.httpclient.AsyncHTTPClient()
 
-            logging.info(req.url)
-
-            # Check response for last endpoint
-            # 1st priority, dd_url; 2nd priority, pup_url.
+            # The success of this metric transaction should only depend on
+            # whether or not it's successfully sent to datadoghq. If it fails
+            # getting sent to pup, it's not a big deal.
             if endpoint == 'dd_url':
-                http.fetch(req, callback=lambda(x): None)
+                http.fetch(req, callback=self.on_response)
             else:
-                http.fetch(req, callback=lambda(x): self.on_response(x))
+                http.fetch(req, callback=lambda(x): None)
 
     def on_response(self, response):
         if response.error: 

dogstatsd.py

@@ -325,7 +325,6 @@ def main(config_path=None):
     target   = c['dogstatsd_target']
     interval = c['dogstatsd_interval']
     api_key  = c['api_key']
-    host = 'localhost'
 
     hostname = gethostname(c)
 

packaging/datadog-agent/source/setup_agent.sh

@@ -31,7 +31,7 @@ pip install argparse
 
 # set up the agent
 mkdir -p $dd_base/agent
-$dl_cmd $dd_base/agent.tar.gz https://github.com/DataDog/dd-agent/tarball/add-pup
+$dl_cmd $dd_base/agent.tar.gz https://github.com/DataDog/dd-agent/tarball/pup
 tar -xz -C $dd_base/agent --strip-components 1 -f $dd_base/agent.tar.gz
 if [ $apikey ]; then
     sed "s/api_key:.*/api_key: $apikey/" $dd_base/agent/datadog.conf.example > $dd_base/agent/datadog.conf.1

pup/README.markdown

@@ -10,6 +10,10 @@ First install the [Datadog agent](https://github.com/DataDog/dd-agent) by runnin
 
 That's it! Now navigate to **localhost:17125**. Within ten seconds, system metrics should start streaming.
 
+### Upgrade
+
+It's easy, just re-install. No files will be lost.
+
 ### Custom metrics with statsd
 
 If you would like to add custom metrics to your applications, use the dogstatsd-python or dogstatsd-ruby libraries to instrument your code. Thorough documentation on using DogStatsd and Statsd can be found at [Datadog HQ](http://api.datadoghq.com/guides/dogstatsd/). Below is an abridged introduction to Statsd, and an walkthrough on getting custom metrics viewed on Pup.

pup/assets/javascript/Constants.js

@@ -5,35 +5,35 @@
  */
 
 var C = (function() {
-	return {
-		WIDTH     : "width",
-		HEIGHT    : "height",
-		G         : "g",
-		TRANSFORM : "transform",
-		CLASS     : "class",
-		ID        : "id",
-		RECT      : "rect",
-		TEXT      : "text",
-		X         : "x",
-		Y         : "y",
-		D         : "d",
-		PATH      : "path",
-		LINE      : "line",
-		AREA      : "area",
-		PERIOD    : ".",
-		HASH      : "#",
-		TRANSLATE : "translate",
-		OPENPAREN : "(",
-		CLOSEPAREN: ")",
-		DASH      : "-",
-		COMMA     : ",",
-		CLIP      : "clip",
-		URL       : "url",
-		ZERO      : "0",
-		HIDDEN    : "hidden",
-		TIME      : "time",
-		VALUE     : "value",
-		NAME      : "name",
-		TIME      : "time"
-	};
+    return {
+        WIDTH     : "width",
+        HEIGHT    : "height",
+        G         : "g",
+        TRANSFORM : "transform",
+        CLASS     : "class",
+        ID        : "id",
+        RECT      : "rect",
+        TEXT      : "text",
+        X         : "x",
+        Y         : "y",
+        D         : "d",
+        PATH      : "path",
+        LINE      : "line",
+        AREA      : "area",
+        PERIOD    : ".",
+        HASH      : "#",
+        TRANSLATE : "translate",
+        OPENPAREN : "(",
+        CLOSEPAREN: ")",
+        DASH      : "-",
+        COMMA     : ",",
+        CLIP      : "clip",
+        URL       : "url",
+        ZERO      : "0",
+        HIDDEN    : "hidden",
+        TIME      : "time",
+        VALUE     : "value",
+        NAME      : "name",
+        TIME      : "time"
+    };
 }());