collectd_gearman 0.1.1 → 0.1.4

data/README.md

@@ -26,6 +26,7 @@ Options that could be defined:
 gearman_server: localhost
 gearman_key: should_be_changed
 send_gearman: /usr/bin/send_gearman
+log_file: /var/log/gearman_collectd.log
 ```
 
 ## Examples

data/lib/collectd_gearman/application.rb

@@ -38,6 +38,7 @@ module CollectdGearman
         opts.on('-s', '--server SERVER', 'Gearman server') { |v| options.gearman_server = v }
         opts.on('-k', '--key KEY', 'Gearman key') { |v| options.gearman_key = v }
         opts.on('-g', '--send_gearman BIN', 'send_gearman binary') { |v| options.send_gearman = v }
+        opts.on('-l', '--log_file FILE', 'log file') { |v| options.log_file = v }
         opts.on('-v', '--verbose', 'verbose') { |v| options.verbose = v }
 
         opts.on_tail("-h", "--help", "-H", "Display this help message.") do
@@ -91,32 +92,36 @@ module CollectdGearman
       # Plugin.Type-Instance
       # Plugin.Type.DataSource
       # Plugin.Type
-      
+
       if data["PluginInstance"] and data["TypeInstance"] and data["DataSource"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}-#{data["TypeInstance"]}.#{data["DataSource"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}-#{data["TypeInstance"]}.#{data["DataSource"]}"
       end
       
       if data["PluginInstance"] and data["TypeInstance"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}-#{data["TypeInstance"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}-#{data["TypeInstance"]}"
       end
       
       if data["PluginInstance"] and data["DataSource"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}.#{data["DataSource"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}.#{data["DataSource"]}"
       end
       
       if data["PluginInstance"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}-#{data["PluginInstance"]}.#{data["Type"]}"
       end
       
       if data["TypeInstance"] and data["DataSource"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}.#{data["Type"]}-#{data["TypeInstance"]}.#{data["DataSource"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}.#{data["Type"]}-#{data["TypeInstance"]}.#{data["DataSource"]}"
       end
       
       if data["TypeInstance"]
-        send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}.#{data["Type"]}-#{data["TypeInstance"]}"
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}.#{data["Type"]}-#{data["TypeInstance"]}"
+      end
+      
+      if data["DataSource"]
+        send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}.#{data["Type"]}.#{data["DataSource"]}"
       end
       
-      send_gearman data["Host"],data[:message],data["Severity"],"#{data["Plugin"]}.#{data["Type"]}"
+      send_gearman data["Host"],data[:message],data["Severity"],"collectd_#{data["Plugin"]}.#{data["Type"]}"
     end
     
     def self.send_gearman(host,message,severity,service)
@@ -137,6 +142,12 @@ module CollectdGearman
       
       puts cmd if options.verbose
 
+      if options.log_file
+        File.open(options.log_file,"a") do |f|
+          f << "[#{Time.now}] #{cmd}\n"
+        end
+      end
+
       system cmd
     end
     

data/lib/collectd_gearman/version.rb

@@ -1,3 +1,3 @@
 module CollectdGearman
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collectd_gearman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler