zabbixapi 0.1.6.2 → 0.1.6.3

data/README.rdoc

@@ -20,7 +20,7 @@ You can:
       "dns"    => 'my.example.com',
       "host"   => 'my.example.com',
       "useip"  => 1,
-      "groups" => [get_group_id('some_group')]
+      "groups" => [zbx.get_group_id('some_group')]
     }
     if zbx.create_host(host_options)
       puts zbx.get_host_id('my.example.com')
@@ -33,6 +33,8 @@ You can:
       puts zbx.get_group_id('some_group')
     end
 
+More see in spec please... 
+
 == Dependencies
 
 * net/http

data/lib/zabbixapi/base.rb

@@ -55,17 +55,17 @@ module Zabbix
       request.body=(message_json)
 
       begin
-        puts "[ZBXAPI] : INFO : Do request. Body => #{request.body}" if @debug
+        puts "[ZBXAPI] : #{Time.now()} : INFO : Do request. Body => #{request.body}" if @debug
         response = http.request(request)
       rescue ::SocketError => e
-        puts "[ZBXAPI] : ERROR : SocketError => #{e.message}" if @debug
+        puts "[ZBXAPI] : #{Time.now()} : ERROR : SocketError => #{e.message}" if @debug
         raise Zabbix::SocketError.new(e.message)
       end
 
       if @debug
-        puts "[ZBXAPI] : INFO : Response start"
-        puts response
-        puts "[ZBXAPI] : INFO : Response end"
+        puts "[ZBXAPI] : #{Time.now()} : INFO : Response start"
+        puts "[ZBXAPI] : #{Time.now()} : INFO : Response body: #{response.inspect}"
+        puts "[ZBXAPI] : #{Time.now()} : INFO : Response end"
       end
 
       if response.code != "200"
@@ -75,7 +75,7 @@ module Zabbix
       response_body_hash = JSON.parse(response.body)
 
       if @debug
-        puts "[ZBXAPI] : INFO : Response body"
+        puts "[ZBXAPI] : #{Time.now()} : INFO : Response body"
         puts response_body_hash.inspect
       end
 
@@ -90,6 +90,8 @@ module Zabbix
         case error_code.to_s
           when '-32602'
             raise Zabbix::AlreadyExist.new(e_message)
+          when '-32500'
+            raise  Zabbix::ArgumentError.new(e_message)
           else
             raise Zabbix::ResponseError.new(e_message)
         end

data/lib/zabbixapi/graph.rb

@@ -7,7 +7,7 @@ module Zabbix
           'params' => graph
       }
       response = send_request(message)
-      return 0
+      response.empty? ? nil : response[0]['graphid']
     end
 
     def get_graph_id(host_id, graph_name)

data/lib/zabbixapi/group.rb

@@ -11,7 +11,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      response.empty? ? nil : response[0]['groupid']
+      response.empty? ? nil : response[0]['groupid'].to_i
     end
 
     def group_exist?(pattern)
@@ -31,15 +31,16 @@ module Zabbix
     end
 
     def delete_group(groupname)
-      group_id = get_group_id(groupname)
-      message = {
-          'method' => 'hostgroup.delete',
-          'params' => {
-              'groupid' => group_id
-          }
-      }
-      response = send_request(message)
-      response ? response['groupids'][0].to_i : nil
+      if group_id = get_group_id(groupname)
+        message = {
+            'method' => 'hostgroup.delete',
+            'params' => {
+                'groupid' => group_id
+            }
+        }
+        response = send_request(message)
+        response ? response['groupids'][0].to_i : nil
+      end
     end
 
     def add_host_to_group(host_id, group_id)
@@ -51,7 +52,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      response.empty? ?  false : true
+      response ? response[0]['groupid'].to_i : nil
     end
 
   end

data/lib/zabbixapi/host.rb

@@ -9,7 +9,7 @@ module Zabbix
           'params' => host
       }
       responce = send_request(message)
-      responce.empty? ?  nil : responce['hostids'][0].to_i
+      responce.empty? ?  nil :  response['hostids'][0].to_i 
     end
 
     def add_host(host_options)
@@ -54,14 +54,16 @@ module Zabbix
     end
 
     def delete_host(hostname)
