bosh-monitor 1.3184.1.0 → 1.3189.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c91419efa1acf49fd0c968659fb8b4a5c228351
-  data.tar.gz: d4f58cee22fb24d10a0fa597b7481075feeba35d
+  metadata.gz: 683401e4f5924206ec23df062b5bbbe67edd11e7
+  data.tar.gz: 3c19755f34e2c3f1a14f65d6fab057cad0b3b87d
 SHA512:
-  metadata.gz: 2baf363b6529d6a54973d10abafd3fe0f15a9d06cde6badebea636578a1ac24b6a0bf6de18ebbb05d4c91e11fc6cef6c91197bec4ddd6d8520b57d95a8b4d4d8
-  data.tar.gz: 012f1d3954e77090738725d4ca37a26b5470d7c657a262024674b3532834234b4f146d8721973fda7503929abc80bcf0e6e96d6214d06e459ab06eb88836df56
+  metadata.gz: 93f9db184bf68cfb91b04d57011b083f5a7b57aded228a4a260ed77e870127f61c7669e3f7ddb5b9f862f0869e9233c31e4828b385c2fb0084ffe0e6e3e05233
+  data.tar.gz: ed368e07fb7c91b544b404bb0e1672420dd3a0698f4e3f96e93aa0673271ece6787f065bd2ed92544c6ea4ca8ba5b91c793a3dc149f991ab7eb71e8cb7fd3ba4

data/lib/bosh/monitor/agent.rb

@@ -5,7 +5,7 @@ module Bosh::Monitor
     attr_reader   :discovered_at
     attr_accessor :updated_at
 
-    ATTRIBUTES = [ :deployment, :job, :index, :cid ]
+    ATTRIBUTES = [ :deployment, :job, :index, :instance_id, :cid ]
 
     ATTRIBUTES.each do |attribute|
       attr_accessor attribute
@@ -24,11 +24,12 @@ module Bosh::Monitor
       @job = opts[:job]
       @index = opts[:index]
       @cid = opts[:cid]
+      @instance_id = opts[:instance_id]
     end
 
     def name
       if @deployment && @job && @index
-        "#{@deployment}: #{@job}(#{@index}) [id=#{@id}, cid=#{@cid}]"
+        "#{@deployment}: #{@job}(#{@index}) [id=#{@id}, instance_id=#{@instance_id}, cid=#{@cid}]"
       else
         state = ATTRIBUTES.inject([]) do |acc, attribute|
           value = send(attribute)

data/lib/bosh/monitor/agent_manager.rb

@@ -124,10 +124,9 @@ 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['index']}) to #{deployment_name}...")
 
-      agent_id = vm_data["agent_id"]
-      agent_cid = vm_data["cid"]
+      agent_id = vm_data['agent_id']
 
       if agent_id.nil?
         @logger.warn("No agent id for VM: #{vm_data}")
@@ -135,7 +134,7 @@ module Bosh::Monitor
       end
 
       # Idle VMs, we don't care about them, but we still want to track them
-      if vm_data["job"].nil?
+      if vm_data['job'].nil?
         @logger.debug("VM with no job found: #{agent_id}")
       end
 
@@ -148,9 +147,10 @@ module Bosh::Monitor
       end
 
       agent.deployment = deployment_name
-      agent.job = vm_data["job"]
-      agent.index = vm_data["index"]
-      agent.cid = vm_data["cid"]
+      agent.job = vm_data['job']
+      agent.index = vm_data['index']
+      agent.cid = vm_data['cid']
+      agent.instance_id = vm_data['id']
 
       @deployments[deployment_name] ||= Set.new
       @deployments[deployment_name] << agent_id
@@ -209,7 +209,7 @@ module Bosh::Monitor
           created_at: ts,
           deployment: agent.deployment,
           job: agent.job,
-          index: agent.index)
+          instance_id: agent.instance_id)
       end
 
       if agent.rogue?

data/lib/bosh/monitor/config.rb

@@ -6,6 +6,7 @@ module Bosh::Monitor
     attr_accessor :director
     attr_accessor :intervals
     attr_accessor :mbus
+    attr_accessor :em_threadpool_size
     attr_accessor :event_mbus
     attr_accessor :agent_manager
     attr_accessor :event_processor
