bipbip 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3d5c73ae182538b9124ccc2566a2fb804e3e68
-  data.tar.gz: 54b73d42901422967d03df4312fea8cfcd7cbfef
+  metadata.gz: fe7f32a299c9d06b71d8599033430b810b91e365
+  data.tar.gz: 65275e6d51c12f947433bffd47d8b0fa915f9b2a
 SHA512:
-  metadata.gz: cf4f339ec65ee85308adfe30fff5be549974d45ff509671745703fd3ca9fd2777ea730e39de6f94f9593b9eca6d3f1daafeca2c914c5d222e68ed9cc7ed9b2fb
-  data.tar.gz: ae58a1394f344b64992cd2c5ef51ca9c3aaa5724a8cd70f83b2c38dfcade088d26e5e6b2b65b413ca221e534ffb5257015fe8d2237eb72a43935456c8f0dfa7c
+  metadata.gz: 81fcc4bbced95d1a6fa34739fec24e94a790937be7b3ac9c111dd82963003580e931d67b113dc757df9cbd6c54b9fafb9b89dbc00c6a9ce2c7ac739985660ee2
+  data.tar.gz: 381a7c4e18a31068c755fd64f43430d34dd647fca4682f2fb29f088e5e533a981fcb9d0c1dc5541f065d6641143e5e43eb3f001444fa79ff212355520906fd3c

data/README.md

@@ -106,6 +106,10 @@ services:
       regexp: segfault
 ```
 
+Optional configuration common to all plugins:
+- `frequency`: Override global frequency per plugin
+- `metric_group`: Use metric group name different from plugin name. Useful when using the same plugin twice.
+
 Include configuration
 ---------------------
 In your configuration you can specify a directory to include service configurations from:
@@ -121,8 +125,6 @@ hostname: localhost
 port: 11211
 ```
 
-You can also set an override frequency per service in the main config or in these included configs.
-
 Plugins
 -------
 #### fastcgi-php-fpm

data/lib/bipbip/agent.rb

@@ -56,16 +56,17 @@ module Bipbip
       services = config['services'].to_a
       if config['include']
         include_path = File.expand_path(config['include'].to_s, File.dirname(config_file))
-        
+
         files = Dir[include_path + '/**/*.yaml', include_path + '/**/*.yml']
         services += files.map { |file| YAML.load(File.open(file)) }
-      end      
-      
+      end
+
       @plugins = services.map do |service|
-        service_name = service['plugin'].to_s
-        frequency = service['frequency'].nil? ? config['frequency'] : service['frequency'].to_i
-        service_config = service.reject { |key, value| ['plugin','frequency'].include?(key) }
-        Bipbip::Plugin.factory(service_name, service_config, frequency)
+        plugin_name = service['plugin']
+        metric_group = service['metric_group']
+        frequency = service['frequency'].nil? ? config['frequency'] : service['frequency']
+        plugin_config = service.reject { |key, value| ['plugin', 'frequency', 'metric_group'].include?(key) }
+        Bipbip::Plugin.factory(plugin_name, plugin_config, frequency, metric_group)
       end
 
       storages = config['storages'].to_a

data/lib/bipbip/plugin.rb

@@ -5,16 +5,18 @@ module Bipbip
 
     attr_accessor :name
     attr_accessor :config
+    attr_accessor :metric_group
 
-    def self.factory(name, config, frequency)
+    def self.factory(name, config, frequency, metric_group = nil)
       require "bipbip/plugin/#{Bipbip::Helper.name_to_filename(name)}"
-      Plugin::const_get(Bipbip::Helper.name_to_classname(name)).new(name, config, frequency)
+      Plugin::const_get(Bipbip::Helper.name_to_classname(name)).new(name, config, frequency, metric_group)
     end
 
-    def initialize(name, config, frequency)
+    def initialize(name, config, frequency, metric_group = nil)
       @name = name.to_s
       @config = config.to_hash
       @frequency = frequency.to_i
+      @metric_group = (metric_group || name).to_s
     end
 
     def run(storages)
@@ -29,9 +31,9 @@ module Bipbip
             time = Time.now
             data = monitor
             if data.empty?
-              raise "#{name} #{metric_identifier}: Empty data"
+              raise "#{name} #{source_identifier}: Empty data"
             end
-            Bipbip.logger.debug "#{name} #{metric_identifier}: Data: #{data}"
+            Bipbip.logger.debug "#{name} #{source_identifier}: Data: #{data}"
             storages.each do |storage|
               storage.store_sample(self, time, data)
             end
@@ -39,7 +41,7 @@ module Bipbip
             interruptible_sleep (frequency - (Time.now - time))
           end
         rescue => e
-          Bipbip.logger.error "#{name} #{metric_identifier}: Error getting data: #{e.message}"
+          Bipbip.logger.error "#{name} #{source_identifier}: Error getting data: #{e.message}"
           interruptible_sleep retry_delay
           retry_delay += frequency if retry_delay < frequency * 10
           retry
@@ -61,7 +63,7 @@ module Bipbip
       @frequency
     end
 
-    def metric_identifier
+    def source_identifier
       identifier = Bipbip.fqdn
       unless config.empty?
         identifier += '::' + config.values.first.to_s

data/lib/bipbip/storage/copperegg.rb

@@ -16,10 +16,10 @@ module Bipbip
         exit 1
       end
 
-      metric_group = @metric_groups.detect { |m| m.name == plugin.name }
+      metric_group = @metric_groups.detect { |m| m.name == plugin.metric_group }
       if metric_group.nil? || !metric_group.is_a?(CopperEgg::MetricGroup)
-        Bipbip.logger.info "Creating copperegg metric group `#{plugin.name}`"
-        metric_group = CopperEgg::MetricGroup.new(:name => plugin.name, :label => plugin.name, :frequency => plugin.frequency)
+        Bipbip.logger.info "Creating copperegg metric group `#{plugin.metric_group}`"
+        metric_group = CopperEgg::MetricGroup.new(:name => plugin.metric_group, :label => plugin.metric_group, :frequency => plugin.frequency)
       end
       metric_group.frequency = plugin.frequency
       metric_group.metrics = plugin.metrics_schema.map do |sample|
@@ -31,16 +31,16 @@ module Bipbip
       end
       metric_group.save
 
-      dashboard = @dashboards.detect { |d| d.name == plugin.name }
+      dashboard = @dashboards.detect { |d| d.name == plugin.metric_group }
       if dashboard.nil?
-        Bipbip.logger.info "Creating copperegg dashboard `#{plugin.name}`"
+        Bipbip.logger.info "Creating copperegg dashboard `#{plugin.metric_group}`"
         metrics = metric_group.metrics || []
-        CopperEgg::CustomDashboard.create(metric_group, :name => plugin.name, :identifiers => nil, :metrics => metrics)
+        CopperEgg::CustomDashboard.create(metric_group, :name => plugin.metric_group, :identifiers => nil, :metrics => metrics)
       end
     end
 
     def store_sample(plugin, time, data)
-      CopperEgg::MetricSample.save(plugin.name, plugin.metric_identifier, time.to_i, data)
+      CopperEgg::MetricSample.save(plugin.metric_group, plugin.source_identifier, time.to_i, data)
     end
 
     def _load_metric_groups

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg