bosh-monitor 1.2781.0 → 1.2785.0

data/lib/bosh/monitor/api_controller.rb

@@ -1,6 +1,16 @@
 module Bosh::Monitor
-
   class ApiController < Sinatra::Base
+    PULSE_TIMEOUT = 180
+
+    def initialize
+      @heartbeat = Time.now
+
+      EM.add_periodic_timer(1) do
+        EM.defer { @heartbeat = Time.now }
+      end
+
+      super
+    end
 
     configure do
       set(:show_exceptions, false)
@@ -28,8 +38,13 @@ module Bosh::Monitor
     end
 
     get "/healthz" do
-      200
+      body "Last pulse was #{Time.now - @heartbeat} seconds ago"
+
+      if Time.now - @heartbeat > PULSE_TIMEOUT
+        status(500)
+      else
+        status(200)
+      end
     end
   end
-
 end

data/lib/bosh/monitor/plugins/datadog.rb

@@ -46,8 +46,14 @@ module Bosh::Monitor
         ]
 
         heartbeat.metrics.each do |metric|
-          point = [Time.at(metric.timestamp), metric.value]
-          dog_client.emit_points("bosh.healthmonitor.#{metric.name}", [point], tags: tags)
+          begin
+            point = [Time.at(metric.timestamp), metric.value]
+            dog_client.emit_points("bosh.healthmonitor.#{metric.name}", [point], tags: tags)
+          rescue Timeout::Error => e
+            logger.warn('Could not emit points to Datadog, request timed out.')
+          rescue => e
+            logger.info("Could not emit points to Datadog: #{e.inspect}")
+          end
         end
       end
 
@@ -59,15 +65,21 @@ module Bosh::Monitor
 
 
         # DataDog only supports "low" and "normal" priority
-        priority = normal_priority?(alert.severity) ? "normal" : "low"
-        dog_client.emit_event(
-          Dogapi::Event.new(msg,
-            msg_title: title,
-            date_happened: timestamp,
-            tags: ["source:#{source}"],
-            priority: priority
+        begin
+          priority = normal_priority?(alert.severity) ? "normal" : "low"
+          dog_client.emit_event(
+            Dogapi::Event.new(msg,
+                              msg_title: title,
+                              date_happened: timestamp,
+                              tags: ["source:#{source}"],
+                              priority: priority
+                             )
           )
-        )
+        rescue Timeout::Error => e
+          logger.warn('Could not emit event to Datadog, request timed out.')
+        rescue => e
+          logger.warn("Could not emit event to Datadog: #{e.inspect}")
+        end
       end
 
       def normal_priority?(severity)

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.2781.0'
+    VERSION = '1.2785.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.2781.0
+  version: 1.2785.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -157,7 +157,7 @@ dependencies:
         version: 1.6.0
 description: ! 'BOSH Health Monitor
 
-  cc921b'
+  30caeb'
 email: support@cloudfoundry.com
 executables:
 - bosh-monitor-console
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 183765950588441907
+      hash: -3205421599059187072
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23