munin2graphite 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7d1f3af9f61a3019509bb83aa174e8c594e44f
-  data.tar.gz: 67385d7038ed1dad8f8731d69bd10ef26767f3e9
+  metadata.gz: 4726ddda92c26d794bb3015c44dee126bfc5aa04
+  data.tar.gz: 55e16f215324c77407719c6bf7410bf26e0e1dff
 SHA512:
-  metadata.gz: 30196b2187dc60116cd8cf8dfed75c4b5a25962e4a48559a777523b60ee099415c9ba117bfbd9203e1cefce860e56e6f4d1e353416140ab808aebe4ca32fe7f4
-  data.tar.gz: 1f3434e11378e26163a641af24bda48241863fc02693090e8cfe593ede2356a9b08d6e2111bc863a33e485c4d46d5892257c7129dfbb92ec2aa5e5f4d65ec885
+  metadata.gz: 0b996f9f88b6b11cd094d0829de7eadce6806e741e764ed35b9368593848260f4f0724c88a458cdc9d5eca41f1a5fd869d3890b6a3655676636d1f19e8116c90
+  data.tar.gz: ed9c0b1867ff224575713f17108d28536836c4247b64ba965f4c13dd17b3e4a200a2b065e448d6fe29710f9b4e1ea184a03313c233aa0cedcd6432f8b805a254

data/Gemfile

@@ -9,6 +9,7 @@ gem "daemons", "1.1.4"
 gem "parseconfig"
 gem "munin-ruby", "~> 0.2.1"
 gem "json", "~> 1.8.2"
+gem 'diplomat', '~> 2.0', '>= 2.0.2'
 
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/ast_node.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'cgi'
 
 class ASTNode
 
@@ -92,14 +92,14 @@ class ASTNode
       aux_graph_properties.delete :yMin
     end
 
-    aux = aux_graph_properties.map{|i,j| "#{i}=#{URI.escape(j.to_s.gsub('%','percent'))}"}.join("&")
+    aux = aux_graph_properties.map{|i,j| "#{i}=#{CGI.escape(j.to_s.gsub('%','percent'))}"}.join("&")
     return aux
   end
 
   # This returns the url field of the graph after compiling it
   def url
     self.compile
-    url = "#{properties[:endpoint]}/render/?width=586&height=308&#{properties_to_url}&target=" + URI.escape(targets.map{|i| i.compile}.compact.join("&target="))
+    url = "#{properties[:endpoint]}/render/?width=586&height=308&#{properties_to_url}&target=" + CGI.escape(targets.map{|i| i.compile}.compact.join("&target="))
   end
 
   def to_gdash
@@ -124,7 +124,7 @@ end
 class GlobalDeclarationNode < ASTNode
   def initialize(line)
     super
-    line =~ /^([\w_]*)\ (.*)/
+    line =~ /^([\w]*)\ (.*)/
     @value = $2
   end
 end
@@ -254,7 +254,7 @@ class FieldPropertyNode < ASTNode
   
   def initialize(line)
     super   
-    line =~ /([\w_]+)\.(\w+)\ (.*)$/
+    line =~ /([\w]+)\.(\w+)\ (.*)$/
     @metric   = $1
     @function = $2
     @value    = $3

data/lib/munin2graphite/config.rb

@@ -17,7 +17,7 @@ module Munin2Graphite
       end
 
       def workers
-        return @config.groups
+        return @config.groups + @config.params['workers'].to_a
       end
 
       attr_accessor :config

data/lib/munin2graphite/scheduler.rb

@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 require 'rufus/scheduler'
 require 'thread'
+require 'diplomat'
 module Munin2Graphite
   ##
   # This class holds the main scheduler of the system, it will perform the applicacion loops
@@ -41,13 +42,30 @@ module Munin2Graphite
       raise "CategoryNotFound in #{config}"
     end
 
+    def workers_from_consul_config!
+      return unless @config['consul_url']
+      Diplomat.configure do |c|
+        c.url = @config['consul_url']
+      end
+      Diplomat::Service.get(@config['consul_service'], :all).each do |i|
+        @config.config.params['workers'] ||= []
+        @config.config.params['workers'] << i['Node']
+        @config.config.params[i['Node']] =  {
+          'munin_hostname' => i['Address'],
+          'munin_port'     => i['ServicePort'],
+        }
+      end
+    end
+
     def munin_config(reload = false)
       return @munin_config if @munin_config && !reload
       @munin_config = {}
       @config.log.info("Obtaining metrics configuration")
       @munin_config[:workers] = []
