zabbix_nudge 0.1.5 → 0.1.7

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in zabbix-nudge.gemspec
+# Specify your gem's dependencies in zabbix_nudge.gemspec
 gemspec

data/README.md

@@ -1,4 +1,7 @@
-zabbix-nudge
+zabbix_nudge
 ============
 
+This project based on zabbix-pusher module https://github.com/iteh/zabbix_pusher.
+Thanks Edmund Haselwanter for main idea and initial version source code.
+
 Set of tools for grab metrics from different sources and push (nudge) this information to the zabbix or zabbix proxy server

data/bin/zabbix_nudge

@@ -4,11 +4,11 @@ require "rubygems"
 require "ap"
 
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
 require "zabbix_nudge"
 require "zabbix_nudge/nudge_cli"
 require "zabbix_nudge/jmx_cli"
 
+
 cli = ZabbixNudge::NudgeCLI.new
 cli.parse_options(ARGV)
 cli.config
@@ -17,4 +17,4 @@ values =  ZabbixNudge::Nudge.new(cli.config[:templates],cli.config.merge(:jmx =>
 
 ap values if cli.config[:show_send_values]
 
-
+puts Socket.gethostname if cli.config[:zabbix_agent_mode]

data/lib/zabbix_nudge/nudge_cli.rb

@@ -9,7 +9,7 @@ module ZabbixNudge
       :short => "-c CONFIG",
       :long  => "--config CONFIG",
       :default => '/etc/zabbix-nudge/config.rb',
-      :description => "The configuration file to use"
+      :description => "The configuration file to use. Default is /etc/zabbix-nudge/config.rb"
 
     option :templates,
       :short => "-t FILE",
@@ -19,7 +19,7 @@ module ZabbixNudge
       :proc => Proc.new { |t| (t =~ /,/) ? t.split(',') : t }
 
     option :zabbix_server_name,
-      :short => "-z SERVER",
+      :short => "-s SERVER",
       :long  => "--zabbix-server SERVER",
       :default => 'localhost',
       :description => "Hostname or IP address of Zabbix Server. Default is localhost"
@@ -31,7 +31,7 @@ module ZabbixNudge
         :description => "Specify port number of server trapper running on the server. Default is 10051"
 
     option :sender_hostname,
-        :short => "-s HOST",
+        :short => "-h HOST",
         :long  => "--host HOSTNAME",
         :default => Socket.gethostname,
         :description => "Specify host name. Default is current hostname"
@@ -42,6 +42,12 @@ module ZabbixNudge
       :description => "Set the log level (debug, info, warn, error, fatal)",
       :proc => Proc.new { |l| l.to_sym }
 
+    option :zabbix_agent_mode,
+      :short => "-z",
+      :long  => "--zabbix-agent-mode",
+      :description => "return execution state if running from Zabbix agent user parameters",
+      :boolean => false
+
     option :show_send_values,
       :short => "-v",
       :long  => "--show_send_values",

data/lib/zabbix_nudge/version.rb

@@ -1,3 +1,3 @@
 module ZabbixNudge
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/zabbix_nudge.rb

@@ -1,10 +1,13 @@
-require "zabbix_nudge/version"
 require "active_support/core_ext/string/inflections.rb"
 require 'nokogiri'
 require 'yajl/json_gem'
 require 'zabbix'
 require "socket"
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "zabbix_nudge/jmx"
+require "zabbix_nudge/version"
+
 
 module ZabbixNudge
 

data/zabbix_nudge.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.license     = 'GPL'
 
   s.summary     = %q{Collect metrics from different sources and push (nudge) data to Zabbix}
-  s.description = %q{zabbix-nudge is a gem to collect metrics from different sources, parse zabbix templates and push (nudge) the data to zabbix proxy or server}
+  s.description = %q{zabbix_nudge is a gem to collect metrics from different sources, parse zabbix templates and push (nudge) the data to zabbix proxy or server}
 
-  s.rubyforge_project = "zabbix-nudge"
+  s.rubyforge_project = "zabbix_nudge"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabbix_nudge
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Myroslav Rys
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-17 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -193,13 +193,12 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id011
-description: zabbix-nudge is a gem to collect metrics from different sources, parse zabbix templates and push (nudge) the data to zabbix proxy or server
+description: zabbix_nudge is a gem to collect metrics from different sources, parse zabbix templates and push (nudge) the data to zabbix proxy or server
 email: 
 - stonevil@gmail.com
 executables: 
 - zabbix_nudge
 - zabbix_nudge_jmx
-- zabbix_nudged
 extensions: []
 
 extra_rdoc_files: []
@@ -212,7 +211,6 @@ files:
 - Rakefile
 - bin/zabbix_nudge
 - bin/zabbix_nudge_jmx
-- bin/zabbix_nudged
 - examples/tomcat_template.xml
 - lib/zabbix_nudge.rb
 - lib/zabbix_nudge/jmx.rb
@@ -252,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: zabbix-nudge
+rubyforge_project: zabbix_nudge
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3

data/bin/zabbix_nudged

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "ap"
-
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
-require "zabbix_nudge"
-require "zabbix_nudge/nudge_cli"
-require "zabbix_nudge/jmx_cli"
-