zabbixapi 0.1.6 → 0.1.6.1

data/lib/zabbixapi/trigger.rb

@@ -1,95 +1,64 @@
 module Zabbix
-
   class ZabbixApi
-    def add_trigger(trigger)
 
+    def add_trigger(trigger)
       message = {
-        'method' => 'trigger.create',
-        'params' => [ trigger ]
+          'method' => 'trigger.create',
+          'params' => [trigger]
       }
-
       response = send_request(message)
-
-      unless response.empty? then
-        result = response['triggerids'][0]
-      else
-        result = nil
-      end
-
-      return result
-
+      response.empty? ? nil : response['triggerids'][0]
     end
 
     def get_trigger_id(host_id, trigger_name)
-
       message = {
-        'method' => 'trigger.get',
-        'params' => {
-          'filter' => {
-            'hostid' => host_id,
-            'description' => trigger_name
+          'method' => 'trigger.get',
+          'params' => {
+              'filter' => {
+                  'hostid' => host_id,
+                  'description' => trigger_name
+              }
           }
-        }
       }
-
       response = send_request(message)
-
-      unless response.empty? then
-        result = response[0]['triggerid']
-      else
-        result = nil
-      end
-    
-      return result
+      response.empty? ? nil : response[0]['triggerid']
     end
 
     def get_triggers_by_host(host_id)
-
       message = {
-        'method' => 'trigger.get',
-        'params' => {
-          'filter' => {
-            'hostid' => host_id,
-          },
-          'extendoutput' => '1'
-        }
+          'method' => 'trigger.get',
+          'params' => {
+              'filter' => {
+                  'hostid' => host_id,
+              },
+              'extendoutput' => '1'
+          }
       }
-
       response = send_request(message)
-
-      unless response.empty? then
+      if response.empty?
+        result = {}
+      else
         result = {}
         response.each do |trigger|
           trigger_id = trigger['triggerid']
           description = trigger['description']
           result[trigger_id] = description
         end
-      else
-        result = {}
       end
-
       return result
     end
 
     def update_trigger_status(trigger_id, status)
-
       message = {
-        'method' => 'trigger.update_status',
-        'params' => {
-          'triggerid' => trigger_id,
-          'status' => status
-        }
+          'method' => 'trigger.update_status',
+          'params' => {
+              'triggerid' => trigger_id,
+              'status' => status
+          }
       }
-
       response = send_request(message)
-
-      unless response.empty? then
-        result = response['triggerids'][0]
-      else
-        result = nil
-      end
-
-      return result
+      response.empty? ? nil : response['triggerids'][0]
     end
+
   end
 end

data/lib/zabbixapi/usermacro.rb

@@ -1,74 +1,59 @@
 module Zabbix
-
   class ZabbixApi
-    def add_macro(host_id, macro_name, macro_value)
 
+    def add_macro(host_id, macro_name, macro_value)
       message = {
-        'method' => 'Usermacro.create',
-        'params' => {
-          'hostid' => host_id,
-          'macro' => macro_name,
-          'value'=> macro_value
-        }
+          'method' => 'Usermacro.create',
+          'params' => {
+              'hostid' => host_id,
+              'macro' => macro_name,
+              'value' => macro_value
+          }
       }
-
       response = send_request(message)
-
-      if hostmacroids = response['hostmacroids'] then
-        result = hostmacroids
-      else
-        result = nil
-      end
-
-      return result
+      hostmacroids == response['hostmacroids'] ? hostmacroids : nil
     end
 
     def get_macro(host_id, macro_name)
-    
       message = {
-        'method' => 'Usermacro.get',
-        'params' => {
-          'hostids' => host_id,
-          'macros' => macro_name,
-          'extendoutput' => '1'
-        }
+          'method' => 'Usermacro.get',
+          'params' => {
+              'hostids' => host_id,
+              'macros' => macro_name,
+              'extendoutput' => '1'
+          }
       }
-
       response = send_request(message)
-
-      unless response.empty? then
-        if hostmacroid =  response[0]['hostmacroid'] then
+      if response.empty?
+        result = nil
+      else
+        if hostmacroid == response[0]['hostmacroid']
           macro_id = hostmacroid
           macro_value = response[0]['value']
 
           result = {
-            'id' => macro_id,
-            'value'=> macro_value
+              'id' => macro_id,
+              'value' => macro_value
           }
         else
           result = nil
         end
-      else
-        result = nil
       end
-
       return result
     end
 
     def set_macro_value(host_id, macro_name, macro_value)
-      
       message = {
-        'method' => 'usermacro.updateValue',
-        'params' => {
-          'hostid' => host_id,
-          'macro' => macro_name,
-          'value' => macro_value
-        }
+          'method' => 'usermacro.updateValue',
+          'params' => {
+              'hostid' => host_id,
+              'macro' => macro_name,
+              'value' => macro_value
+          }
       }
-
       response = send_request(message)
-
       return true
     end
+
   end
 end

data/spec/item.rb

@@ -1,60 +1,56 @@
 require 'zabbixapi'
 require 'json'
 
-require 'webmock/rspec'
-include WebMock::API
+#require 'webmock/rspec'
+#include WebMock::API
 
 # settings
 api_url = 'http://zabbix.local/api_jsonrpc.php'
-api_login = 'admin'
+api_login = 'Admin'
 api_password = 'zabbix'
 
-# 01. Add item
-auth_response = '{"jsonrpc":"2.0","result":"a82039d56baba1f92311aa917af9939b","id":83254}'
-add_item_response = '{"jsonrpc":"2.0","result":{"itemids":["19541"]},"id":80163}'
-item_options = {
-  'description' => "Description",
-  'key_' => "key[,avg1]",
-  'hostid' => '10160',
-  'applications' => [ 393 ],
-  'history' => 7,
-  'trends' => 30, 
-  'delay' => 60, 
-  'value_type' => 0
-}
 
-stub_request(:post, api_url).with(:body => /"method":"user\.authenticate"/).to_return(:body => auth_response)
-stub_request(:post, api_url).with(:body => /"method":"item\.create"/).to_return(:body => add_item_response)
+zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
+#zbx.debug = true
 
-describe Zabbix::ZabbixApi, "add_item" do
-  it "Create item" do
-    zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
-    result = zbx.add_item(item_options)
-    result.should eq("19541")
+# 01. Create group
+describe Zabbix::ZabbixApi, "create_group" do
+  it "Create some group" do
+    result = zbx.add_group('some_group')
   end
 end
 
-# 02. Delete item
-auth_response = '{"jsonrpc":"2.0","result":"a82039d56baba1f92311aa917af9939b","id":83254}'
-delete_item_response = ''
-item_options = {
-  'description' => "Description",
-  'key_' => "key[,avg1]",
-  'hostid' => '10160',
-  'applications' => [ 393 ],
-  'history' => 7,
-  'trends' => 30, 
-  'delay' => 60, 
-  'value_type' => 0
+# 02. Create host
+host_options = { 
+  "ip"     => '127.0.0.1',
+  "dns"    => 'my.example.com',
+  "host"   => 'my.example.com',
+  "useip"  => 1,
+  "groups" => ['some_group']
 }
+describe Zabbix::ZabbixApi, "create_host" do
+  it "Create host" do
+    result = zbx.add_host(host_options)
+  end
+end
+
+# 03. Get host
+describe Zabbix::ZabbixApi, "get_host" do
+  it "Get host by name" do
+    result = zbx.get_host_id('my.example.com')
+  end
+end
 
-stub_request(:post, api_url).with(:body => /"method":"user\.authenticate"/).to_return(:body => auth_response)
-stub_request(:post, api_url).with(:body => /"method":"item\.create"/).to_return(:body => add_item_response)
+# 04. Delete group
+describe Zabbix::ZabbixApi, "delete_group" do
+  it "Delete some group" do
+    result = zbx.delete_group('some_group')
+  end
+end
 
-describe Zabbix::ZabbixApi, "add_item" do
-  it "Create item" do
-    zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
-    result = zbx.add_item(item_options)
-    result.should eq("19541")
+# 05. Delete host
+describe Zabbix::ZabbixApi, "delete_host" do
+  it "Delete host" do
+    result = zbx.delete_host('my.example.com')
   end
 end

data/zabbixapi.gemspec

@@ -4,7 +4,7 @@ require 'rake'
 
 Gem::Specification.new do |spec|
 
-  spec.version = '0.1.6'
+  spec.version = '0.1.6.1'
   spec.name = 'zabbixapi'
   spec.summary = 'Ruby module for work with zabbix api.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies: []
 description: Ruby module for work with zabbix api v1.8.
 email: vadv.mkn@gmail.com