+
       semaphore = Mutex.new
       threads = []
+
       workers.each do |worker|
         threads << Thread.new do
           current_config = {}
@@ -60,6 +78,7 @@ module Munin2Graphite
             config.log.error("This node will be skipped")
             Thread.current.exit
           end
+
           current_config[:nodes] = {}
           semaphore_nodes = Mutex.new
           threads_nodes = []
@@ -112,6 +131,7 @@ module Munin2Graphite
     end
 
     def workers
+      workers_from_consul_config!
       @workers ||= (@config.workers.empty? ?  ["global"] : @config.workers )
     end
 
@@ -135,19 +155,16 @@ module Munin2Graphite
         metrics_threads = []
         categories = {}
         metrics.each do |metric|
-          metrics_threads << Thread.new do
-            begin
-              local_munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
-              values[metric] =  local_munin.fetch metric
-              local_munin.disconnect
-            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
+          begin
+            local_munin  = Munin::Node.new(config["munin_hostname"],config["munin_port"])
+            values[metric] =  local_munin.fetch metric
+            local_munin.disconnect
+          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
-        metrics_threads.each {|i| i.join}
         config.log.debug(values.inspect)
         config.log.info("Done with: #{node} (#{Time.now - metric_time} s)")
         carbon = @carbon || Carbon.new(config["carbon_hostname"],config["carbon_port"])
@@ -233,14 +250,6 @@ 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

@@ -85,25 +85,25 @@ class MuninGraph
             {:matcher => /^graph_width .*/, :klass => GraphWidthGlobalDeclarationNode},
             {:matcher => /^graph_height .*/, :klass => GraphHeightGlobalDeclarationNode},
             {:matcher => /^graph_printfformat .*/, :klass => GraphPrintFormatGlobalDeclarationNode},
-            {:matcher => /([\w_]+)\.label\ .*$/,:klass => LabelFieldPropertyNode},
-            {:matcher => /([\w_]+)\.cdef\ .*$/,:klass => CDefFieldPropertyNode},
-            {:matcher => /([\w_]+)\.draw\ .*$/,:klass => DrawFieldPropertyNode},
-            {:matcher => /([\w_]+)\.graph\ .*$/,:klass => GraphFieldPropertyNode},
-            {:matcher => /([\w_]+)\.info\ .*$/,:klass => InfoFieldPropertyNode},
-            {:matcher => /([\w_]+)\.extinfo\ .*$/,:klass => ExtInfoFieldPropertyNode},
-            {:matcher => /([\w_]+)\.max\ .*$/,:klass => MaxFieldPropertyNode},
-            {:matcher => /([\w_]+)\.min\ .*$/,:klass => MinFieldPropertyNode},
-            {:matcher => /([\w_]+)\.negative\ .*$/,:klass => NegativeFieldPropertyNode},
-            {:matcher => /([\w_]+)\.type\ .*$/,:klass => TypeFieldPropertyNode},
-            {:matcher => /([\w_]+)\.warning\ .*$/,:klass => WarningFieldPropertyNode},
-            {:matcher => /([\w_]+)\.critical\ .*$/,:klass => CriticalFieldPropertyNode},
-            {:matcher => /([\w_]+)\.colour\ .*$/,:klass => ColourFieldPropertyNode},
-            {:matcher => /([\w_]+)\.skipdraw\ .*$/,:klass => SkipDrawFieldPropertyNode},
-            {:matcher => /([\w_]+)\.sum\ .*$/,:klass => SumFieldPropertyNode},
-            {:matcher => /([\w_]+)\.stack\ .*$/,:klass => StackFieldPropertyNode},
-            {:matcher => /([\w_]+)\.linevalue\[:color\[:label\]\]\ .*$/,:klass => LineValueFieldPropertyNode},
-            {:matcher => /([\w_]+)\.oldname\ .*$/,:klass => OldNameFieldPropertyNode},
-            {:matcher => /([\w_]+)\.value\ .*$/,:klass => ValueFieldPropertyNode} 
+            {:matcher => /([\w]+)\.label\ .*$/,:klass => LabelFieldPropertyNode},
+            {:matcher => /([\w]+)\.cdef\ .*$/,:klass => CDefFieldPropertyNode},
+            {:matcher => /([\w]+)\.draw\ .*$/,:klass => DrawFieldPropertyNode},
+            {:matcher => /([\w]+)\.graph\ .*$/,:klass => GraphFieldPropertyNode},
+            {:matcher => /([\w]+)\.info\ .*$/,:klass => InfoFieldPropertyNode},
+            {:matcher => /([\w]+)\.extinfo\ .*$/,:klass => ExtInfoFieldPropertyNode},
+            {:matcher => /([\w]+)\.max\ .*$/,:klass => MaxFieldPropertyNode},
+            {:matcher => /([\w]+)\.min\ .*$/,:klass => MinFieldPropertyNode},
+            {:matcher => /([\w]+)\.negative\ .*$/,:klass => NegativeFieldPropertyNode},
+            {:matcher => /([\w]+)\.type\ .*$/,:klass => TypeFieldPropertyNode},
+            {:matcher => /([\w]+)\.warning\ .*$/,:klass => WarningFieldPropertyNode},
+            {:matcher => /([\w]+)\.critical\ .*$/,:klass => CriticalFieldPropertyNode},
+            {:matcher => /([\w]+)\.colour\ .*$/,:klass => ColourFieldPropertyNode},
+            {:matcher => /([\w]+)\.skipdraw\ .*$/,:klass => SkipDrawFieldPropertyNode},
+            {:matcher => /([\w]+)\.sum\ .*$/,:klass => SumFieldPropertyNode},
+            {:matcher => /([\w]+)\.stack\ .*$/,:klass => StackFieldPropertyNode},
+            {:matcher => /([\w]+)\.linevalue\[:color\[:label\]\]\ .*$/,:klass => LineValueFieldPropertyNode},
+            {:matcher => /([\w]+)\.oldname\ .*$/,:klass => OldNameFieldPropertyNode},
+            {:matcher => /([\w]+)\.value\ .*$/,:klass => ValueFieldPropertyNode} 
      ]
 
    def parse_config

