munin2graphite 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/munin2graphite/scheduler.rb

@@ -44,24 +44,27 @@ module Munin2Graphite
       workers.each do |worker|
         @munin_config[worker] = {}
         config = @config.config_for_worker(worker)
-        munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
-        nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin.nodes
-        @munin_config[worker][:nodes] = {}
-        nodes.each do |node|
-
-          @munin_config[worker][:nodes][node] = {:metrics => munin.list(node)}
-          @munin_config[worker][:nodes][node][:categories] = {}
-
-          @munin_config[worker][:nodes][node][:metrics].each do |metric|
-            @munin_config[worker][:nodes][node][:config] = munin.config(metric)[metric]
-            @munin_config[worker][:nodes][node][:raw_config] = munin.config(metric,true)[metric]
-            @munin_config[worker][:nodes][node][:categories][metric] = category_from_config(@munin_config[worker][:nodes][node][:raw_config])
+        begin
+          munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+          nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin.nodes
+          @munin_config[worker][:nodes] = {}
+          nodes.each do |node|
+            @munin_config[worker][:nodes][node] = {:metrics => munin.list(node)}
+            @munin_config[worker][:nodes][node][:categories] = {}
+            @munin_config[worker][:nodes][node][:metrics].each do |metric|
+              @munin_config[worker][:nodes][node][:config] = munin.config(metric)[metric]
+              @munin_config[worker][:nodes][node][:raw_config] = munin.config(metric,true)[metric]
+              @munin_config[worker][:nodes][node][:categories][metric] = category_from_config(@munin_config[worker][:nodes][node][:raw_config])
+            end
           end
+          munin.disconnect
+        rescue Exception
+          config.log.error("There was an error trying to obtain info from node #{config["munin_hostname"]}")
+          config.log.error $!
         end
-        munin.disconnect
       end
       @munin_config
-    end      
+    end
 
     def workers
       @workers ||= (@config.workers.empty? ?  ["global"] : @config.workers )
@@ -122,7 +125,7 @@ module Munin2Graphite
             carbon.flush
             carbon.close
            end
-        end
+        end if munin_config[worker][:nodes]
         threads.each { |i| i.join }
       end
       @config.log.info("End   getting metrics, elapsed time (#{Time.now - time}s)")
@@ -138,28 +141,31 @@ module Munin2Graphite
       workers.each do |worker|
         time = Time.now 
         config = @config.config_for_worker worker
-        config.log.info("Begin : Sending Graph Information to Graphite for worker #{worker}")         
-        munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
-        nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin.nodes
-        nodes.each do |node|
-          config.log.info("Graphs for #{node}")
-          munin.list(node).each do |metric|
-            config.log.info("Configuring #{metric}")
-            Graphite::Base.set_connection(config["carbon_hostname"])
-            Graphite::Base.authenticate(config["graphite_user"],config["graphite_password"])
-            begin 
-              munin_graph = MuninGraph.graph_for munin.config(metric,true)[metric]
+        config.log.info("Begin : Sending Graph Information to Graphite for worker #{worker}")
+	begin
+          munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+          Graphite::Base.set_connection(config["graphite_endpoint"])
+          Graphite::Base.authenticate(config["graphite_user"],config["graphite_password"])
+
+          nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin.nodes
+          nodes.each do |node|
+            config.log.info("Graphs for #{node}")
+            munin.list(node).each do |metric|
+              config.log.info("Configuring #{metric}")
+	      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
+          config.log.info("End   : Sending Graph Information to Graphite for worker #{worker}, elapsed time (#{Time.now - time}s)")
+  	  munin_graph.to_graphite.save!
+
+          munin.disconnect
+        rescue Exception
+          config.log.error("Error when trying to obtain graph conf. Ignored")
+          config.log.error $!
         end
-        config.log.info("End   : Sending Graph Information to Graphite for worker #{worker}, elapsed time (#{Time.now - time}s)")
-        munin.disconnect
       end
 
     end
@@ -173,6 +179,5 @@ module Munin2Graphite
       end
       obtain_graphs
     end
-    
   end
 end

data/munin2graphite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Fernandez (magec)"]
-  s.date = "2011-12-12"
+  s.date = "2011-12-14"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin2graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &16071040 !ruby/object:Gem::Requirement
+  requirement: &23592960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *16071040
+  version_requirements: *23592960
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &16070500 !ruby/object:Gem::Requirement
+  requirement: &23592440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *16070500
+  version_requirements: *23592440
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &16047220 !ruby/object:Gem::Requirement
+  requirement: &23591880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16047220
+  version_requirements: *23591880
 - !ruby/object:Gem::Dependency
   name: munin-ruby
-  requirement: &16046620 !ruby/object:Gem::Requirement
+  requirement: &23591340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *16046620
+  version_requirements: *23591340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16046020 !ruby/object:Gem::Requirement
+  requirement: &23590860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *16046020
+  version_requirements: *23590860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16045420 !ruby/object:Gem::Requirement
+  requirement: &23590320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16045420
+  version_requirements: *23590320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16044760 !ruby/object:Gem::Requirement
+  requirement: &23589820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *16044760
+  version_requirements: *23589820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16044160 !ruby/object:Gem::Requirement
+  requirement: &23589320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *16044160
+  version_requirements: *23589320
 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.
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3426633112127001197
+      hash: 3397207126724814962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: