bipbip 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917ccfd6eff250cdd46a1c9cabe716a275fce7d6
-  data.tar.gz: f2a20fe017f894955c0a1b217adcc6d9f6bb4326
+  metadata.gz: 8903502222cc5f314d6127cd5426ee671bd37ad6
+  data.tar.gz: 8acc5e65784a3df1dae968a0951f0033ec690bdb
 SHA512:
-  metadata.gz: 6334d3f0fdd5eb530375caaaf17f50970aba5226057f1892bb772c76eff8a61e32ad42b26c9bae5f1f2b94b427ad3fa3a5dfaeb149cd0faa1a81889fd1aab5b2
-  data.tar.gz: 744c1b6b6066c4bd5e4c724d6faaded7a55c934db1b258f67c7a518b9db87f6926d7455448d13ee0c8f0b548188fcf96ab9265379d8b2aa10ce0e73c8122cc83
+  metadata.gz: f0ea82bd53a4b1e1b63510228ef7524db047e9f2e8d22e0e7dbdd0858409e210c5601ad6aac295dbbf5123a55aafbdb68474db346be2a27b893a90e27d03e43d
+  data.tar.gz: e9d8e3765e4ef52ef388353dd28463427921d4f0c52aa6fe86c89c1f7b29b6c9ef932065cde8e65500dbf401552b61a172e84b6c782f8159aee73f6ac987b99f

data/README.md

@@ -46,6 +46,12 @@ services:
     plugin: gearman
     hostname: localhost
     port: 4730
+  -
+    plugin: apache2
+    url: http://localhost:80/server-status?auto
+  -
+    plugin: nginx
+    url: http://localhost:80/server-status
 ```
 
 Include configuration
@@ -58,7 +64,7 @@ This will include files from `/etc/bipbip/services.d/` and load them into the `s
 
 You could then add a file `/etc/bipbip/services.d/memcached.yml`:
 ```yml
-plugin: Memcached
+plugin: memcached
 hostname: localhost
 port: 11211
 ```

data/lib/bipbip/agent.rb

@@ -57,8 +57,9 @@ module Bipbip
       @services.each do |service|
         plugin_name = service['plugin']
         plugin = plugin_factory(plugin_name)
+        service_config = service.select { |key| !['plugin'].include?(key) }
         Bipbip.logger.info "Starting plugin #{plugin_name}"
-        @plugin_pids.push plugin.run(service, @frequency)
+        @plugin_pids.push plugin.run(service_config, @frequency)
       end
 
       p Process.waitall
@@ -88,8 +89,8 @@ module Bipbip
       file_name = plugin_name.tr('-', '_')
       require "bipbip/plugin/#{file_name}"
 
-      class_name = plugin_name.split('-').each { |part| part[0] = part[0].chr.upcase }.join
-      Plugin::const_get(class_name).new
+      class_name = plugin_name.split('-').map{|w| w.capitalize}.join
+      Plugin::const_get(class_name).new(plugin_name)
     end
 
     def load_config(config_file)

data/lib/bipbip/plugin.rb

@@ -3,7 +3,8 @@ module Bipbip
   class Plugin
     include InterruptibleSleep
 
-    def initialize
+    def initialize(name)
+      @name = name.to_s
     end
 
     def run(server, frequency)
@@ -43,11 +44,15 @@ module Bipbip
     end
 
     def name
-      self.class.name.split('::').last
+      @name
     end
 
     def metric_identifier(server)
-      Bipbip.fqdn + '::' + server['hostname']
+      identifier = Bipbip.fqdn
+      unless server.empty?
+        identifier += '::' + server.values.first
+      end
+      identifier
     end
 
     def metrics_names

data/lib/bipbip/plugin/apache2.rb

@@ -0,0 +1,29 @@
+module Bipbip
+
+  class Plugin::Apache2 < Plugin
+
+    def metrics_schema
+      [
+          {:name => 'request_per_sec', :type => 'ce_gauge', :unit => 'Requests'},
+          {:name => 'busy_workers', :type => 'ce_gauge', :unit => 'Workers'},
+      ]
+    end
+
+    def monitor(server)
+      uri = URI.parse(server['url'])
+      response = Net::HTTP.get_response(uri)
+
+      raise "Invalid response from server at #{server['url']}" unless response.code == '200'
+
+      astats = response.body.split(/\r*\n/)
+
+      ainfo = {}
+      astats.each do |row|
+        name, value = row.split(': ')
+        ainfo[name] = value
+      end
+
+      {:request_per_sec => ainfo['ReqPerSec'].to_f, :busy_workers => ainfo['BusyWorkers'].to_i}
+    end
+  end
+end

data/lib/bipbip/plugin/nginx.rb

@@ -0,0 +1,23 @@
+module Bipbip
+
+  class Plugin::Nginx < Plugin
+
+    def metrics_schema
+      [
+          {:name => 'connections_requested', :type => 'ce_counter', :unit => 'Requests'},
+      ]
+    end
+
+    def monitor(server)
+      uri = URI.parse(server['url'])
+      response = Net::HTTP.get_response(uri)
+
+      raise "Invalid response from server at #{server['url']}" unless response.code == "200"
+
+      nstats = response.body.split(/\r*\n/)
+      connections_requested = nstats[2].lstrip.split(/\s+/)[2].to_i
+
+      {:connections_requested => connections_requested}
+    end
+  end
+end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Cargo Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -92,10 +92,11 @@ files:
 - bin/bipbip
 - lib/bipbip/agent.rb
 - lib/bipbip/interruptible_sleep.rb
-- lib/bipbip/plugin/foo_bar.rb
+- lib/bipbip/plugin/apache2.rb
 - lib/bipbip/plugin/gearman.rb
 - lib/bipbip/plugin/memcached.rb
 - lib/bipbip/plugin/mysql.rb
+- lib/bipbip/plugin/nginx.rb
 - lib/bipbip/plugin/redis.rb
 - lib/bipbip/plugin.rb
 - lib/bipbip/version.rb

data/lib/bipbip/plugin/foo_bar.rb

@@ -1,30 +0,0 @@
-require 'memcached'
-class MemcachedClient < Memcached
-end
-
-module Bipbip
-
-  class Plugin::FooBar < Plugin
-
-    def metrics_schema
-      [
-          {:name => 'cmd_get', :type => 'ce_counter'},
-          {:name => 'cmd_set', :type => 'ce_counter'},
-          {:name => 'get_misses', :type => 'ce_counter'},
-          {:name => 'limit_maxbytes', :type => 'ce_gauge', :unit => 'b'},
-          {:name => 'bytes', :type => 'ce_gauge', :unit => 'b'},
-      ]
-    end
-
-    def monitor(server)
-      cache = MemcachedClient.new(server['hostname'] + ':' + server['port'].to_s)
-      stats = cache.stats
-
-      data = {}
-      metrics_names.each do |key|
-        data[key] = stats[key.to_sym].shift.to_i
-      end
-      data
-    end
-  end
-end