data/munin2graphite.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: munin2graphite 0.2.3 ruby lib
+# stub: munin2graphite 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jose Fernandez (magec)"]
-  s.date = "2017-01-23"
+  s.date = "2017-11-06"
   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-1r", "munin2graphite-daemon"]
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/magec/munin2graphite"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.5.1"
   s.summary = "Allows to post both data and graphic info from munin to graphite (https://launchpad.net/graphite)"
 
   if s.respond_to? :specification_version then
@@ -67,6 +67,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.8.2"])
+      s.add_runtime_dependency(%q<diplomat>, [">= 2.0.2", "~> 2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
     else
@@ -75,6 +76,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.8.2"])
+      s.add_dependency(%q<diplomat>, [">= 2.0.2", "~> 2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
     end
@@ -84,6 +86,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.8.2"])
+    s.add_dependency(%q<diplomat>, [">= 2.0.2", "~> 2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
   end

data/test/test_my_graph.rb

@@ -6,8 +6,9 @@ class TestMyGraph < Test::Unit::TestCase
   def setup
     Munin2Graphite::Config.config_file = TEST_CONFIG_FILE
     @graphic = Graphite::MyGraph.new
-    @graphic.url = "http://graphite.uoc.es/composer/../render/?width=1371&height=707&_salt=1312965749.741&target=alias(scale(derivative(campus.frontends.linux.aleia.apache.apache_volume.volume80)%2C0.016666666666666666)%2C%22Bytes%20por%20segundo%22)&title=Bytes%20transmitidos"
+    @graphic.url = "http://test.es/composer/../render/?width=1371&height=707&_salt=1312965749.741&target=alias(scale(derivative(campus.frontends.linux.aleia.apache.apache_volume.volume80)%2C0.016666666666666666)%2C%22Bytes%20por%20segundo%22)&title=Bytes%20transmitidos"
     @graphic.name = "Apache.Transferencia"
+    puts @graphic.inspect
     @graphic.save!
   end
   
@@ -22,6 +23,7 @@ class TestMyGraph < Test::Unit::TestCase
   end
 
   def test_find_by_name
+    puts Graphite::MyGraph.find_by_name("Apache.Transferencia").inspect
     assert_equal Graphite::MyGraph.find_by_name("Apache.Transferencia").name , "Apache.Transferencia"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munin2graphite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jose Fernandez (magec)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
@@ -80,6 +80,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: diplomat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Allows to post both data and graphic info from munin to graphite (https://launchpad.net/graphite)