bosh-monitor 1.3010.0 → 1.3012.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c48dfba9060aa17851dbd6295dcd9e04fc1fc2b
-  data.tar.gz: 03a7e4f6b1d2190eba288195e8fc8d2c18304fc2
+  metadata.gz: 62487ac6b0172fff57e088f5b5f9d99aae7448a6
+  data.tar.gz: a4ad3e5ff225d2363b9f72187805dab17c37448a
 SHA512:
-  metadata.gz: d2b5ab98419607cadf9a254ff3851bbb82861b321ca1e5c1ff316d96e966892a8ef9b371b762e0429674cfdd0210c6eba275dd842488eea6082975c6c34ee1af
-  data.tar.gz: 8f86e991151697d661b7870352e2f96c0d52264b16654822e9a164edcd849ceae4f08dafd720f754cecf873a76f042bbf6f6e167e1509ab504987c2f6642f52a
+  metadata.gz: 080c341c5942b5495188fad26ec13717801bdc3937d5deb7be622f8e2bba28c516e4501356b498d667fde09328bfed656fc76fc32918d34f61348082c82f180c
+  data.tar.gz: 9eaeb20dd17cfdbc2b54cfaaf6f11b3bde17ac96f5e9cabbcd594d50985a32a92391e8bebe1711628515935754f1ce54466c20040455cf81d4ab3d01b8710837

data/README.md

@@ -6,7 +6,6 @@ The Monitor also includes a few primary components:
 - The Agent Monitor maintains a record of known agents (by heartbeat event subscription)
 - The Director Monitor maintains a record of known agents (by director HTTP polling).
 - The Agent Analyzer that analyzes agent state periodically and generates Alerts.
-- The HTTP Server that responds to the /varz endpoint
 
 The Monitor also supports generic event processing plugins that respond to Heartbeats & Alerts.
 

data/lib/bosh/monitor.rb

@@ -74,5 +74,4 @@ require 'bosh/monitor/plugins/nats'
 require 'bosh/monitor/plugins/pagerduty'
 require 'bosh/monitor/plugins/resurrector'
 require 'bosh/monitor/plugins/tsdb'
-require 'bosh/monitor/plugins/varz'
 require 'bosh/monitor/plugins/consul_event_forwarder'

data/lib/bosh/monitor/agent_manager.rb

@@ -41,8 +41,6 @@ module Bosh::Monitor
     end
 
     def setup_events
-      Bhm.set_varz("heartbeats_received", 0)
-
       @processor.enable_pruning(Bhm.intervals.prune_events)
       Bhm.plugins.each do |plugin|
         @processor.add_plugin(lookup_plugin(plugin["name"], plugin["options"]), plugin["events"])
@@ -274,7 +272,6 @@ module Bosh::Monitor
 
       @processor.process(:alert, message)
       @alerts_processed += 1
-      Bhm.set_varz("alerts_processed", @alerts_processed)
     end
 
     def on_heartbeat(agent, message)
@@ -288,7 +285,6 @@ module Bosh::Monitor
 
       @processor.process(:heartbeat, message)
       @heartbeats_received += 1
-      Bhm.set_varz("heartbeats_received", @heartbeats_received)
     end
 
     def on_shutdown(agent, message)

data/lib/bosh/monitor/api_controller.rb

@@ -18,25 +18,6 @@ module Bosh::Monitor
       set(:dump_errors, false)
     end
 
-    helpers do
-      def protected!
-        return if authorized?
-        headers['WWW-Authenticate'] = ''
-        halt 401, 'Unauthorized'
-      end
-
-      def authorized?
-        @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-        @auth.provided? and @auth.basic? and @auth.credentials and @auth.credentials == [Bhm.http_user, Bhm.http_password]
-      end
-    end
-
-    get "/varz" do
-      protected!
-      content_type(:json)
-      Yajl::Encoder.encode(Bhm.varz, :terminator => "\n")
-    end
-
     get "/healthz" do
       body "Last pulse was #{Time.now - @heartbeat} seconds ago"
 

data/lib/bosh/monitor/config.rb

@@ -10,9 +10,8 @@ module Bosh::Monitor
     attr_accessor :agent_manager
     attr_accessor :event_processor
 
-    attr_accessor :http_port, :http_user, :http_password
+    attr_accessor :http_port
     attr_accessor :plugins
-    attr_accessor :varz
 
     attr_accessor :nats
 
@@ -27,8 +26,6 @@ module Bosh::Monitor
       @event_processor = EventProcessor.new
       @agent_manager = AgentManager.new(event_processor)
 
-      @varz = {}
-
       # Interval defaults
       @intervals.prune_events ||= 30
       @intervals.poll_director ||= 60
@@ -40,8 +37,6 @@ module Bosh::Monitor
 
       if config["http"].is_a?(Hash)
         @http_port = config["http"]["port"]
-        @http_user = config["http"]["user"]
-        @http_password = config["http"]["password"]
       end
 
       if config["event_mbus"]
@@ -57,11 +52,6 @@ module Bosh::Monitor
       end
     end
 
-    def set_varz(key, value)
-      @varz ||= {}
-      @varz[key] = value
-    end
-
     def validate_config(config)
       unless config.is_a?(Hash)
         raise ConfigError, "Invalid config format, Hash expected, #{config.class} given"

data/lib/bosh/monitor/runner.rb

@@ -95,8 +95,6 @@ module Bosh::Monitor
     def poll_director
       @logger.debug "Getting deployments from director..."
       Fiber.new { fetch_deployments }.resume
-      Bhm.set_varz("deployments_count", @agent_manager.deployments_count)
-      Bhm.set_varz("agents_count", @agent_manager.agents_count)
     end
 
     def analyze_agents

data/lib/bosh/monitor/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.3010.0'
+    VERSION = '1.3012.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-monitor
 version: !ruby/object:Gem::Version
-  version: 1.3010.0
+  version: 1.3012.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Health Monitor
-  1dcc8d
+  8d43aa
 email: support@cloudfoundry.com
 executables:
 - bosh-monitor-console
@@ -252,7 +252,6 @@ files:
 - lib/bosh/monitor/plugins/resurrector.rb
 - lib/bosh/monitor/plugins/resurrector_helper.rb
 - lib/bosh/monitor/plugins/tsdb.rb
-- lib/bosh/monitor/plugins/varz.rb
 - lib/bosh/monitor/protocols/graphite_connection.rb
 - lib/bosh/monitor/protocols/tcp_connection.rb
 - lib/bosh/monitor/protocols/tsdb_connection.rb

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

@@ -1,17 +0,0 @@
-module Bosh::Monitor
-  module Plugins
-    class Varz < Base
-      def run
-        logger.info("Varz plugin is running...")
-      end
-
-      def process(event)
-        @agents ||= {}
-        @agents[event.kind] ||= {}
-        agent_id = event.attributes["agent_id"] || "unknown"
-        @agents[event.kind][agent_id.to_s] = event.to_hash
-        Bhm.set_varz("last_agents_" + event.kind.to_s, @agents[event.kind])
-      end
-    end
-  end
-end