zabbixapi 0.1.6.3 → 0.1.6.4

data/README.rdoc

@@ -2,6 +2,8 @@
 
 Simple and lightweight ruby module for work with zabbix api version 1.8.x
 
+{<img src="https://travis-ci.org/vadv/zabbixapi.png">}[https://travis-ci.org/vadv/zabbixapi]
+
 You can:
 * Create and delete host/template/application/items/triggers and screens;
 * Get info about all zabbix essences;

data/lib/zabbixapi/application.rb

@@ -1,6 +1,6 @@
 module Zabbix
-
   class ZabbixApi
+
     def add_application(app_options)
       app_options_default = {
           'hostid' => nil,
@@ -14,20 +14,27 @@ module Zabbix
       responce = send_request(message)
       responce.empty? ? nil : responce['applicationids'][0].to_i
     end
-  end
 
-  def get_app_id(host_id, app_name)
-    message = {
-        'method' => 'application.get',
-        'params' => {
-            'filter' => {
-                'name' => app_name,
-                'hostid' => host_id
-            }
-        }
-    }
-    responce = send_request(message)
-    responce.empty? ? nil : responce[0]['applicationid']
-  end
+    def add_or_get_application(host_id, app_options)
+      unless a_id = get_app_id(host_id, app_options['name'])
+        a_id = add_application(app_options)
+      end
+      return a_id
+    end
 
+    def get_app_id(host_id, app_name)
+      message = {
+          'method' => 'application.get',
+          'params' => {
+              'filter' => {
+                  'name' => app_name,
+                  'hostid' => host_id
+              }
+          }
+      }
+      responce = send_request(message)
+      responce.empty? ? nil : responce[0]['applicationid']
+    end
+
+  end
 end

data/lib/zabbixapi/graph.rb

@@ -7,7 +7,7 @@ module Zabbix
           'params' => graph
       }
       response = send_request(message)
-      response.empty? ? nil : response[0]['graphid']
+      response.empty? ? nil : response['graphids'][0]
     end
 
     def get_graph_id(host_id, graph_name)
@@ -24,6 +24,13 @@ module Zabbix
       response.empty? ? nil : response[0]['graphid']
     end
 
+    def add_or_get_graph(host_id, graph)
+      unless g_id = get_graph_id(host_id, graph['name'])
+        g_id = add_graph(graph)
+      end
+      return g_id
+    end
+
     def get_graphs(host_id)
       message = {
           'method' => 'graph.get',

data/lib/zabbixapi/group.rb

@@ -30,6 +30,13 @@ module Zabbix
       response ? response['groupids'][0].to_i : nil
     end
 
+    def add_or_get_group(groupname)
+      unless g_id = get_group_id([groupname])
+        g_id = add_group(groupname)
+      end
+      return g_id
+    end
+
     def delete_group(groupname)
       if group_id = get_group_id(groupname)
         message = {

data/lib/zabbixapi/item.rb

@@ -80,6 +80,13 @@ module Zabbix
       response.empty? ? nil : response[0]['itemid']
     end
 
+    def add_or_get_item(host_id, item_options)
+      unless i_id = get_item_id(host_id, item_options['description'])
+        i_id = add_item(item_options)
+      end
+      return i_id
+    end
+
     def item_exist?(host_id, item_name)
       item_id = get_item_id(host_id, item_name)
       item_id ? true : false

data/lib/zabbixapi/template.rb

@@ -16,6 +16,13 @@ module Zabbix
       response.empty? ? nil : response['templateids'][0].to_i
     end
 
+    def add_or_get_template(template_options)
+      unless t_id = get_template_id(template_options['host'])
+        t_id = add_template(template_options)
+      end
+      return t_id
+    end
+
     def get_template_ids_by_host(host_id)
       message = {
           'method' => 'template.get',
@@ -72,7 +79,7 @@ module Zabbix
           }
       }
       response = send_request(message)
-      response.empty? ? nil : response.keys[0]
+      response.empty? ? nil : response[0]['templateid'].to_i
     end
 
     def link_templates_with_hosts(templates_id, hosts_id)
@@ -104,5 +111,18 @@ module Zabbix
       response.empty? ? nil : response['templateids'][0].to_i
     end
 
+    def delete_template(template_name)
+      message = {
+          'method' => 'template.delete',
+          'params' => [
+              {
+                "templateid" => get_template_id(template_name)
+              }
+            ]
+      }
+      response = send_request(message)
+      response.empty? ? nil : response['templateids'][0].to_i
+    end
+
   end
 end

data/lib/zabbixapi/trigger.rb

@@ -4,19 +4,26 @@ module Zabbix
     def add_trigger(trigger)
       message = {
           'method' => 'trigger.create',
-          'params' => [trigger]
+          'params' => [ trigger ]
       }
       response = send_request(message)
       response.empty? ? nil : response['triggerids'][0]
     end
 
+    def add_or_get_trigger(host_id, trigger)
+      unless tr_id = get_trigger_id(host_id, trigger['description'])
+        tr_id = add_trigger(trigger)
+      end
+      return tr_id
+    end
+
     def get_trigger_id(host_id, trigger_name)
       message = {
           'method' => 'trigger.get',
           'params' => {
               'filter' => {
                   'hostid' => host_id,
-                  'description' => trigger_name
+                  'description' => [ trigger_name ]
               }
           }
       }

data/spec/localhost.rb

@@ -2,7 +2,7 @@ require 'zabbixapi'
 require 'json'
 
 # settings
-api_url = 'http://zabbix.local/api_jsonrpc.php'
+api_url = 'http://localhost/zabbix/api_jsonrpc.php'
 api_login = 'Admin'
 api_password = 'zabbix'
 
@@ -10,120 +10,97 @@ 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
+
+  # 01. Create group
   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
+  # 02. Get group_id
   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
+  # 03. Get unknown group_id
   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
+  # 04. Create host
+  host_options = { 
+    "ip"     => '127.0.0.1',
+    "dns"    => 'my.example.com',
+    "host"   => 'my.example.com',
+    "useip"  => 1,
+    "groups" => [1]
+  }
   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
+  # 05. Get host
   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
+  # 06. Get unknown host
   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
+  # 07. Delete host
   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
+  # 08. Delete unknown host
   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
+  # 09. Delete group
   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
+  # 10. Delete unknown group
   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
+  # 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',
+  }
   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
+  # 12. Mediatype unknown delete
   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
+  # 13. Mediatype delete
   it "Delete mediatype" do
     result = zbx.delete_mediatype('example_mediatype')
     result.should be_kind_of(Integer)
   end
+
 end

data/spec/request.rb

@@ -0,0 +1,130 @@
+require 'zabbixapi'
+require 'json'
+require 'servers/server18'
+
+# settings
+api_url = 'http://somehost'
+api_login = ''
+api_password = ''
+
+
+zbx = Zabbix::ZabbixApi.new(api_url, api_login, api_password)
+#zbx.debug = true
+
+describe Zabbix::ZabbixApi do
+
+  before :each do
+    # stub auth tocken
+    Zabbix::ZabbixApi.any_instance.stub(:auth).and_return "a9a1f569d10d6339f23c4d122a7f5c46" 
+    # stub resquest
+    @request = mock
+    Net::HTTP.any_instance.stub(:request).and_return @request
+    @request.stub(:code).and_return "200"
+  end
+
+  # 01. Create group
+  it "Create some group" do
+    @request.stub(:body).and_return Server18.hostgroup_create
+    result = zbx.add_group('some_group')
+    result.should equal(107819)
+  end
+
+  # 02. Get group_id
+  it "Get group_id" do
+    @request.stub(:body).and_return Server18.hostgroup_get
+    result = zbx.get_group_id('some_group')
+    result.should equal(100100000000002)
+  end
+
+  # 03. Get unknown group_id
+  it "Get unknown group" do
+    @request.stub(:body).and_return Server18.hostgroup_get_error
+    result = zbx.get_group_id('___some_group')
+    result.should be_nil
+  end
+
+  # 04. Create host
+  host_options = { 
+    "ip"     => '127.0.0.1',
+    "dns"    => 'my.example.com',
+    "host"   => 'my.example.com',
+    "useip"  => 1,
+    "groups" => [1]
+  }
+  it "Create host" do
+    @request.stub(:body).and_return Server18.host_create
+    result = zbx.add_host(host_options)
+    result.should equal(107819)
+  end
+
+  # 05. Get host
+  it "Get host by name" do
+    @request.stub(:body).and_return Server18.host_get
+    result = zbx.get_host_id('my.example.com')
+    result.should equal(100100000010017)
+  end
+
+  # 06. Get unknown host
+  it "Get unknown host by name" do
+    @request.stub(:body).and_return Server18.host_get_error
+    result = zbx.get_host_id('___my.example.com')
+    result.should be_nil
+  end
+
+  # 07. Delete host
+  it "Delete host" do
+    @request.stub(:body).and_return Server18.host_delete
+    result = zbx.delete_host('my.example.com')
+    result.should be_kind_of(Integer)
+  end
+
+  # 08. Delete unknown host
+  it "Delete unknown host" do
+    @request.stub(:body).and_return Server18.host_delete_error
+    result = zbx.delete_host('__my.example.com')
+    result.should be_nil
+  end
+
+  # 09. Delete group
+  it "Delete some group" do
+    @request.stub(:body).and_return Server18.hostgroup_delete
+    result = zbx.delete_group('some_group')
+    result.should be_kind_of(Integer)
+  end
+
+  # 10. Delete unknown group
+  it "Delete unknown group" do
+    @request.stub(:body).and_return Server18.hostgroup_delete_error
+    result = zbx.delete_group('___some_group')
+    result.should be_nil
+  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',
+  }
+  it "Create mediatype" do
+    @request.stub(:body).and_return Server18.mediatype_create
+    result = zbx.add_mediatype(mediatype_options)
+    result.should equal(100100000214797)
+  end
+
+  # 12. Mediatype unknown delete
+  it "Delete unknown mediatype" do
+    @request.stub(:body).and_return Server18.mediatype_delete_error
+    result = zbx.delete_mediatype('__example_mediatype')
+    result.should be_nil
+  end
+
+  # 13. Mediatype delete
+  it "Delete mediatype" do
+    @request.stub(:body).and_return Server18.mediatype_delete    
+    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.3'
+  spec.version = '0.1.6.4'
   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.3
+  version: 0.1.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Ruby module for work with zabbix api v1.8.
 email: vadv.mkn@gmail.com
@@ -29,8 +29,10 @@ files:
 - lib/zabbixapi/screen.rb
 - lib/zabbixapi/template.rb
 - lib/zabbixapi/trigger.rb
+- lib/zabbixapi/user.rb
 - lib/zabbixapi/usermacro.rb
 - spec/localhost.rb
+- spec/request.rb
 - zabbixapi.gemspec
 - README.rdoc
 - examples/config.yml