-      host_id = get_host_id(hostname)
-      message = {
-          'method' => 'host.delete',
-          'params' => {
-              'hostid' => host_id
-          }
-      }
-      send_request(message)
+      if host_id = get_host_id(hostname)
+        message = {
+            'method' => 'host.delete',
+            'params' => {
+                'hostid' => host_id
+            }
+        }
+        response = send_request(message)
+        response.empty? ?  nil :  response['hostids'][0].to_i
+      end
     end
 
   end

data/lib/zabbixapi/item.rb

@@ -82,12 +82,7 @@ module Zabbix
 
     def item_exist?(host_id, item_name)
       item_id = get_item_id(host_id, item_name)
-      if item_id
-        result = true
-      else
-        result = false
-      end
-      return result
+      item_id ? true : false
     end
 
     def update_item(item_id, options)

data/lib/zabbixapi/mediatype.rb

@@ -37,14 +37,15 @@ module Zabbix
     end
 
     def delete_mediatype(mediatype)
-      mediatype_id = get_mediatype_id(mediatype)
-      message = {
-          'method' => 'mediatype.delete',
-          'params' => 
-              [mediatype_id]
-      }
-      response = send_request(message)
-      response ? true : false
+      if mediatype_id = get_mediatype_id(mediatype)
+        message = {
+            'method' => 'mediatype.delete',
+            'params' => 
+                [mediatype_id]
+        }
+        response = send_request(message)
+        response.empty? ? nil : response['mediatypeids'][0]
+      end
     end
 
   end

data/lib/zabbixapi/screen.rb

@@ -59,7 +59,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      response.empty? ? false : true
+      response.empty? ? nil : response[0]['screenids'].to_i
     end
 
     def del_all_graphs_from_screen(screen_id)
@@ -70,7 +70,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      response ? response : nil
+      response ? response[0]['screenids'].to_i : nil
     end
 
     def add_graph_to_screen(screen_id, graph_id, x, y)

data/lib/zabbixapi/template.rb

@@ -86,7 +86,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      return response
+      response.empty? ? nil : response['templateid'][0].to_i
     end
 
     def unlink_templates_from_hosts(templates_id, hosts_id)
@@ -101,7 +101,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      return response
+      response.empty? ? nil : response['templateids'][0].to_i
     end
 
   end

data/lib/zabbixapi/usermacro.rb

@@ -42,18 +42,5 @@ module Zabbix
       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
-          }
-      }
-      response = send_request(message)
-      return true
-    end
-
   end
 end

data/spec/localhost.rb

