bipbip 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940f0155867f0e16e1c4a7c0b7ba8b710b0a0191
-  data.tar.gz: ffa66de8788189c9774081d1e8a2fe63d085b071
+  metadata.gz: cf1d48bb34bcf5158a9389079923fff2fe8eb55f
+  data.tar.gz: d02e8c7f9b4edc8379995501390e366507e1a73e
 SHA512:
-  metadata.gz: 897fd316611fdd5a84e41299381098b099edb3a1d531a92c950a8ee74aed2352dc3dc96017d127ab700ea75119610fb16e72f79e70ba080584bb8e27b601d10a
-  data.tar.gz: 3258dfbf44197e4d6c49a7094396a64b9d6a826a2e794c93c7954f5ae38c23a48ec727ca9bc460dffe912872012ce004f59050cdc5afd176eacc1804766e40a2
+  metadata.gz: c108d106ff9a506aefbf4b39bcf0d0e90082360f5954b41dc835527c8e0e0bedd934dc3da1acd7dc05f1a42b44dd2de285e15444c01f82f2b884d3b2b688d4ef
+  data.tar.gz: 20978afd5260bd4cd32b3ef33c7496ef2411e5b54a90c440e8e0b6e420dea52c238ab5c7baf09638af14fd57b8d9e03dc97850193ce2bea920a8274b0d2034ff

data/README.md

@@ -99,6 +99,7 @@ These service plugins ship with bipbip:
 - postfix
 - elasticsearch
 - puppet
+- command
 
 Please refer to [/docu/services.md](/docu/services.md) for information about the individual plugins and their configuration options.
 

data/lib/bipbip/plugin.rb

@@ -68,9 +68,9 @@ module Bipbip
     end
 
     def source_identifier
-      identifier = Bipbip.fqdn
+      identifier = Bipbip.fqdn + '::' + metric_group
       unless config.empty?
-        identifier += '::' + config.values.first.to_s
+        identifier += '::' + config.values.first.to_s.gsub(/[^\w]/, '_')
       end
       identifier
     end

data/lib/bipbip/plugin/command.rb

@@ -0,0 +1,67 @@
+require 'open3'
+require 'json'
+
+module Bipbip
+
+  class Plugin::Command < Plugin
+
+    attr_accessor :schema
+
+    def metrics_schema
+      @schema ||= find_schema
+    end
+
+    def monitor
+      Hash[command_output.map { |metric, value| [metric, metric_value(value)] }]
+    end
+
+    private
+
+    def metric_value(value)
+      value = value['value'] if detect_operation_mode(value) == :advanced
+      value = 1 if value == 'true' or value == true
+      value = 0 if value == 'false' or value == false
+      value
+    end
+
+    def find_schema
+      command_output.map do |metric, value|
+        case detect_operation_mode(value)
+          when :simple
+            {:name => "#{metric}", :type => 'gauge'}
+          when :advanced
+            {:name => "#{metric}", :type => value['type'], :unit => value['unit']}
+        end
+      end
+    end
+
+    def detect_operation_mode(value)
+      {true => :advanced, false => :simple}.fetch(value.is_a?(Hash))
+    end
+
+    def command_output
+      JSON.parse(exec_command)
+    end
+
+    def exec_command
+      command = config['command'].to_s
+
+      output_stdout = output_stderr = exit_code = nil
+      Open3.popen3(command) { |stdin, stdout, stderr, wait_thr|
+        output_stdout = stdout.read.chomp
+        output_stderr = stderr.read.chomp
+        exit_code = wait_thr.value
+      }
+
+      unless exit_code.success?
+        message = ['Command execution failed:', command]
+        message.push 'STDOUT:', output_stdout unless output_stdout.empty?
+        message.push 'STDERR:', output_stderr unless output_stderr.empty?
+        raise message.join("\n")
+      end
+
+      output_stdout
+    end
+
+  end
+end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.5.9'
+  VERSION = '0.5.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -225,6 +225,7 @@ files:
 - lib/bipbip/helper.rb
 - lib/bipbip/plugin.rb
 - lib/bipbip/plugin/apache2.rb
+- lib/bipbip/plugin/command.rb
 - lib/bipbip/plugin/elasticsearch.rb
 - lib/bipbip/plugin/fastcgi_php_apc.rb
 - lib/bipbip/plugin/fastcgi_php_fpm.rb