rubix 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/zabbix_api

@@ -19,42 +19,38 @@ def Settings.usage
   %Q{usage: #{raw_script_name} [...--param=val...] METHOD PARAMS}
 end
 
-if $0 == __FILE__
-  
-  begin
-    Settings.resolve!
-  rescue RuntimeError => e
-    puts e.message
-    Settings.dump_help
-    exit(1)
-  end
+begin
+  Settings.resolve!
+rescue RuntimeError => e
+  puts e.message
+  Settings.dump_help
+  exit(1)
+end
 
-  if Settings.rest.size < 2
-    Settings.dump_help
-    exit(1)
-  end
+if Settings.rest.size < 2
+  Settings.dump_help
+  exit(1)
+end
 
-  method      = Settings.rest[0]
-  json_params = Settings.rest[1]
-
-  begin
-    Rubix.connect(Settings[:url], Settings[:username], Settings[:password])
-    
-    params   = JSON.parse(json_params)
-    response = Rubix.connection.request(method, params)
-    
-    if Settings[:pretty]
-      puts JSON.pretty_generate(response.parsed)
-    else
-      puts response.parsed.to_json
-    end
-    
-  rescue JSON::ParserError => e
-    puts "Invalid JSON -- #{e.message}"
-    exit(1)
-  rescue Rubix::Error => e
-    puts e.message
-    exit(1)
-  end
+method      = Settings.rest[0]
+json_params = Settings.rest[1]
 
+begin
+  Rubix.connect(Settings[:url], Settings[:username], Settings[:password])
+  
+  params   = JSON.parse(json_params)
+  response = Rubix.connection.request(method, params)
+  
+  if Settings[:pretty]
+    puts JSON.pretty_generate(response.parsed)
+  else
+    puts response.parsed.to_json
+  end
+  
+rescue JSON::ParserError => e
+  puts "Invalid JSON -- #{e.message}"
+  exit(1)
+rescue Rubix::Error => e
+  puts e.message
+  exit(1)
 end

data/bin/zabbix_pipe

@@ -14,8 +14,9 @@ Settings.define 'verbose', :description => "Be verbose", :required => false, :ty
 #
 # Configuration for talking with the Zabbix server
 #
-Settings.define 'server',             :description => "Hostname/IP of the Zabbix server",                        :required => true
+Settings.define 'server',             :description => "Hostname/IP of the Zabbix server",                        :required => true, :default => 'localhost'
 Settings.define 'host',               :description => "Name of the (possibly new) Zabbix host to write data to", :required => true
+Settings.define 'configuration_file', :description => "Path to the Zabbix agent configuration file",             :required => true, :default => '/etc/zabbix/zabbix_agentd.conf'
 
 #
 # Configuration for talking with the Zabbix API
@@ -45,33 +46,30 @@ Settings.define 'sender',             :description => "Path to the zabbix_sender
 Settings.define 'pipe',               :description => "Path to the named pipe to read from",                     :required => false
 Settings.define 'pipe_read_sleep',    :description => "Seconds to sleep between reads from pipe",                :required => true, :type => Float, :default => 0.1
 
-if $0 == __FILE__
-  begin
-    Settings.resolve!
-  rescue RuntimeError => e
-    $stderr.puts e.message
-    exit(1)
-  end
+begin
+  Settings.resolve!
+rescue RuntimeError => e
+  $stderr.puts e.message
+  exit(1)
+end
 
-  begin
-    Rubix.connect((Settings[:url] || File.join(Settings[:server], 'api_jsonrpc.php')), Settings[:username], Settings[:password])
-    
-  rescue Rubix::Error => e
-    $stderr.puts e.message
-    exit(1)
-  end
+begin
+  Rubix.connect((Settings[:url] || File.join(Settings[:server], 'api_jsonrpc.php')), Settings[:username], Settings[:password])
+  
+rescue Rubix::Error => e
+  $stderr.puts e.message
+  exit(1)
+end
 
-  begin
-    sender = Rubix::Sender.new(Settings)
-  rescue Rubix::Error => e
-    $stderr.puts e.message
-    exit(1)
-  end
+begin
+  sender = Rubix::Sender.new(Settings)
+rescue Rubix::Error => e
+  $stderr.puts e.message
+  exit(1)
+end
 
-  begin
-    sender.run
-  rescue => e
-    $stderr.puts "#{e.class} -- #{e.message}"
-  end
+begin
+  sender.run
+rescue => e
+  $stderr.puts "#{e.class} -- #{e.message}"
 end
-  

data/lib/rubix/examples/es_monitor.rb

@@ -49,7 +49,7 @@ class ESMonitor < Rubix::ClusterMonitor
     end
     write({
             :hostname    => "#{cluster_name}-elasticsearch",
-            :hostgroup   => self.class::CLUSTER_HOSTGROUPS
+            :hostgroup   => self.class::CLUSTER_HOSTGROUPS,
             :templates   => self.class::CLUSTER_TEMPLATES,
             :application => self.class::CLUSTER_APPLICATIONS
           }) do |d|
@@ -74,7 +74,7 @@ class ESMonitor < Rubix::ClusterMonitor
     index_data['indices'].each_pair do |index_name, index_data|
       write({
               :hostname   => "#{cluster_name}-elasticsearch",
-              :hostgroup  => self.class::CLUStER_HOSTGROUP,
+              :hostgroup  => self.class::CLUSTER_HOSTGROUPS,
               :templates  => self.class::CLUSTER_TEMPLATES,
               :appliation => index_name
             }) do |d|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubix
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dhruv Bansal