Merge remote-tracking branch 'origin/tristan/haproxy-events' into v4.3.1

Author: Remi Hakim

CHANGELOG.md

@@ -6,7 +6,7 @@ Changes
 
 ### Changes
 
-# 4.3.0 / Unreleased
+# 4.3.0 / 05-22-2014
 
 ### Integrations affected
 * MongoDB
@@ -1052,4 +1052,4 @@ If you use ganglia, you want this version.
 [@steeve]: https://github.com/steeve
 [@stefan-mees]: https://github.com/stefan-mees
 [@tomduckering]: https://github.com/tomduckering
-[@walkeran]: https://github.com/walkeran
+[@walkeran]: https://github.com/walkeran

checks.d/haproxy.py

@@ -129,8 +129,8 @@ def _process_data(
                 )
                 # Send the list of data to the metric and event callbacks
                 self._process_metrics(data_dict, url)
-                if process_events:
-                    self._process_event(data_dict, url)
+            if process_events:
+                self._process_event(data_dict, url)
 
         if collect_status_metrics:
             self._process_status_metric(hosts_statuses, collect_status_metrics_by_host)
@@ -263,32 +263,39 @@ def _process_event(self, data, url):
                 lastchg = 0
 
             # Create the event object
-            ev = self._create_event(data['status'], hostname, lastchg, service_name)
+            ev = self._create_event(
+                data['status'], hostname, lastchg, service_name,
+                data['back_or_front']
+            )
             self.event(ev)
 
             # Store this host status so we can check against it later
             self.host_status[url][key] = data['status']
 
-    def _create_event(self, status, hostname, lastchg, service_name):
+    def _create_event(self, status, hostname, lastchg, service_name, back_or_front):
+        HAProxy_agent = self.hostname.decode('utf-8')
         if status == "DOWN":
             alert_type = "error"
-            title = "%s reported %s %s" % (service_name, hostname, status)
+            title = "%s reported %s:%s %s" % (HAProxy_agent, service_name, hostname, status)
         else:
             if status == "UP":
                 alert_type = "success"
             else:
                 alert_type = "info"
-            title = "%s reported %s back and %s" % (service_name, hostname, status)
+            title = "%s reported %s:%s back and %s" % (HAProxy_agent, service_name, hostname, status)
 
+        tags = ["service:%s" % service_name]
+        if back_or_front == Services.BACKEND:
+            tags.append('backend:%s' % hostname)
         return {
              'timestamp': int(time.time() - lastchg),
              'event_type': EVENT_TYPE,
-             'host': hostname,
+             'host': HAProxy_agent,
              'msg_title': title,
              'alert_type': alert_type,
              "source_type_name": SOURCE_TYPE_NAME,
              "event_object": hostname,
-             "tags": ["frontend:%s" % service_name, "host:%s" % hostname]
+             "tags": tags
         }
 
     @staticmethod

packaging/datadog-agent/source/setup_agent.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # figure out where to pull from
-tag="4.2.1"
+tag="4.3.0"
 
 #######################
 # Define some helpers #