munin2graphite 0.1.7 → 0.1.8

data/README.markdown

@@ -51,6 +51,7 @@ Imagine, for example, that we have two munin-nodes in two different servers (mun
     # The period for sending the metrics
     # its format is the one of rufus-scheduler    
     scheduler_metrics_period=1m
+    scheduler_graphs_period=1m
     
     # The munin node hostname and its port
     munin_hostname=localhost

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/etc/munin2graphite/munin2graphite.conf.example

@@ -11,7 +11,7 @@ carbon_port=2003
 
 # Graphite endpoint
 # This is needed to send graph data to graphite
-graphite_endpoint=http://graphite/
+graphite_endpoint=http://graphite:port/pathprefix/
 
 # prefix for the metrics usually, the user name have to be put as a prefix
 graphite_metric_prefix=

data/lib/ast_node.rb

@@ -266,7 +266,7 @@ class TypeFieldPropertyNode < FieldPropertyNode
     if @value == "DERIVE" || @value == "COUNTER"
       # The scaling is because of the minutes/(60*seconds)"
       #return "scale(nonNegativeDerivative(#{operand}),0.0166666666666667)"
-      return "scale(nonNegativeDerivative(#{operand}),0.00333333333333333)"
+      return "scaleToSeconds(nonNegativeDerivative(#{operand}),1)"
     end
     operand
   end

data/lib/carbon.rb

@@ -19,10 +19,15 @@ require 'socket'
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 class Carbon
+
+  def initialize(socket)
+    @carbon = socket
+  end
+
   def initialize(chost='localhost', port=2003)
     @carbon = TCPSocket.new(chost, port)
   end
-  
+
   def send(msg)
     @carbon.write(msg)
   end

data/lib/graphite/base.rb

@@ -6,13 +6,17 @@ module Graphite
 
     # connection instance (shared with every instance of the class)
     def self.connection      
-      @@init_header ||= {}      
-      @@connection ||= Net::HTTP.new(@@endpoint)
+      @init_header ||= {}
+      @@connection ||= begin
+        endpoint_uri = URI.parse(@@endpoint)
+        @@path = endpoint_uri.path
+        Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
+      end
     end
 
     # If the operation needs authentication you have to call this first
     def self.authenticate(user = @@user,password = @@password)
-      response = self.connection.post("/account/login","nextPage=/&password=#{password}&username=#{user}")
+      response = self.connection.post(@@path + "account/login","nextPage=/&password=#{password}&username=#{user}")
       @@init_header =  {"Cookie" => response.get_fields('Set-Cookie').first}
     end
 
@@ -24,7 +28,7 @@ module Graphite
     
     # Get
     def self.get(path,args)      
-      self.connection.get(path + "?" + args.map { |i,j| i.to_s + "=" + j }.join("&"),@@init_header)
+      self.connection.get(@@path + path + "?" + args.map { |i,j| i.to_s + "=" + j }.join("&"),@@init_header)
     end
   end
 end

data/lib/munin2graphite/scheduler.rb

@@ -16,6 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 require 'rufus/scheduler'
+require 'thread'
 module Munin2Graphite
   ##
   # This class holds the main scheduler of the system, it will perform the applicacion loops
@@ -27,6 +28,10 @@ module Munin2Graphite
       @config = config
     end
 
+    def carbon=(socket)
+      @carbon = Carbon.new(socket)
+    end
+
     def category_from_config(config)
       config.each_line do |configline|
         if configline =~ /^graph_category ([\w\-_\.]+)$/
@@ -41,35 +46,53 @@ module Munin2Graphite
       @munin_config = {}
       @config.log.info("Obtaining metrics configuration")
       @munin_config[:workers] = []
+      semaphore = Mutex.new
+      threads = []
       workers.each do |worker|
-        current_config = {}
-        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
-        current_config[:nodes] = {}
-        nodes.each do |node|
-          metrics = munin.list(node)
-          current_config[:nodes][node] = { :metrics => {} }
-          metrics.each do |metric|
-            begin
-              raw_config = munin.config(metric,true)[metric]
-              category = category_from_config(raw_config)
-              current_config[:nodes][node][:metrics][metric] = {
-                :config => munin.config(metric)[metric],
-                :raw_config => raw_config,
-                :category => category
-              }
-            rescue Exception
-              config.log.error("Error when trying to obtain graph conf. Ignored (config was #{raw_config})")
+        threads << Thread.new do 
+          current_config = {}
+          config = @config.config_for_worker(worker)
+          munin_worker  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+          nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin_worker.nodes
+          current_config[:nodes] = {}
+          semaphore_nodes = Mutex.new
+          threads_nodes = []
+          nodes.each do |node|
+            threads_nodes << Thread.new do
+              munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+              metrics = munin.list(node)
+              config.log.info("Config for node #{worker}::#{node}")
+              semaphore_nodes.synchronize do 
+                current_config[:nodes][node] = { :metrics => {} }
+              end
+              metrics.each do |metric|
+                begin
+                  raw_config = munin.config(metric,true)[metric]
+                  category = category_from_config(raw_config)
+                  semaphore_nodes.synchronize do 
+                    current_config[:nodes][node][:metrics][metric] = {
+                      :config => munin.config(metric)[metric],
+                      :raw_config => raw_config,
+                      :category => category
+                    }
+                  end
+                rescue Exception
+                  config.log.error("Error when trying to obtain graph conf for #{worker}::#{node}::#{metric} Ignored")
+                end
+              end
             end
           end
+          threads_nodes.each { |i| i.join }
+          #       @config.log.debug(current_config.inspect)
+          semaphore.synchronize do 
+            @munin_config[worker] = current_config
+            @munin_config[:workers] << worker
+          end
+          munin_worker.disconnect
+          config.log.info("Config for #{worker} obtained")
         end
-        #       @config.log.debug(current_config.inspect)
-        @munin_config[worker] = current_config
-        @munin_config[:workers] << worker
-        munin.disconnect
       end
-#      @config.log.debug(@munin_config.inspect)
+      threads.each { |i| i.join }
       @munin_config
     end
 
@@ -102,21 +125,24 @@ module Munin2Graphite
               local_munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
               values[metric] =  local_munin.fetch metric
               local_munin.disconnect
-            rescue
+            rescue Exception => e
               @config.log.error("There was a problem when getting the metric #{metric} for #{node} , Ignored")
+              @config.log.error(e.message)
+              @config.log.error(e.backtrace.inspect)
             end
           end
         end
-        metrics_threads.each {|i| i.join;i.kill}
+        metrics_threads.each {|i| i.join}
         config.log.debug(values.inspect)
         config.log.info("Done with: #{node} (#{Time.now - metric_time} s)")
-        carbon = Carbon.new(config["carbon_hostname"],config["carbon_port"])
+        carbon = @carbon || Carbon.new(config["carbon_hostname"],config["carbon_port"])
         string_to_send = ""
         values.each do |metric,results|          
           category = node_info[:metrics][metric][:category] 
           results.each do |k,v|
             v.each do |c_metric,c_value|
-              string_to_send += "#{node_name}.#{category}.#{metric}.#{c_metric} #{c_value} #{Time.now.to_i}\n".gsub("-","_")  if c_value != "U"
+              name = "#{node_name}.#{category}.#{metric}.#{c_metric}".gsub("-","_")
+              string_to_send += "#{name} #{c_value} #{Time.now.to_i}\n" if c_value != "U"
             end
           end
         end

data/munin2graphite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Fernandez (magec)"]
-  s.date = "2012-02-17"
+  s.date = "2012-08-13"
   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 = ["munin2gdash", "munin2graphite", "munin2graphite-daemon"]

data/test/test_init.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__) + "/../lib/"))
 require 'rubygems'
 require 'test/unit'