@@ -0,0 +1,129 @@
+require 'zabbixapi'
+require 'json'
+
+# settings
+api_url = 'http://zabbix.local/api_jsonrpc.php'
+api_login = 'Admin'
+api_password = 'zabbix'
+
+
+zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
+#zbx.debug = true
+
+# 01. Create group
+describe Zabbix::ZabbixApi, "create_group" do
+  it "Create some group" do
+    result = zbx.add_group('some_group')
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 02. Get group_id
+describe Zabbix::ZabbixApi, "get_group_id" do
+  it "Get group_id" do
+    result = zbx.get_group_id('some_group')
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 03. Get unknown group_id
+describe Zabbix::ZabbixApi, "get_group_id" do
+  it "Get unknown group" do
+    result = zbx.get_group_id('___some_group')
+    result.should be_nil
+  end
+end
+
+# 04. Create host
+host_options = { 
+  "ip"     => '127.0.0.1',
+  "dns"    => 'my.example.com',
+  "host"   => 'my.example.com',
+  "useip"  => 1,
+  "groups" => [1]
+}
+describe Zabbix::ZabbixApi, "create_host" do
+  it "Create host" do
+    result = zbx.add_host(host_options)
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 05. Get host
+describe Zabbix::ZabbixApi, "get_host" do
+  it "Get host by name" do
+    result = zbx.get_host_id('my.example.com')
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 06. Get unknown host
+describe Zabbix::ZabbixApi, "get_host" do
+  it "Get unknown host by name" do
+    result = zbx.get_host_id('___my.example.com')
+    result.should be_nil
+  end
+end
+
+# 07. Delete host
+describe Zabbix::ZabbixApi, "delete_host" do
+  it "Delete host" do
+    result = zbx.delete_host('my.example.com')
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 08. Delete unknown host
+describe Zabbix::ZabbixApi, "delete_unknown_host" do
+  it "Delete unknown host" do
+    result = zbx.delete_host('__my.example.com')
+    result.should be_nil
+  end
+end
+
+# 09. Delete group
+describe Zabbix::ZabbixApi, "delete_group" do
+  it "Delete some group" do
+    result = zbx.delete_group('some_group')
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 10. Delete unknown group
+describe Zabbix::ZabbixApi, "delete_unknown_group" do
+  it "Delete unknown group" do
+    result = zbx.delete_group('___some_group')
+    result.should be_nil
+  end
+end
+
+# 11. Mediatype create
+mediatype_options = { 
+  'type' => '0', #email
+  'description' => 'example_mediatype',
+  'smtp_server' => 'test.company.com',
+  'smtp_helo'   => 'test.company.com',
+  'smtp_email'  => 'test@test.company.com',
+}
+describe Zabbix::ZabbixApi, "create_mediatype" do
+  it "Create mediatype" do
+    result = zbx.add_mediatype(mediatype_options)
+    result.should be_kind_of(Integer)
+  end
+end
+
+# 12. Mediatype unknown delete
+describe Zabbix::ZabbixApi, "delete_unknown_mediatype" do
+  it "Delete unknown mediatype" do
+    result = zbx.delete_mediatype('__example_mediatype')
+    result.should be_nil
+  end
+end
+
+# 13. Mediatype delete
+describe Zabbix::ZabbixApi, "delete_mediatype" do
+  it "Delete mediatype" do
+    result = zbx.delete_mediatype('example_mediatype')
+    result.should be_kind_of(Integer)
+  end
+end

data/zabbixapi.gemspec

@@ -4,7 +4,7 @@ require 'rake'
 
 Gem::Specification.new do |spec|
 
-  spec.version = '0.1.6.2'
+  spec.version = '0.1.6.3'
   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.2
+  version: 0.1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies: []
 description: Ruby module for work with zabbix api v1.8.
 email: vadv.mkn@gmail.com
@@ -30,7 +30,7 @@ files:
 - lib/zabbixapi/template.rb
 - lib/zabbixapi/trigger.rb
 - lib/zabbixapi/usermacro.rb
-- spec/item.rb
+- spec/localhost.rb
 - zabbixapi.gemspec
 - README.rdoc
 - examples/config.yml

data/spec/item.rb

@@ -1,74 +0,0 @@
-require 'zabbixapi'
-require 'json'
-
-# settings
-api_url = 'http://zabbix.local/api_jsonrpc.php'
-api_login = 'Admin'
-api_password = 'zabbix'
-
-
-zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
-#zbx.debug = true
-
-# 01. Create group
-describe Zabbix::ZabbixApi, "create_group" do
-  it "Create some group" do
-    result = zbx.add_group('some_group')
-  end
-end
-
-# 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
-
-# 04. Delete group
-describe Zabbix::ZabbixApi, "delete_group" do
-  it "Delete some group" do
-    result = zbx.delete_group(zbx.get_group_id'some_group')
-  end
-end
-
-# 05. Delete host
-describe Zabbix::ZabbixApi, "delete_host" do
-  it "Delete host" do
-    result = zbx.delete_host('my.example.com')
-  end
-end
-
-# 06. Mediatype create
-mediatype_options = { 
-  'type' => '0',
-  'description' => 'example_mediatype',
-  'smtp_server' => 'test.company.com',
-  'smtp_helo'   => 'test.company.com',
-  'smtp_email'  => 'test@test.company.com',
-}
-describe Zabbix::ZabbixApi, "create_mediatype" do
-  it "Create mediatype" do
-    result = zbx.add_mediatype(mediatype_options)
-  end
-end
-
-# 07. Mediatype delete
-describe Zabbix::ZabbixApi, "create_mediatype" do
-  it "Delete mediatype" do
-    result = zbx.delete_mediatype('example_mediatype')
-  end
-end