munin2graphite 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d873c57c17e3e3796363d858d5b902913af4ec96
+  data.tar.gz: 71145f7b38be43c838f66f4555587e192e90d7d3
+SHA512:
+  metadata.gz: 1114fffd3b901c5857ed2131a5e58e81413becee053aec98532735e292741e9dc197e97b4bbb98c3f3508ef93f8a8450d911a816b98e3e6c7c95caf9eff27d45
+  data.tar.gz: 988f46825018e83a1ec0a987863b737bca367365d4ee7e7742805a1936bf0e2dcc1eb74fc4974ee4644d785bde78d9bde4eb2d7c6f3f07a4315ee0cc386b4bd3

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/munin2graphite/scheduler.rb

@@ -49,7 +49,7 @@ module Munin2Graphite
       semaphore = Mutex.new
       threads = []
       workers.each do |worker|
-        threads << Thread.new do 
+        threads << Thread.new do
           current_config = {}
           config = @config.config_for_worker(worker)
           begin
@@ -58,7 +58,7 @@ module Munin2Graphite
           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
+            Thread.current.exit
           end
           current_config[:nodes] = {}
           semaphore_nodes = Mutex.new
@@ -68,7 +68,7 @@ module Munin2Graphite
               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 
+              semaphore_nodes.synchronize do
                 current_config[:nodes][node] = { :metrics => {} }
               end
               metrics.each do |metric|
@@ -80,11 +80,11 @@ module Munin2Graphite
                     nodename = config["graphite_name_schema"] == "worker" ? worker : node
                     if raw_config.match("graph_title ")
                       raw_config.gsub!("graph_title ","graph_itle #{nodename} ")
-                    else 
+                    else
                       raw_config << "\ngraph_title #{nodename}"
                     end
                   end
-                  semaphore_nodes.synchronize do 
+                  semaphore_nodes.synchronize do
                     current_config[:nodes][node][:metrics][metric] = {
                       :config => munin.config(metric)[metric],
                       :raw_config => raw_config,
@@ -99,7 +99,7 @@ module Munin2Graphite
           end
           threads_nodes.each { |i| i.join }
           #       @config.log.debug(current_config.inspect)
-          semaphore.synchronize do 
+          semaphore.synchronize do
             @munin_config[worker] = current_config
             @munin_config[:workers] << worker
           end
@@ -123,7 +123,7 @@ module Munin2Graphite
       config = @config.config_for_worker(worker)
       config.log.info("Worker #{worker}")
       metric_base = [config["graphite_user"], config["graphite_prefix"]].reject{|i| i== ""}.compact.join(".")
-      
+
       my_munin_config[worker][:nodes].each do |node,node_info|
         node_name = metric_base + "." + node.split(".").first
         config.log.debug("Doing #{node_name}")
@@ -152,8 +152,8 @@ module Munin2Graphite
         config.log.info("Done with: #{node} (#{Time.now - metric_time} s)")
         carbon = @carbon || Carbon.new(config["carbon_hostname"],config["carbon_port"])
         string_to_send = ""
-        values.each do |metric,results|          
-          category = node_info[:metrics][metric][:category] 
+        values.each do |metric,results|
+          category = node_info[:metrics][metric][:category]
           results.each do |k,v|
             v.each do |c_metric,c_value|
               name = "#{node_name}.#{category}.#{metric}.#{c_metric}".gsub("-","_")
@@ -193,7 +193,7 @@ module Munin2Graphite
     end
 
     def metric_loop(worker)
-      config = @config.config_for_worker worker        
+      config = @config.config_for_worker worker
       retries = 3
       begin
         obtain_metrics(worker)
@@ -206,15 +206,15 @@ module Munin2Graphite
         retry unless retries < 0
         config.log.error("Exitting, exception not solved")
         exit(1)
-      end    
+      end
     end
 
     def start1r_metrics
       @config.log.info("One-run started: metrics")
-      workers.each do |worker|        
-        config = @config.config_for_worker worker        
+      workers.each do |worker|
+        config = @config.config_for_worker worker
         metric_loop(worker)
-      end      
+      end
     end
 
     def start1r_graphs
@@ -226,8 +226,8 @@ module Munin2Graphite
       @config.log.info("Scheduler started")
       obtain_graphs
       @scheduler = Rufus::Scheduler.start_new
-      workers.each do |worker|        
-        config = @config.config_for_worker worker        
+      workers.each do |worker|
+        config = @config.config_for_worker worker
         config.log.info("Scheduling worker #{worker} every  #{config["scheduler_metrics_period"]} ")
         metric_loop(worker)
         @scheduler.every config["scheduler_metrics_period"] do
@@ -235,13 +235,13 @@ module Munin2Graphite
         end
 
 =begin
-	# Graph rereading is disabled by now there are concurrency problems
+        # Graph rereading is disabled by now there are concurrency problems
         @scheduler.every config["scheduler_graphs_period"] do
           obtain_graphs
         end
 =end
 
-      end      
+      end
     end
   end
 end

data/munin2graphite.gemspec

@@ -2,17 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: munin2graphite 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "munin2graphite"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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 = "2012-10-16"
+  s.date = "2014-05-19"
   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-daemon", "munin2gdash", "munin2graphite", "munin2graphite-1r"]
+  s.executables = ["munin2gdash", "munin2graphite", "munin2graphite-1r", "munin2graphite-daemon"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -53,12 +55,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/magec/munin2graphite"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.2.0"
   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
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rufus-scheduler>, ["= 2.0.10"])

metadata

@@ -1,145 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: munin2graphite
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Jose Fernandez (magec)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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 
-        hash: 27
-        segments: 
-        - 2
-        - 0
-        - 10
-        version: 2.0.10
-  version_requirements: *id001
+date: 2014-05-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.10
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
-  version_requirements: *id002
-  name: daemons
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.10
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   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: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  version_requirements: *id004
-  name: munin-ruby
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: munin-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 6
-        - 3
-        version: 1.6.3
-  version_requirements: *id005
-  name: json
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 1
-        - 8
-        - 4
-        version: 1.8.4
-  version_requirements: *id006
-  name: jeweler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  version_requirements: *id007
-  name: yard
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+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: 
-- munin2graphite-daemon
+executables:
 - munin2gdash
 - munin2graphite
 - munin2graphite-1r
+- munin2graphite-daemon
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -173,37 +155,27 @@ files:
 - test/test_my_graph.rb
 - test/test_scheduler.rb
 homepage: http://github.com/magec/munin2graphite
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Allows to post both data and graphic info from munin to graphite (https://launchpad.net/graphite)
 test_files: []
-