-require '../munin-ruby/lib/munin-ruby'
+require 'munin-ruby'
 require 'graphite'
 require 'munin2graphite'
 require 'munin_graph'
@@ -9,5 +9,5 @@ require 'carbon'
 
 TEST_CONFIG_FILE = File.join(File.dirname(__FILE__),"config.conf")
 Munin2Graphite::Config.config_file = TEST_CONFIG_FILE
-Graphite::Base.set_connection(Munin2Graphite::Config["carbon_hostname"])
+Graphite::Base.set_connection(Munin2Graphite::Config["graphite_endpoint"])
 Graphite::Base.authenticate(Munin2Graphite::Config["graphite_user"],Munin2Graphite::Config["graphite_password"])

data/test/test_munin_graph.rb

@@ -116,7 +116,7 @@ END
     root = @apache_graph.root
     field_declarations = root.children_of_class(FieldDeclarationNode)
     root.compile
-    assert_equal field_declarations.first.compile,"alias(scale(nonNegativeDerivative(test.frontends.linux.myhost.apache.apache_accesses.accesses80),0.0166666666666667),'port 80')"
+    assert_equal field_declarations.first.compile,"alias(scaleToSeconds(nonNegativeDerivative(test.frontends.linux.myhost.apache.apache_accesses.accesses80),1),'port 80')"
     assert_equal root.graph_properties[:yMax], 1000000
     assert_equal root.graph_properties[:yMin], 0
     assert_equal root.properties[:base] , 1000
@@ -225,7 +225,7 @@ END
     graph.root.compile
     color_list = graph.root.graph_properties[:colorList]
     assert_equal color_list.first , color_list[1] # Thew should be drawn with the same color
-    assert_match graph.root.url , /alias\(scale\(scale\(scale\(nonNegativeDerivative\(test.frontends.linux.localhost.network.load.down\),0.0166666666666667\),8\),-1/
+    assert_match graph.root.url , /alias\(scale\(scale\(scaleToSeconds\(nonNegativeDerivative\(test.frontends.linux.localhost.network.load.down\),1\),8\),-1/
     assert_equal graph.root.children_of_class(FieldDeclarationNode).length , 2
      graph.root.url
   end

data/test/test_scheduler.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),"/test_init"))
+require 'rspec-mocks'
 
 class TestMuninGraph < Test::Unit::TestCase
 
@@ -16,4 +17,11 @@ class TestMuninGraph < Test::Unit::TestCase
     @scheduler.obtain_graphs
   end
 
+  def test_send_graphs
+    mockSocket = mock( TCPSocket )
+    @scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
+    @scheduler.carbon = mockSocket
+    @scheduler.obtain_metrics
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin2graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-08-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &11857380 !ruby/object:Gem::Requirement
+  requirement: &70102053585380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *11857380
+  version_requirements: *70102053585380
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &11841720 !ruby/object:Gem::Requirement
+  requirement: &70102053584900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *11841720
+  version_requirements: *70102053584900
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &11840760 !ruby/object:Gem::Requirement
+  requirement: &70102053584420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11840760
+  version_requirements: *70102053584420
 - !ruby/object:Gem::Dependency
   name: munin-ruby
-  requirement: &11839940 !ruby/object:Gem::Requirement
+  requirement: &70102053583940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *11839940
+  version_requirements: *70102053583940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11838980 !ruby/object:Gem::Requirement
+  requirement: &70102053583440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *11838980
+  version_requirements: *70102053583440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11838220 !ruby/object:Gem::Requirement
+  requirement: &70102053582960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11838220
+  version_requirements: *70102053582960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11837700 !ruby/object:Gem::Requirement
+  requirement: &70102053582480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *11837700
+  version_requirements: *70102053582480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11837140 !ruby/object:Gem::Requirement
+  requirement: &70102053582000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *11837140
+  version_requirements: *70102053582000
 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.
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -588061022121923962
+      hash: 1309715336698624535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: