munin2graphite 0.1.8 → 0.2.0

data/Gemfile

@@ -14,7 +14,6 @@ gem "json", "~> 1.6.3"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "jeweler", "~> 1.8.4"
   gem "yard", "~> 0.6.0"
 end

data/README.markdown

@@ -31,22 +31,15 @@ Imagine, for example, that we have two munin-nodes in two different servers (mun
     # This has to point to the carbon backend to submit metrics
     carbon_hostname=carbon.example.com
     carbon_port=2003
-    
+
     # Graphite endpoint
-    # This is needed to send graph data to graphite
-    graphite_endpoint=http://graphite.example.com/
-    
-    # User and password of the graphite web UI
-    graphite_user=test
-    graphite_password=secret
+    # The url of the grphite-web application this is used to config the graphs
+    graphite_endpoint=http://graphite_webapp_hostname:port/
 
-    # This is the prefix you want the on metrics
-    graphite_metric_prefix=test.server
-    
-    # The prefix you want in the graphics, note that in the UI the grapichs are shown under the user name, so the user name is also added prfixed
-    # to this prefix. That's why conveniently, I used 'test' (the user name) in the metric prefix
-    graphite_graph_prefix=server
-    
+    # prefix for the metrics usually, the user name have to be put as a prefix
+    graphite_prefix=prefix
+    graphite_user=test
+    graphite_password=XXXXX
     
     # The period for sending the metrics
     # its format is the one of rufus-scheduler    

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

data/bin/munin2graphite-1r

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__),"..","lib")))
+require 'rubygems'
+require 'munin2graphite'
+
+#if ARGV.last && File.stat(ARGV.last)
+#  Munin2Graphite::Config.config_file = ARGV.last
+#else
+  Munin2Graphite::Config.config_file = "/etc/munin2graphite/munin2graphite.conf"
+#end
+
+Thread.abort_on_exception = true 
+
+scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
+if ( ARGV.first == "graphs" )
+  scheduler.start1r_graphs
+else
+  scheduler.start1r_metrics
+end

data/conf/munin2graphite.conf.example

@@ -14,14 +14,16 @@ carbon_hostname=localhost
 carbon_port=2003
 
 # Graphite endpoint
-# This is needed to send graph data to graphite
-graphite_endpoint=http://graphite/
+# The url of the grphite-web application this is used to config the graphs
+graphite_endpoint=http://graphite_webapp_hostname:port/
 
 # prefix for the metrics usually, the user name have to be put as a prefix
-graphite_metric_prefix=
-graphite_graph_prefix=
+graphite_prefix=prefix
 graphite_user=test
-graphite_password=
+graphite_password=XXXXX
+
+# Prepend nodename to graph legend (default no)
+# graph_legend_prepend=
 
 # The period for sending the metrics and the graph info
 # its format is the one of rufus-scheduler

data/lib/ast_node.rb

@@ -4,6 +4,12 @@ class ASTNode
 
   attr_accessor :properties, :children, :parent , :root_node, :graph_properties
 
+  DEFAULT_GRAPH_PROPERTIES = {"hideLegend" => "false"}
+
+  # An array of proc functions to be applied on compile time, the first argument is the metric node and the second, the current string
+  # its result will be assigned to the compiled string
+  METRIC_PROC_FUNCTIONS = [ Proc.new { |metric,aux| metric.properties[:is_negative] ? aux : "cactiStyle(#{aux})" } ]
+
   def default_colors
     %w(#00CC00 #0066B3 #FF8000 #FFCC00 #330099 #990099 #CCFF00 #FF0000 #808080
        #008F00 #00487D #B35A00 #B38F00         #6B006B #8FB300 #B30000 #BEBEBE
@@ -16,7 +22,7 @@ class ASTNode
     @raw_data = raw_data
     @children = []
     @properties = {'graph_period' => "seconds","category" => "other"}
-    @graph_properties = {}    
+    @graph_properties = DEFAULT_GRAPH_PROPERTIES
     @graph_properties[:colorList] = default_colors
     @parent = nil
   end
@@ -189,7 +195,14 @@ class GraphPrintFormatGlobalDeclarationNode < GlobalDeclarationNode; end
 class FieldDeclarationNode < ASTNode
  
   def metric
-    "#{root_node.properties['graphite_metric_prefix']}.#{root_node.properties['hostname'].split('.').first}.#{root_node.properties['category']}.#{root_node.properties['metric']}.#{children.first.metric}"
+    [
+     root_node.properties['graphite_user'],
+     root_node.properties['graphite_prefix'],
+     root_node.properties['hostname'].split('.').first,
+     root_node.properties['category'],
+     root_node.properties['metric'],
+     children.first.metric
+    ].reject{|i| i == "" }.compact.join(".")
   end
 
   def compile
@@ -200,15 +213,29 @@ class FieldDeclarationNode < ASTNode
     if self.root_node.properties[:logarithmic]
       # NOT IMPLEMENTED the logarithmic means that a logarithmic scale is to be used not that a log function has to be implemented aux = "log(#{aux},10)"
     end
+
     if self.properties[:stacked]
       aux = "stacked(#{aux})"
     end
+    
+    if self.properties[:yMax] && !self.properties[:proccessed]
+      self.properties[:proccessed] = true
+      return self.compile
+    end
+    
     if self.properties[:is_negative]
       aux = "scale(#{aux},-1)"
+      self.properties[:alias] = "" # legend is discarded in this case (munin does so)
     end
+
     if self.properties[:alias]
       aux =  "alias(#{aux},'#{self.properties[:alias]}')"
     end
+
+    METRIC_PROC_FUNCTIONS.each do |proc|
+      aux = proc.call(self,aux)
+    end
+
     if self.properties[:hide]
       return nil
     else
@@ -266,7 +293,12 @@ class TypeFieldPropertyNode < FieldPropertyNode
     if @value == "DERIVE" || @value == "COUNTER"
       # The scaling is because of the minutes/(60*seconds)"
       #return "scale(nonNegativeDerivative(#{operand}),0.0166666666666667)"
-      return "scaleToSeconds(nonNegativeDerivative(#{operand}),1)"
+
+      if parent.properties[:yMax]
+        return "scaleToSeconds(nonNegativeDerivative(#{operand},#{parent.properties[:yMax]}),1)"
+      else
+        return "scaleToSeconds(nonNegativeDerivative(#{operand}),1)"
+      end
     end
     operand
   end
@@ -292,8 +324,7 @@ end
 
 class MaxFieldPropertyNode < FieldPropertyNode
   def apply_function(operand)
-    self.root_node.graph_properties[:yMax] ||= @value.to_i
-    self.root_node.graph_properties[:yMax] = @value.to_i if  self.root_node.graph_properties[:yMax] < @value.to_i 
+    parent.properties[:yMax] = @value.to_i
     return operand
   end
 end

data/lib/graphite/base.rb

@@ -1,25 +1,29 @@
 require 'net/http'
 
 module Graphite
-  class Base    
+  class Base
 
+    @@path = ""
 
     # connection instance (shared with every instance of the class)
     def self.connection      
+      @@path = ""
       @init_header ||= {}
       @@connection ||= begin
-        endpoint_uri = URI.parse(@@endpoint)
-        @@path = endpoint_uri.path
-        Net::HTTP.new(endpoint_uri.host, endpoint_uri.port)
-      end
+                         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(@@path + "account/login","nextPage=/&password=#{password}&username=#{user}")
+      url = @@path + "/account/login"
+      url.gsub!("//","/")
+      response = self.connection.post(url,"nextPage=/&password=#{password}&username=#{user}")
       @@init_header =  {"Cookie" => response.get_fields('Set-Cookie').first}
     end
-
+    
     def self.set_connection(endpoint,user = "",password = "")
       @@endpoint = endpoint
       @@user ||= user
@@ -28,7 +32,9 @@ module Graphite
     
     # Get
     def self.get(path,args)      
-      self.connection.get(@@path + path + "?" + args.map { |i,j| i.to_s + "=" + j }.join("&"),@@init_header)
+      mpath = (@@path + path).gsub("//","/")
+      self.connection.get(mpath + "?" + args.map { |i,j| i.to_s + "=" + j }.join("&"),@@init_header)
     end
+
   end
 end

data/lib/munin2graphite/config.rb

@@ -55,7 +55,7 @@ module Munin2Graphite
       end
 
       def check_config
-        fields={:carbon => [:hostname,:port],:graphite => [:endpoint,:metric_prefix,:user,:password],:scheduler => [:metrics_period,:graphs_period]}
+        fields={:carbon => [:hostname,:port],:graphite => [:endpoint,:prefix,:user,:password],:scheduler => [:metrics_period,:graphs_period]}
         fields.each do |k,v|
           v.each do |inner_field|
             field = "#{k}_#{inner_field}"

data/lib/munin2graphite/scheduler.rb

@@ -41,8 +41,8 @@ module Munin2Graphite
       raise "CategoryNotFound in #{config}"
     end
 
-    def munin_config
-      return @munin_config if @munin_config
+    def munin_config(reload = false)
+      return @munin_config if @munin_config && !reload
       @munin_config = {}
       @config.log.info("Obtaining metrics configuration")
       @munin_config[:workers] = []
@@ -52,8 +52,14 @@ module Munin2Graphite
         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
+          begin
+            munin_worker  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+            nodes = config["munin_nodes"] ? config["munin_nodes"].split(",") : munin_worker.nodes
+          rescue Exception => e
+            config.log.error("Error when trying to connect to munin-node on #{config["munin_hostname"]}:#{config["munin_port"]}")
+            config.log.error("This node will be skipped")
+            exit
+          end
           current_config[:nodes] = {}
           semaphore_nodes = Mutex.new
           threads_nodes = []
@@ -69,6 +75,15 @@ module Munin2Graphite
                 begin
                   raw_config = munin.config(metric,true)[metric]
                   category = category_from_config(raw_config)
+                  # We prepend the worker name to the graph title for clarity
+                  if config["graph_legend_prepend"] == "true"
+                    nodename = config["graphite_name_schema"] == "worker" ? worker : node
+                    if raw_config.match("graph_title ")
+                      raw_config.gsub!("graph_title ","graph_itle #{nodename} ")
+                    else 
+                      raw_config << "\ngraph_title #{nodename}"
+                    end
+                  end
                   semaphore_nodes.synchronize do 
                     current_config[:nodes][node][:metrics][metric] = {
                       :config => munin.config(metric)[metric],
@@ -103,13 +118,13 @@ module Munin2Graphite
     #
     # This is the loop of the metrics scheduling
     def obtain_metrics(worker = "global")
-      config = @config.config_for_worker("global")
+      my_munin_config = munin_config.dup
       time = Time.now
       config = @config.config_for_worker(worker)
       config.log.info("Worker #{worker}")
-      metric_base = config["graphite_metric_prefix"]
+      metric_base = [config["graphite_user"], config["graphite_prefix"]].reject{|i| i== ""}.compact.join(".")
       
-      munin_config[worker][:nodes].each do |node,node_info|
+      my_munin_config[worker][:nodes].each do |node,node_info|
         node_name = metric_base + "." + node.split(".").first
         config.log.debug("Doing #{node_name}")
         values = {}
@@ -151,12 +166,12 @@ module Munin2Graphite
         carbon.send(string_to_send)
         carbon.flush
         carbon.close
-      end if munin_config[worker]
+      end if my_munin_config[worker]
       @config.log.info("End getting metrics for worker #{worker}, elapsed time (#{Time.now - time}s)")
     end
 
     def obtain_graphs
-      munin_config
+      munin_config(true)
       munin_config[:workers].each do |worker|
         time = Time.now
         config = @config.config_for_worker worker
@@ -194,6 +209,19 @@ module Munin2Graphite
       end    
     end
 
+    def start1r_metrics
+      @config.log.info("One-run started: metrics")
+      workers.each do |worker|        
+        config = @config.config_for_worker worker        
+        metric_loop(worker)
+      end      
+    end
+
+    def start1r_graphs
+      @config.log.info("One-run started: graphs")
+      obtain_graphs
+    end
+
     def start
       @config.log.info("Scheduler started")
       obtain_graphs
@@ -205,6 +233,14 @@ module Munin2Graphite
         @scheduler.every config["scheduler_metrics_period"] do
           metric_loop(worker)
         end
+
+=begin
+	# Graph rereading is disabled by now there are concurrency problems
+        @scheduler.every config["scheduler_graphs_period"] do
+          obtain_graphs
+        end
+=end
+
       end      
     end
   end

data/lib/munin_graph.rb

@@ -22,7 +22,7 @@ require 'graphite'
 
 ##
 # This class allows the transformation between graphite and munin config. It constructs an AST parsing the munin config information and
-# allows to output a valid graphic in graphite url format
+# outputs a valid graphic in graphite url format
 # Jose Fernandez 2011
 #
 class MuninGraph
@@ -47,8 +47,13 @@ class MuninGraph
     graph.url = self.root.url
     self.root.properties[:category] ||= "other"
     
+    if @config["graphite_prefix"] == "" || !@config["graphite_prefix"]  && @config["graphite_graph_prefix"] && @config["graphite_graph_prefix"] != ""
+      puts "DEPRECATION WARNING: parameter graphite_graph_prefix is not used anymore, please use graphite_prefix instead."
+      @config["graphite_prefix"] =  @config["graphite_graph_prefix"]
+    end
+
     graph.name = "#{@config["hostname"]}.#{self.root.properties["category"]}.#{self.root.properties["metric"]}"
-    graph.name = "#{@config["graphite_graph_prefix"]}.#{graph.name}" if @config["graphite_graph_prefix"] && @config["graphite_graph_prefix"] != "" 
+    graph.name = "#{@config["graphite_prefix"]}.#{graph.name}" if @config["graphite_prefix"] && @config["graphite_prefix"] != "" 
     return graph
   end
 

data/munin2graphite.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Fernandez (magec)"]
-  s.date = "2012-08-13"
+  s.date = "2012-10-16"
   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"]
+  s.executables = ["munin2graphite-daemon", "munin2gdash", "munin2graphite", "munin2graphite-1r"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/munin2gdash",
     "bin/munin2graphite",
+    "bin/munin2graphite-1r",
     "bin/munin2graphite-daemon",
     "conf/munin2graphite.conf.example",
     "etc/munin2graphite/munin2graphite.conf.example",
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
     "munin2graphite.gemspec",
     "test/munin2graphite/config_test.rb",
     "test/test_config.rb",
+    "test/test_graphite.rb",
     "test/test_init.rb",
     "test/test_munin.rb",
     "test/test_munin_graph.rb",
@@ -52,17 +54,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/magec/munin2graphite"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Allows to post both data and graphic info from munin to graphite (https://launchpad.net/graphite)"
-  s.test_files = [
-    "test/munin2graphite/config_test.rb",
-    "test/test_config.rb",
-    "test/test_init.rb",
-    "test/test_munin.rb",
-    "test/test_munin_graph.rb",
-    "test/test_my_graph.rb",
-    "test/test_scheduler.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -73,8 +66,7 @@ Gem::Specification.new do |s|
       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<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
     else
       s.add_dependency(%q<rufus-scheduler>, ["= 2.0.10"])
@@ -82,8 +74,7 @@ Gem::Specification.new do |s|
       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<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
     end
   else
@@ -92,8 +83,7 @@ Gem::Specification.new do |s|
     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<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
   end
 end

data/test/test_graphite.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__),"/test_init"))
+
+class TestGraphite < Test::Unit::TestCase
+
+  def test_endpoint
+    assert_nothing_thrown {
+      Graphite::Base.set_connection(Munin2Graphite::Config["graphite_endpoint"])
+      Graphite::Base.authenticate(Munin2Graphite::Config["graphite_user"],Munin2Graphite::Config["graphite_password"])
+    }
+  end
+
+  def test_different_endpoint
+    endpoint_uri = URI.parse(Munin2Graphite::Config["graphite_endpoint"])
+    assert_nothing_thrown {
+      Graphite::Base.set_connection("http://#{endpoint_uri.host}:80")
+      Graphite::Base.authenticate(Munin2Graphite::Config["graphite_user"],Munin2Graphite::Config["graphite_password"])
+    }
+  end
+
+  def test_different_endpoint_with_path
+    endpoint_uri = URI.parse(Munin2Graphite::Config["graphite_endpoint"])
+    assert_nothing_thrown {
+      Graphite::Base.set_connection("http://#{endpoint_uri.host}:80////")
+      Graphite::Base.authenticate(Munin2Graphite::Config["graphite_user"],Munin2Graphite::Config["graphite_password"])
+    }
+  end
+
+end

data/test/test_munin_graph.rb

@@ -107,7 +107,7 @@ END
     root = @simple_graph.root
     root.compile
     field_declarations = root.children_of_class(FieldDeclarationNode)
-    assert_equal field_declarations.first.compile,"alias(test.frontends.linux.myhost.sensors.acpi.THM0,'THM0')"
+    assert_match "alias(test.frontends.linux.myhost.sensors.acpi.THM0,'THM0')", field_declarations.first.compile
     assert_equal root.graph_properties[:vtitle], "Celcius"
     assert_equal root.graph_properties[:title], "ACPI Thermal zone temperatures"
   end
@@ -116,8 +116,7 @@ END
     root = @apache_graph.root
     field_declarations = root.children_of_class(FieldDeclarationNode)
     root.compile
-    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_match "alias(scaleToSeconds(nonNegativeDerivative(test.frontends.linux.myhost.apache.apache_accesses.accesses80,1000000),1),'port 80')",field_declarations.first.compile
     assert_equal root.graph_properties[:yMin], 0
     assert_equal root.properties[:base] , 1000
     assert_equal root.graph_properties[:title], "Apache accesses"
@@ -218,14 +217,13 @@ up.negative down
 up.cdef up,8,*
 up.max 1000000000
 up.info Traffic of the eth2 interface. Maximum speed is 1000 Mbps.
-down.max 1000000000
 END
 )
     graph.config = Munin2Graphite::Config.merge({ 'metric' => "load",'hostname' => "localhost"})
     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\(scaleToSeconds\(nonNegativeDerivative\(test.frontends.linux.localhost.network.load.down\),1\),8\),-1/
+    assert_match graph.root.url , /scale\(scale\(scaleToSeconds\(nonNegativeDerivative\(test.frontends.linux.localhost.network.load.down\),1\),8\)/
     assert_equal graph.root.children_of_class(FieldDeclarationNode).length , 2
      graph.root.url
   end
@@ -282,5 +280,92 @@ END
   end
 
 
+  def test_negative_graphs
+    graph = MuninGraph.new(<<END
+graph_order down up
+graph_title eth0 traffic
+graph_args --base 1000
+graph_vlabel bits in (-) / out (+) per ${graph_period}
+graph_category network
+graph_info This graph shows the traffic of the eth0 network interface. Please note that the traffic is shown in bits per second, not bytes. IMPORTANT: On 32 bit systems the data source for this plugin uses 32bit counters, which makes the plugin unreliable and unsuitable for most 100Mb (or faster) interfaces, where traffic is expected to exceed 50Mbps over a 5 minute period.  This means that this plugin is unsuitable for most 32 bit production environments. To avoid this problem, use the ip_ plugin instead.  There should be no problems on 64 bit systems running 64 bit kernels.
+down.label received
+down.type COUNTER
+down.graph no
+down.cdef down,8,*
+up.label bps
+up.type COUNTER
+up.negative down
+up.cdef up,8,*
+up.max 1000000000
+up.info Traffic of the eth0 interface. Maximum speed is 1000 Mbps.
+down.max 1000000000
+END
+)
+    graph.config = Munin2Graphite::Config.merge({ "graphite_user" => "",'metric' => "if_eth0",'hostname' => "test"})
+    graph.root.compile
+    assert_not_match graph.root.url, /received/
+  end
+
+  def test_network
+    graph = MuninGraph.new(<<END
+graph_category gtw.gtw4
+graph_title gtw4
+graph_info Model: 7206VXR Firmware: 12.2(15)T8
+graph_args --base 1000
+graph_vlabel Octets in (G) / out (B) per ${graph_period}
+GigabitEthernet0_2_octets_in.label Conn
+GigabitEthernet0_2_octets_in.negative GigabitEthernet0_2_octets_out
+GigabitEthernet0_2_octets_in.draw LINE1
+GigabitEthernet0_2_octets_in.type DERIVE
+GigabitEthernet0_2_octets_in.cdef GigabitEthernet0_2_octets_in,8,*
+GigabitEthernet0_2_octets_in.max 2000000000
+GigabitEthernet0_2_octets_in.min 0
+GigabitEthernet0_2_octets_out.label Conn
+GigabitEthernet0_2_octets_out.draw LINE1
+GigabitEthernet0_2_octets_out.type DERIVE
+GigabitEthernet0_2_octets_out.cdef GigabitEthernet0_2_octets_out,8,*
+GigabitEthernet0_2_octets_out.max 2000000000
+GigabitEthernet0_2_octets_out.min 0
+FastEthernet1_0_octets_in.label VLAN Internet - IN
+FastEthernet1_0_octets_in.negative FastEthernet1_0_octets_out
+FastEthernet1_0_octets_in.draw LINE1
+FastEthernet1_0_octets_in.type DERIVE
+FastEthernet1_0_octets_in.cdef FastEthernet1_0_octets_in,8,*
+FastEthernet1_0_octets_in.max 2000000000
+FastEthernet1_0_octets_in.min 0
+FastEthernet1_0_octets_out.label VLAN Internet - OUT
+FastEthernet1_0_octets_out.draw LINE1
+FastEthernet1_0_octets_out.type DERIVE
+FastEthernet1_0_octets_out.cdef FastEthernet1_0_octets_out,8,*
+FastEthernet1_0_octets_out.max 2000000000
+FastEthernet1_0_octets_out.min 0
+FastEthernet1_1_octets_in.label FW
+FastEthernet1_1_octets_in.negative FastEthernet1_1_octets_out
+FastEthernet1_1_octets_in.draw LINE1
+FastEthernet1_1_octets_in.type DERIVE
+FastEthernet1_1_octets_in.cdef FastEthernet1_1_octets_in,8,*
+FastEthernet1_1_octets_in.max 2000000000
+FastEthernet1_1_octets_in.min 0
+FastEthernet1_1_octets_out.label FW
+FastEthernet1_1_octets_out.draw LINE1
+FastEthernet1_1_octets_out.type DERIVE
+FastEthernet1_1_octets_out.cdef FastEthernet1_1_octets_out,8,*
+FastEthernet1_1_octets_out.max 2000000000
+FastEthernet1_1_octets_out.min 0
+END
+                           )
+    graph.config = Munin2Graphite::Config.merge({ "graphite_prefix" => "","munin_nodes" => "routers", "graphite_user" => "network",'metric' => "snmp_routers_gtw_gtw4_octets",'hostname' => "routers"})
+    graph.root.compile
+    assert_not_match graph.root.url, /received/
+    assert_not_match graph.root.url, /\.\./
+  end
+
+  def test_default_graph_properties
+    graph = MuninGraph.new("")
+    graph.config = Munin2Graphite::Config
+    graph.root.compile
+    assert_match graph.root.url, /#{ASTNode::DEFAULT_GRAPH_PROPERTIES.keys.first}/
+
+  end
 
 end

data/test/test_scheduler.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__),"/test_init"))
-require 'rspec-mocks'
 
 class TestMuninGraph < Test::Unit::TestCase
 
@@ -11,16 +10,20 @@ class TestMuninGraph < Test::Unit::TestCase
     @scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
     @scheduler.obtain_metrics
   end
-
+  
   def test_obtain_graphs
     @scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
     @scheduler.obtain_graphs
   end
 
+  def test_obtain_graphs_when_it_cannot_connect
+    Munin2Graphite::Config.config.params["test_worker1"]["munin_hostname"] = "192.168.1.1"
+    @scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
+    assert_nothing_thrown { @scheduler.obtain_graphs }
+  end
+
   def test_send_graphs
-    mockSocket = mock( TCPSocket )
     @scheduler = Munin2Graphite::Scheduler.new(Munin2Graphite::Config)
-    @scheduler.carbon = mockSocket
     @scheduler.obtain_metrics
   end
 

metadata

@@ -1,117 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: munin2graphite
-version: !ruby/object:Gem::Version
-  version: 0.1.8
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Jose Fernandez (magec)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
-  requirement: &70102053585380 !ruby/object:Gem::Requirement
+
+date: 2012-10-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 0
+        - 10
         version: 2.0.10
-  type: :runtime
+  version_requirements: *id001
+  name: rufus-scheduler
   prerelease: false
-  version_requirements: *70102053585380
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: &70102053584900 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
-  type: :runtime
+  version_requirements: *id002
+  name: daemons
   prerelease: false
-  version_requirements: *70102053584900
-- !ruby/object:Gem::Dependency
-  name: parseconfig
-  requirement: &70102053584420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: parseconfig
   prerelease: false
-  version_requirements: *70102053584420
-- !ruby/object:Gem::Dependency
-  name: munin-ruby
-  requirement: &70102053583940 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
-  type: :runtime
+  version_requirements: *id004
+  name: munin-ruby
   prerelease: false
-  version_requirements: *70102053583940
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70102053583440 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 6
+        - 3
         version: 1.6.3
-  type: :runtime
+  version_requirements: *id005
+  name: json
   prerelease: false
-  version_requirements: *70102053583440
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70102053582960 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *70102053582960
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 1
+        - 8
+        - 4
+        version: 1.8.4
+  version_requirements: *id006
   name: jeweler
-  requirement: &70102053582480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
   prerelease: false
-  version_requirements: *70102053582480
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70102053582000 !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :development
+  version_requirements: *id007
+  name: yard
   prerelease: false
-  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.
+  type: :development
+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.
 email: jfernandezperez@gmail.com
-executables:
+executables: 
+- munin2graphite-daemon
 - munin2gdash
 - munin2graphite
-- munin2graphite-daemon
+- munin2graphite-1r
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.markdown
-files:
+files: 
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -119,6 +147,7 @@ files:
 - VERSION
 - bin/munin2gdash
 - bin/munin2graphite
+- bin/munin2graphite-1r
 - bin/munin2graphite-daemon
 - conf/munin2graphite.conf.example
 - etc/munin2graphite/munin2graphite.conf.example
@@ -137,44 +166,44 @@ files:
 - munin2graphite.gemspec
 - test/munin2graphite/config_test.rb
 - test/test_config.rb
+- test/test_graphite.rb
 - test/test_init.rb
 - test/test_munin.rb
 - test/test_munin_graph.rb
 - test/test_my_graph.rb
 - test/test_scheduler.rb
 homepage: http://github.com/magec/munin2graphite
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1309715336698624535
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows to post both data and graphic info from munin to graphite (https://launchpad.net/graphite)
-test_files:
-- test/munin2graphite/config_test.rb
-- test/test_config.rb
-- test/test_init.rb
-- test/test_munin.rb
-- test/test_munin_graph.rb
-- test/test_my_graph.rb
-- test/test_scheduler.rb
+test_files: []
+