munin2graphite 0.1.0 → 0.1.1

data/Gemfile

@@ -8,6 +8,7 @@ gem "rufus-scheduler", "2.0.10"
 gem "daemons", "1.1.4"
 gem "parseconfig"
 gem "munin-ruby", "~> 0.2.1"
+gem "json", "~> 1.6.3"
 
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/munin2graphite

@@ -6,7 +6,7 @@ require 'munin2graphite'
 if ARGV.last && File.stat(ARGV.last)
   Munin2Graphite::Config.config_file = ARGV.last
 else
-  Munin2Graphite::Config.config_file = "/etc/conf/munin2graphite.conf"
+  Munin2Graphite::Config.config_file = "/etc/munin2graphite/munin2graphite.conf"
 end
 
 Thread.abort_on_exception = true 

data/lib/munin2graphite/scheduler.rb

@@ -95,9 +95,14 @@ module Munin2Graphite
             categories = {}
             metrics.each do |metric|
               metrics_threads << Thread.new do
-                local_munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
-                values[metric] =  local_munin.fetch metric
-                local_munin.disconnect
+                begin
+                  local_munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+                  values[metric] =  local_munin.fetch metric
+                  local_munin.disconnect
+                rescue Exception
+                  config.log.error("Error when trying to obtain values for #{metric}. Ignored")
+                  config.log.error $!
+                end
               end            
             end 
             metrics_threads.each {|i| i.join;i.kill}
@@ -142,11 +147,15 @@ module Munin2Graphite
             config.log.info("Configuring #{metric}")
             Graphite::Base.set_connection(config["carbon_hostname"])
             Graphite::Base.authenticate(config["graphite_user"],config["graphite_password"])
-            munin_graph = MuninGraph.graph_for munin.config(metric,true)[metric]
-            
-            munin_graph.config = config.merge("metric" => "#{metric}","hostname" => node.split(".").first)
-            config.log.debug("Saving graph #{metric}")
-            munin_graph.to_graphite.save!
+            begin 
+              munin_graph = MuninGraph.graph_for munin.config(metric,true)[metric]
+              munin_graph.config = config.merge("metric" => "#{metric}","hostname" => node.split(".").first)
+              config.log.debug("Saving graph #{metric}")
+              munin_graph.to_graphite.save!
+            rescue Exception
+              config.log.error("Error when trying to obtain graph conf, for #{metric}. Ignored")
+              config.log.error $!
+            end
           end
         end
         config.log.info("End   : Sending Graph Information to Graphite for worker #{worker}, elapsed time (#{Time.now - time}s)")

data/munin2graphite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Fernandez (magec)"]
-  s.date = "2011-12-09"
+  s.date = "2011-12-12"
   s.description = "This gem will install as a daemon and can be used to connect to a graphite and a carbon backend. It will not only post the data for the metrics but also create graphs into graphite, by means of a translation from munin-node."
   s.email = "jfernandezperez@gmail.com"
   s.executables = ["munin2graphite", "munin2graphite-daemon"]
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<daemons>, ["= 1.1.4"])
       s.add_runtime_dependency(%q<parseconfig>, [">= 0"])
       s.add_runtime_dependency(%q<munin-ruby>, ["~> 0.2.1"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.6.3"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -79,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<daemons>, ["= 1.1.4"])
       s.add_dependency(%q<parseconfig>, [">= 0"])
       s.add_dependency(%q<munin-ruby>, ["~> 0.2.1"])
+      s.add_dependency(%q<json>, ["~> 1.6.3"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -88,6 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<daemons>, ["= 1.1.4"])
     s.add_dependency(%q<parseconfig>, [">= 0"])
     s.add_dependency(%q<munin-ruby>, ["~> 0.2.1"])
+    s.add_dependency(%q<json>, ["~> 1.6.3"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin2graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &14306040 !ruby/object:Gem::Requirement
+  requirement: &16071040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *14306040
+  version_requirements: *16071040
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &14305560 !ruby/object:Gem::Requirement
+  requirement: &16070500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *14305560
+  version_requirements: *16070500
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &14305080 !ruby/object:Gem::Requirement
+  requirement: &16047220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14305080
+  version_requirements: *16047220
 - !ruby/object:Gem::Dependency
   name: munin-ruby
-  requirement: &14304600 !ruby/object:Gem::Requirement
+  requirement: &16046620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *14304600
+  version_requirements: *16046620
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &16046020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *16046020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14304120 !ruby/object:Gem::Requirement
+  requirement: &16045420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14304120
+  version_requirements: *16045420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14303640 !ruby/object:Gem::Requirement
+  requirement: &16044760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *14303640
+  version_requirements: *16044760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14303160 !ruby/object:Gem::Requirement
+  requirement: &16044160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *14303160
+  version_requirements: *16044160
 description: This gem will install as a daemon and can be used to connect to a graphite
   and a carbon backend. It will not only post the data for the metrics but also create
   graphs into graphite, by means of a translation from munin-node.
@@ -144,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -924376751011725776
+      hash: 3426633112127001197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: