bosh-monitor 1.3202.0 → 1.3213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f302c26785140ed359f8b15a41cb50fb0f0ce85
-  data.tar.gz: 108d8fd7d6cb4d702244d7dec10ef82ee624703d
+  metadata.gz: 4bf6d8fb84e0abb36c5d8ccda918ecdb34fb91f1
+  data.tar.gz: afb5d2d9e99f5a741d10cbe024d14f743073faab
 SHA512:
-  metadata.gz: 1bdee94f2066f64f0b939c613c5e76dd5ded9a48b71f587ad28432de0b525560be5ef8c4b917bd72a223274d2312612b75a65b50beb9cd004d0eecab413d9d80
-  data.tar.gz: 6d05ab9c6ad5aeef56d13fa239c9305a7bd8ba08b6cfae50a305bf8bec5d1cae4e3dc811437d6f4b931c35a15956f81f6f06760bf5d7aae2aed44e8ae7f2522d
+  metadata.gz: c42bb8edb352150f5433825623045f3fc3e89e5f81087ec2ada81722d386a6ec4736d29032db7810d11e9175c0b2a11ebf28031a8d22f03fba6225cbc7e1bcf7
+  data.tar.gz: 941fb7c74c30fc98b08b0331fd01b2b954c3deed2b6af0a42a8d63c5cbc9ffb4566192bfac2aaff4a070a81621e026e4588cd49ac1e976331d2baead0cd0b32e

data/lib/bosh/monitor/agent.rb

@@ -28,8 +28,14 @@ module Bosh::Monitor
     end
 
     def name
-      if @deployment && @job && @index
-        "#{@deployment}: #{@job}(#{@index}) [id=#{@id}, instance_id=#{@instance_id}, cid=#{@cid}]"
+      if @deployment && @job && @instance_id
+        name = "#{@deployment}: #{@job}(#{@instance_id}) [id=#{@id}, "
+
+        if @index
+          name = name + "index=#{@index}, "
+        end
+
+        name + "cid=#{@cid}]"
       else
         state = ATTRIBUTES.inject([]) do |acc, attribute|
           value = send(attribute)

data/lib/bosh/monitor/agent_manager.rb

@@ -124,7 +124,7 @@ module Bosh::Monitor
         return false
       end
 
-      @logger.info("Adding agent #{vm_data['agent_id']} (#{vm_data['job']}/#{vm_data['index']}) to #{deployment_name}...")
+      @logger.info("Adding agent #{vm_data['agent_id']} (#{vm_data['job']}/#{vm_data['id']}) to #{deployment_name}...")
 
       agent_id = vm_data['agent_id']
 

data/lib/bosh/monitor/events/heartbeat.rb

@@ -10,7 +10,7 @@ module Bosh::Monitor
 
       SERVICE_AUXILIARY_JOBS = Set.new(%w(serialization_data_server backup_manager))
 
-      attr_reader :agent_id, :deployment, :job, :index, :metrics
+      attr_reader :agent_id, :deployment, :job, :index, :metrics, :node_id
 
       def initialize(attributes = {})
         super
@@ -30,7 +30,7 @@ module Bosh::Monitor
         @tags = {}
         @tags["job"] = @job if @job
         @tags["index"] = @index if @index
-        @tags["node_id"] = @node_id if @node_id
+        @tags["id"] = @node_id if @node_id
         @tags["role"] = guess_role
 
         @vitals = @attributes["vitals"] || {}
@@ -60,7 +60,13 @@ module Bosh::Monitor
       end
 
       def short_description
-        "Heartbeat from #{@job}/#{@index} (agent_id=#{@agent_id} node_id=#{@node_id}) @ #{@timestamp.utc}"
+        description = "Heartbeat from #{@job}/#{@node_id} (agent_id=#{@agent_id}"
+
+        if @index && !@index.empty?
+          description = description + " index=#{@index}"
+        end
+
+        description + ") @ #{@timestamp.utc}"
       end
 
       def to_s

data/lib/bosh/monitor/plugins/README.md

@@ -32,7 +32,8 @@ The Consul plugin works by forwarding nats heartbeat events and alerts to a cons
 ```ruby
 {
   :agent  => agent_id,
-  :name   => "job_name / index",
+  :name   => "job_name / node_id",
+  :id     => node_id,
   :state  => job_state,
   :data   => {
       :cpu => [sys, user, wait]

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

@@ -15,7 +15,7 @@ module Bosh::Monitor
       end
 
       def process(event)
-        if event.is_a? Bosh::Monitor::Events::Heartbeat
+        if (event.is_a? Bosh::Monitor::Events::Heartbeat) && event.node_id
           aws_cloud_watch.put_metric_data(heartbeat_to_cloudwatch_metric(event))
         end
       end
@@ -35,9 +35,10 @@ module Bosh::Monitor
         @dimensions ||= [
             {name: "job", value: heartbeat.job},
             {name: "index", value: heartbeat.index},
-            {name: "name", value: "#{heartbeat.job}/#{heartbeat.index}"},
+            {name: "name", value: "#{heartbeat.job}/#{heartbeat.node_id}"},
             {name: "deployment", value: heartbeat.deployment},
-            {name: "agent_id", value: heartbeat.agent_id}
+            {name: "agent_id", value: heartbeat.agent_id},
+            {name: "id", value: heartbeat.node_id}
         ]
       end
 

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

@@ -71,11 +71,11 @@ module Bosh::Monitor
 
       #should an individual alert or heartbeat be forwarded as a consul event
       def forward_this_event?(event)
-        @use_events && ( event.is_a?(Bosh::Monitor::Events::Alert) || ( event.is_a?(Bosh::Monitor::Events::Heartbeat) && @heartbeats_as_alerts) )
+        @use_events && (event.is_a?(Bosh::Monitor::Events::Alert) || ( event.is_a?(Bosh::Monitor::Events::Heartbeat) && @heartbeats_as_alerts && event.node_id))
       end
 
       def forward_this_ttl?(event)
-         @use_ttl && event.is_a?(Bosh::Monitor::Events::Heartbeat)
+        @use_ttl && event.is_a?(Bosh::Monitor::Events::Heartbeat) && event.node_id
       end
 
       def get_path_for_note_type(event, note_type)
@@ -105,7 +105,7 @@ module Bosh::Monitor
       end
 
       def label_for_ttl(event)
-        "#{@namespace}#{event.job}_#{event.index}"
+        "#{@namespace}#{event.job}_#{event.node_id}"
       end
 
       # Notify consul of an event
@@ -136,7 +136,8 @@ module Bosh::Monitor
           #this should yield consistent results from the values method
           {
             :agent  => body[:agent_id],
-            :name   => "#{body[:job]}/#{body[:index]}",
+            :name   => "#{body[:job]}/#{body[:node_id]}",
+            :id     => body[:node_id],
             :state  => "#{body[:job_state]}",
             :data   => {
                 :cpu => vitals['cpu'].values,

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

@@ -27,7 +27,9 @@ module Bosh::Monitor
       def process(event)
         case event
           when Bosh::Monitor::Events::Heartbeat
-            EM.defer { process_heartbeat(event) }
+            if event.node_id
+              EM.defer { process_heartbeat(event) }
+            end
           when Bosh::Monitor::Events::Alert
             EM.defer { process_alert(event) }
           else
@@ -41,6 +43,7 @@ module Bosh::Monitor
         tags = %W[
           job:#{heartbeat.job}
           index:#{heartbeat.index}
+          id:#{heartbeat.node_id}
           deployment:#{heartbeat.deployment}
           agent:#{heartbeat.agent_id}
         ]

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

@@ -17,7 +17,7 @@ module Bosh::Monitor
       end
 
       def process(event)
-        if event.is_a? Bosh::Monitor::Events::Heartbeat
+        if (event.is_a? Bosh::Monitor::Events::Heartbeat) && event.node_id
 
           metrics = event.metrics
 
@@ -43,12 +43,12 @@ module Bosh::Monitor
       def get_metric_prefix(heartbeat)
         deployment = heartbeat.deployment
         job = heartbeat.job
-        index = heartbeat.index
+        id = heartbeat.node_id
         agent_id = heartbeat.agent_id
         if options["prefix"]
-          [options["prefix"], deployment, job, index, agent_id].join '.'
+          [options["prefix"], deployment, job, id, agent_id].join '.'
         else
-          [deployment, job, index, agent_id].join '.'
+          [deployment, job, id, agent_id].join '.'
         end
       end
 

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.3202.0'
+    VERSION = '1.3213.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine