bosh-monitor 1.2789.0 → 1.2792.0

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

@@ -0,0 +1,68 @@
+module Bosh::Monitor
+  module Plugins
+    class Graphite < Base
+      def validate_options
+        !!(options.kind_of?(Hash) && options["host"] && options["port"])
+      end
+
+      def run
+        unless EM.reactor_running?
+          logger.error("Graphite delivery agent can only be started when event loop is running")
+          return false
+        end
+
+        host = options["host"]
+        port = options["port"]
+        @connection = EM.connect(host, port, Bhm::GraphiteConnection, host, port)
+      end
+
+      def process(event)
+        if event.is_a? Bosh::Monitor::Events::Heartbeat
+
+          metrics = event.metrics
+
+          unless metrics.kind_of?(Enumerable)
+            raise PluginError, "Invalid event metrics: Enumerable expected, #{metrics.class} given"
+          end
+
+          metrics.each do |metric|
+            metric_name = get_metric_name(event, metric)
+            metric_timestamp = get_metric_timestamp(metric.timestamp)
+            metric_value = metric.value
+            @connection.send_metric(metric_name, metric_value, metric_timestamp)
+          end
+        end
+      end
+
+      private
+
+      def get_metric_name heartbeat, metric
+        [get_metric_prefix(heartbeat), metric.name.to_s.gsub('.', '_')].join '.'
+      end
+
+      def get_metric_prefix(heartbeat)
+        deployment = heartbeat.deployment
+        job = heartbeat.job
+        index = heartbeat.index
+        agent_id = heartbeat.agent_id
+        if options["prefix"]
+          [options["prefix"], deployment, job, index, agent_id].join '.'
+        else
+          [deployment, job, index, agent_id].join '.'
+        end
+      end
+
+      def get_metric_timestamp(ts)
+        if ts && is_epoch?(ts)
+          return ts
+        end
+
+        Time.now.to_i
+      end
+
+      def is_epoch?(ts)
+        /^1[0-9]{9}$/.match(ts.to_s)
+      end
+    end
+  end
+end

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

@@ -23,6 +23,8 @@ module Bosh::Monitor
           return false
         end
 
+        return false if event.is_a? Bosh::Monitor::Events::Alert
+
         metrics = event.metrics
 
         if !metrics.kind_of?(Enumerable)

data/lib/bosh/monitor/protocols/graphite_connection.rb

@@ -0,0 +1,17 @@
+module Bosh::Monitor
+  class GraphiteConnection < Bosh::Monitor::TcpConnection
+    def initialize(host, port)
+      super("connection.graphite", host, port)
+    end
+
+    def send_metric(name, value, timestamp)
+      if name && value && timestamp
+        command = "#{name} #{value} #{timestamp}\n"
+        @logger.debug("[Graphite] >> #{command.chomp}")
+        send_data(command)
+      else
+        @logger.warn("Missing graphite metrics (name: '#{name}', value: '#{value}', timestamp: '#{timestamp}')")
+      end
+    end
+  end
+end

data/lib/bosh/monitor/protocols/tcp_connection.rb

@@ -0,0 +1,62 @@
+module Bosh::Monitor
+  class TcpConnection < EventMachine::Connection
+
+    BACKOFF_CEILING = 9
+    MAX_RETRIES = 35
+
+    attr_reader :retries, :logger_name
+
+    def initialize(logger_name, host, port)
+      @logger_name = logger_name
+      @host = host
+      @port = port
+      @logger = Bhm.logger
+      reset_retries
+    end
+
+    def reset_retries
+      @retries = 0
+    end
+
+    def increment_retries
+      @retries += 1
+    end
+
+    def connection_completed
+      reset_retries
+      @reconnecting = false
+      @connected = true
+      @logger.info("#{@logger_name}-connected")
+    end
+
+    def unbind
+      if @connected
+        @logger.warn("#{@logger_name}-connection-lost")
+      end
+      @connected = false
+
+      retry_in = 2**[retries, BACKOFF_CEILING].min - 1
+      increment_retries
+
+      if retries > MAX_RETRIES
+        raise "#{logger_name}-failed-to-reconnect after #{MAX_RETRIES} retries"
+      end
+
+      if retries > 1
+        @logger.info("#{logger_name}-failed-to-reconnect, will try again in #{retry_in} seconds...")
+      end
+
+      EM.add_timer(retry_in) { retry_reconnect }
+    end
+
+    def retry_reconnect
+      @logger.info("#{@logger_name}-reconnecting (#{retries})...")
+      reconnect(@host, @port)
+    end
+
+    def receive_data(data)
+      @logger.info("#{logger_name} << #{data.chomp}")
+    end
+
+  end
+end

data/lib/bosh/monitor/protocols/tsdb_connection.rb

@@ -0,0 +1,14 @@
+module Bosh::Monitor
+  class TsdbConnection < Bosh::Monitor::TcpConnection
+    def initialize(host, port)
+      super("connection.tsdb", host, port)
+    end
+
+    def send_metric(name, timestamp, value, tags = {})
+      formatted_tags = tags.map { |tag| tag.join("=") }.sort.join(" ")
+      command = "put #{name} #{timestamp} #{value} #{formatted_tags}\n"
+      @logger.debug("[TSDB] >> #{command.chomp}")
+      send_data(command)
+    end
+  end
+end

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.2789.0'
+    VERSION = '1.2792.0'
   end
 end

data/lib/bosh/monitor.rb

@@ -48,7 +48,10 @@ require 'bosh/monitor/event_processor'
 require 'bosh/monitor/api_controller'
 
 # Protocols
-require 'bosh/monitor/protocols/tsdb'
+require 'bosh/monitor/protocols/tcp_connection'
+require 'bosh/monitor/protocols/tsdb_connection'
+require 'bosh/monitor/protocols/graphite_connection'
+
 
 # Events
 require 'bosh/monitor/events/base'
@@ -64,6 +67,7 @@ require 'bosh/monitor/plugins/cloud_watch'
 require 'bosh/monitor/plugins/datadog'
 require 'bosh/monitor/plugins/paging_datadog_client'
 require 'bosh/monitor/plugins/email'
+require 'bosh/monitor/plugins/graphite'
 require 'bosh/monitor/plugins/logger'
 require 'bosh/monitor/plugins/nats'
 require 'bosh/monitor/plugins/pagerduty'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.2789.0
+  version: 1.2792.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-16 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
 
-  177517'
+  5e7f33'
 email: support@cloudfoundry.com
 executables:
 - bosh-monitor-console
@@ -185,6 +185,7 @@ files:
 - lib/bosh/monitor/plugins/datadog.rb
 - lib/bosh/monitor/plugins/dummy.rb
 - lib/bosh/monitor/plugins/email.rb
+- lib/bosh/monitor/plugins/graphite.rb
 - lib/bosh/monitor/plugins/http_request_helper.rb
 - lib/bosh/monitor/plugins/logger.rb
 - lib/bosh/monitor/plugins/nats.rb
@@ -194,7 +195,9 @@ files:
 - lib/bosh/monitor/plugins/resurrector_helper.rb
 - lib/bosh/monitor/plugins/tsdb.rb
 - lib/bosh/monitor/plugins/varz.rb
-- lib/bosh/monitor/protocols/tsdb.rb
+- lib/bosh/monitor/protocols/graphite_connection.rb
+- lib/bosh/monitor/protocols/tcp_connection.rb
+- lib/bosh/monitor/protocols/tsdb_connection.rb
 - lib/bosh/monitor/runner.rb
 - lib/bosh/monitor/version.rb
 - lib/bosh/monitor/yaml_helper.rb
@@ -223,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1089129721426212207
+      hash: 4403752010181669552
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/bosh/monitor/protocols/tsdb.rb

@@ -1,68 +0,0 @@
-module Bosh::Monitor
-  class TsdbConnection < EventMachine::Connection
-
-    BACKOFF_CEILING = 9
-    MAX_RETRIES = 35
-
-    attr_reader :retries
-
-    def initialize(host, port)
-      @host = host
-      @port = port
-      @logger = Bhm.logger
-      reset_retries
-    end
-
-    def reset_retries
-      @retries = 0
-    end
-
-    def increment_retries
-      @retries += 1
-    end
-
-    def send_metric(name, timestamp, value, tags = {})
-      formatted_tags = tags.map { |tag| tag.join("=") }.sort.join(" ")
-      command = "put #{name} #{timestamp} #{value} #{formatted_tags}\n"
-      @logger.debug("[TSDB] >> #{command.chomp}")
-      send_data(command)
-    end
-
-    def connection_completed
-      reset_retries
-      @reconnecting = false
-      @connected = true
-      @logger.info("Connected to TSDB server at #{@host}:#{@port}")
-    end
-
-    def unbind
-      if @connected
-        @logger.warn("Lost connection to TSDB server at #{@host}:#{@port}")
-      end
-      @connected = false
-
-      retry_in = 2**[retries, BACKOFF_CEILING].min - 1
-      increment_retries
-
-      if retries > MAX_RETRIES
-        raise "Failed to reconnect to TSDB after #{MAX_RETRIES} retries"
-      end
-
-      if retries > 1
-        @logger.info("Failed to reconnect to TSDB, will try again in #{retry_in} seconds...")
-      end
-
-      EM.add_timer(retry_in) { tsdb_reconnect }
-    end
-
-    def tsdb_reconnect
-      @logger.info("Trying to reconnect to TSDB server at #{@host}:#{@port} (#{retries})...")
-      reconnect(@host, @port)
-    end
-
-    def receive_data(data)
-      @logger.info("[TSDB] << #{data.chomp}")
-    end
-
-  end
-end