bipbip 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd18dcd1d00c79e638ead384695c860ebff532d0
-  data.tar.gz: 069e950457a7dac11ca8e1c8fcccbfdd9fd3c9e5
+  metadata.gz: ebd236b49b6ae015737b235b91ccc37957c4e003
+  data.tar.gz: e11213f8f95ea6d62e4f074ae1a51d4926139f3f
 SHA512:
-  metadata.gz: c5c5b5d91a5825bfffd6444f4bf5f30f8a12348287897e81496dbd631f11abd5d688ba027fa489996a96710c5b183c7709ddf9c846ca0f46ea3a88a4373c1d68
-  data.tar.gz: 14ddb0ffcfd2f9e3a5624d33a35f9cdbe4410660c72c798784bbc556eadb4ee2d9ff41c1cedf156cb5f72c93f4c56a9afda765830e67814ca7a58449c5d971d1
+  metadata.gz: a299ac1d5dd426a73b07f32a68bed3035289347895b7902a41a7951017bebb0aa5bb37f237f5ca8e2f34cdd0e68b3db25225842b1e9bf4cd79383f41c0b9af92
+  data.tar.gz: a2f6f16f4e0bf25f49f195ef00ce794e9fb9f12b6a12050431a8752d4fae2f836395252577ec3070c3f8df7eab1a8181d218cad2c34ec754eaab61e9b86843cb

data/README.md

@@ -22,6 +22,7 @@ Example with CopperEgg as a storage and service plugins for *memcached* and *mys
 logfile: /var/log/bipbip.log
 loglevel: INFO
 frequency: 15
+tags: ['foo', 'bar']
 include: services.d/
 
 storages:
@@ -44,8 +45,9 @@ Configuration options:
 - **logfile** (optional): Path to log file. If not provided will log to `STDOUT`.
 - **loglevel** (optional): One of [Logger's levels](http://www.ruby-doc.org/stdlib-2.1.0/libdoc/logger/rdoc/Logger.html). Defaults to `INFO`.
 - **frequency** (optional): How often to measure metrics (in seconds). Defaults to `60`.
+- **tags** (optional): Tags for all service plugins.
 - **include** (optional): Optional directory where to look for *service plugin configurations* (relative to config file).
-- **storage**: List of storages to send data to.
+- **storages**: List of storages to send data to.
 - **services**: List of service plugins from which to gather metrics.
 
 The `include` directive allows to set a directory from which to load additional *service plugin* configurations. The above example could also be structured with multiple files:
@@ -66,6 +68,7 @@ port: 11211
 The configuration for each *service plugin* is described further down.
 The following options are available for all plugins:
 - `frequency`: Override the global measurement frequency.
+- `tags`: Additional tags for this specific service.
 - `metric_group`: Use a metric group name different from the plugin's name. Useful when using the same plugin twice.
 
 Storages

data/lib/bipbip.rb

@@ -1,7 +1,7 @@
 module Bipbip
   require 'rubygems'  # For ruby < 1.9
 
-  require 'copperegg'
+  require 'copperegg/revealmetrics'
   require 'yaml'
   require 'json/pure'
   require 'logger'

data/lib/bipbip/agent.rb

@@ -44,6 +44,7 @@ module Bipbip
       @interrupted = false
       until @interrupted
         pid = Process.wait(-1)
+        next if @interrupted
         plugin = plugin_by_pid(pid)
         Bipbip.logger.error "Plugin #{plugin.name} with config #{plugin.config} died. Respawning..."
         sleep(PLUGIN_RESPAWN_DELAY)
@@ -59,7 +60,7 @@ module Bipbip
           'frequency' => 60,
           'include' => nil,
           'services' => [],
-          'services' => [],
+          'tags' => [],
       }.merge(config)
 
       Bipbip.logger = Logger.new(config['logfile'])
@@ -77,8 +78,9 @@ module Bipbip
         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)
+        tags = config['tags'].to_a + service['tags'].to_a
+        plugin_config = service.reject { |key, value| ['plugin', 'frequency', 'tags', 'metric_group'].include?(key) }
+        Bipbip::Plugin.factory(plugin_name, plugin_config, frequency, tags, metric_group)
       end
 
       storages = config['storages'].to_a

data/lib/bipbip/plugin.rb

@@ -6,17 +6,19 @@ module Bipbip
     attr_accessor :name
     attr_accessor :config
     attr_accessor :metric_group
+    attr_accessor :tags
     attr_accessor :pid
 
-    def self.factory(name, config, frequency, metric_group = nil)
+    def self.factory(name, config, frequency, tags, 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, metric_group)
+      Plugin::const_get(Bipbip::Helper.name_to_classname(name)).new(name, config, frequency, tags, metric_group)
     end
 
-    def initialize(name, config, frequency, metric_group = nil)
+    def initialize(name, config, frequency, tags = nil, metric_group = nil)
       @name = name.to_s
       @config = config.to_hash
       @frequency = frequency.to_f
+      @tags = tags.to_a
       @metric_group = (metric_group || name).to_s
     end
 

data/lib/bipbip/storage.rb

@@ -23,5 +23,11 @@ module Bipbip
       raise 'Missing method store_sample'
     end
 
+    private
+
+    def log(severity, message)
+      Bipbip.logger.add(severity, message, "#{name}")
+    end
+
   end
 end

data/lib/bipbip/storage/copperegg.rb

@@ -4,67 +4,96 @@ module Bipbip
 
     def initialize(name, config)
       super(name, config)
-      CopperEgg::Api.apikey = config['api_key']
+      ::Copperegg::Revealmetrics::Api.apikey = config['api_key']
     end
 
     def setup_plugin(plugin)
       @metric_groups ||= _load_metric_groups
       @dashboards ||= _load_dashboards
+      @tags ||= _load_tags
 
       if ![5, 15, 60, 300, 900, 3600, 21600].include?(plugin.frequency)
-        Bipbip.logger.fatal "Copperegg cannot use frequency #{plugin.frequency}"
+        log(Logger::FATAL, "Cannot use frequency #{plugin.frequency}")
         exit 1
       end
 
       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.metric_group}`"
-        metric_group = CopperEgg::MetricGroup.new(:name => plugin.metric_group, :label => plugin.metric_group, :frequency => plugin.frequency)
+      if metric_group.nil? || !metric_group.is_a?(::Copperegg::Revealmetrics::MetricGroup)
+        log(Logger::INFO, "Creating metric group `#{plugin.metric_group}`")
+        metric_group = ::Copperegg::Revealmetrics::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|
         {
-            :name => sample[:name],
-            :type => 'ce_' + sample[:type],
-            :unit => sample[:unit],
+          :name => sample[:name],
+          :type => 'ce_' + sample[:type],
+          :unit => sample[:unit],
         }
       end
+      log(Logger::INFO, "Updating metric group `#{plugin.metric_group}`")
       metric_group.save
 
+      plugin.tags.each do |tag_name|
+        tag = @tags.detect { |t| t.name == tag_name }
+        if tag.nil?
+          log(Logger::INFO, "Creating tag `#{tag_name}`")
+          tag = ::Copperegg::Revealmetrics::Tag.new(:name => tag_name)
+        end
+        object_identifier = plugin.source_identifier
+        unless tag.objects.include?(object_identifier)
+          log(Logger::INFO, "Attaching object to tag `#{tag_name}`")
+          tag.objects << object_identifier
+          store_sample(plugin, Time.now, {}) # Need to store a sample before we can tag a custom object
+        end
+        log(Logger::INFO, "Updating tag `#{tag_name}`")
+        tag.save
+      end
+
       dashboard = @dashboards.detect { |d| d.name == plugin.metric_group }
       if dashboard.nil?
-        Bipbip.logger.info "Creating copperegg dashboard `#{plugin.metric_group}`"
+        log(Logger::INFO, "Creating dashboard `#{plugin.metric_group}`")
         metrics = metric_group.metrics || []
-        CopperEgg::CustomDashboard.create(metric_group, :name => plugin.metric_group, :identifiers => nil, :metrics => metrics)
+        ::Copperegg::Revealmetrics::CustomDashboard.create(metric_group, :name => plugin.metric_group, :identifiers => nil, :metrics => metrics)
       end
     end
 
     def store_sample(plugin, time, data)
-      response = CopperEgg::MetricSample.save(plugin.metric_group, plugin.source_identifier, time.to_i, data)
+      response = ::Copperegg::Revealmetrics::MetricSample.save(plugin.metric_group, plugin.source_identifier, time.to_i, data)
       if response.code != '200'
         raise("Cannot store copperegg data `#{data}`. Response code `#{response.code}`, message `#{response.message}`, body `#{response.body}`")
       end
     end
 
     def _load_metric_groups
-      Bipbip.logger.info 'Loading copperegg metric groups'
-      metric_groups = CopperEgg::MetricGroup.find
+      log(Logger::INFO, 'Loading metric groups')
+      metric_groups = ::Copperegg::Revealmetrics::MetricGroup.find
       if metric_groups.nil?
-        Bipbip.logger.fatal 'Cannot load copperegg metric groups'
+        log(Logger::FATAL, 'Cannot load metric groups')
         exit 1
       end
       metric_groups
     end
 
     def _load_dashboards
-      Bipbip.logger.info 'Loading copperegg dashboards'
-      dashboards = CopperEgg::CustomDashboard.find
+      log(Logger::INFO, 'Loading dashboards')
+      dashboards = ::Copperegg::Revealmetrics::CustomDashboard.find
       if dashboards.nil?
-        Bipbip.logger.fatal 'Cannot load copperegg dashboards'
+        log(Logger::FATAL, 'Cannot load dashboards')
         exit 1
       end
       dashboards
     end
 
+    # @return [Copperegg::Revealmetrics::Tag[]]
+    def _load_tags
+      log(Logger::INFO, 'Loading tags')
+      tags = ::Copperegg::Revealmetrics::Tag.find
+      if tags.nil?
+        log(Logger::FATAL, 'Cannot load tags')
+        exit 1
+      end
+      tags
+    end
+
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.5.23'
+  VERSION = '0.5.24'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Cargo Media
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: copperegg
+  name: copperegg-revealmetrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: memcached
   requirement: !ruby/object:Gem::Requirement