@@ -23,6 +24,8 @@ module Bosh::Monitor
       @director = Director.new(config["director"], @logger)
       @mbus = OpenStruct.new(config["mbus"])
 
+      @em_threadpool_size = config["em_threadpool_size"]
+
       @event_processor = EventProcessor.new
       @agent_manager = AgentManager.new(event_processor)
 

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

@@ -11,7 +11,7 @@ module Bosh::Monitor
       CONSUL_MAX_EVENT_BYTESIZE = 512
 
       CONSUL_ENDPOINTS = {
-        event:     "/v1/event/fire/",              #fire an event
+        event:      "/v1/event/fire/",             #fire an event
         register:   "/v1/agent/check/register",    #register a check
         deregister: "/v1/agent/check/deregister/", #deregister a check
         pass:       "/v1/agent/check/pass/",       #mark a check as passing

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

@@ -31,15 +31,15 @@ module Bosh::Monitor
       def process(alert)
         deployment = alert.attributes['deployment']
         job = alert.attributes['job']
-        index = alert.attributes['index']
+        id = alert.attributes['instance_id']
 
-        # only when the agent times out do we add deployment, job & index to the alert
+        # only when the agent times out do we add deployment, job & id to the alert
         # attributes, so this won't trigger a recreate for other types of alerts
-        if deployment && job && index
-          agent_key = ResurrectorHelper::JobInstanceKey.new(deployment, job, index)
+        if deployment && job && id
+          agent_key = ResurrectorHelper::JobInstanceKey.new(deployment, job, id)
           @alert_tracker.record(agent_key, alert.created_at)
 
-          payload = {'jobs' => {job => [index]}}
+          payload = {'jobs' => {job => [id]}}
 
           unless director_info
             logger.error("(Resurrector) director is not responding with the status")
@@ -70,13 +70,13 @@ module Bosh::Monitor
             # queue instead, and only queue if it isn't already in the queue
             # what if we can't keep up with the failure rate?
             # - maybe not, maybe the meltdown detection takes care of the rate issue
-            logger.warn("(Resurrector) notifying director to recreate unresponsive VM: #{deployment} #{job}/#{index}")
+            logger.warn("(Resurrector) notifying director to recreate unresponsive VM: #{deployment} #{job}/#{id}")
 
             send_http_put_request(url.to_s, request)
           end
 
         else
-          logger.warn("(Resurrector) event did not have deployment, job and index: #{alert}")
+          logger.warn("(Resurrector) event did not have deployment, job and id: #{alert}")
         end
       end
 

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

@@ -3,26 +3,26 @@ module Bosh::Monitor::Plugins
 
     # Hashable tuple of the identifying properties of a job
     class JobInstanceKey
-      attr_accessor :deployment, :job, :index
+      attr_accessor :deployment, :job, :id
 
-      def initialize(deployment, job, index)
+      def initialize(deployment, job, id)
         @deployment = deployment
         @job        = job
-        @index      = index
+        @id         = id
       end
 
       def hash
-        (deployment.to_s + job.to_s + index.to_s).hash
+        (deployment.to_s + job.to_s + id.to_s).hash
       end
 
       def eql?(other)
         other.deployment == deployment &&
             other.job == job &&
-            other.index == index
+            other.id == id
       end
 
       def to_s
-        [deployment, job, index].join('/')
+        [deployment, job, id].join('/')
       end
     end
 
@@ -72,7 +72,7 @@ module Bosh::Monitor::Plugins
       def alerts_for_deployment(deployment)
         agents = @agent_manager.get_agents_for_deployment(deployment)
         keys = agents.values.map { |agent|
-          JobInstanceKey.new(agent.deployment, agent.job, agent.index)
+          JobInstanceKey.new(agent.deployment, agent.job, agent.instance_id)
         }
 
         result = {}

data/lib/bosh/monitor/runner.rb

@@ -14,6 +14,7 @@ module Bosh::Monitor
       @intervals     = Bhm.intervals
       @mbus          = Bhm.mbus
       @agent_manager = Bhm.agent_manager
+      EM.threadpool_size = Bhm.em_threadpool_size
     end
 
     def run

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.3184.1.0'
+    VERSION = '1.3189.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.3184.1.0
+  version: 1.3189.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement