zabbixapi 0.1.6 → 0.1.6.1

data/README.rdoc

@@ -3,21 +3,35 @@
 Simple and lightweight ruby module for work with zabbix api version 1.8.x
 
 You can:
-* Create host/template/application/items/triggers and screens;
+* Create and delete host/template/application/items/triggers and screens;
 * Get info about all zabbix essences;
 
 == Installation
 
     gem install zabbixapi
 
-== Get Start.
+== Get Start
 
-* Get hostid from zabbix api:
+* Create host and get hostid from zabbix api:
 
-    zbx = Zabbix::ZabbixApi.new('https://zabbix.example.com', 'login', 'password')
-    hostid = zbx.get_host_id('my.example.com')
+    zbx    = Zabbix::ZabbixApi.new('https://zabbix.example.com', 'login', 'password')
+    host_options = { 
+      "ip"     => '127.0.0.1',
+      "dns"    => 'my.example.com',
+      "host"   => 'my.example.com',
+      "useip"  => 1,
+      "groups" => ['some_group']
+    }
+    if zbx.create_host(host_options)
+      puts zbx.get_host_id('my.example.com')
+    end
 
-    p hostid
+* Create hostgroup and get hostgroupid from zabbix api:
+
+    zbx   = Zabbix::ZabbixApi.new('https://zabbix.example.com', 'login', 'password')
+    if zbx.add_group('some_group') 
+      puts zbx.get_group_id('some_group')
+    end
 
 == Dependencies
 

data/examples/zabbix_filesystem

@@ -11,7 +11,7 @@ mount_point = opt["m"]
 group_name = opt["g"]
 zabbix_env = opt["E"]
 
-if ( mount_point == "/" )
+if mount_point == "/"
   template_name = "TMPL_Filesystem_root"
   app_name = "Filesystem_root"
 else

data/lib/zabbixapi/application.rb

@@ -1,50 +1,33 @@
 module Zabbix
+
   class ZabbixApi
     def add_application(app_options)
-
       app_options_default = {
-        'hostid' => nil,
-        'name' => nil
+          'hostid' => nil,
+          'name' => nil
       }
-
       application = merge_opt(app_options_default, app_options)
       message = {
-        'method' => 'application.create',
-        'params' => application
+          'method' => 'application.create',
+          'params' => application
       }
-
       responce = send_request(message)
-
-      unless responce.empty? then
-        result = responce['applicationids'][0].to_i
-      else
-        result = nil
-      end 
-
-      return result
+      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
+        'method' => 'application.get',
+        'params' => {
+            'filter' => {
+                'name' => app_name,
+                'hostid' => host_id
+            }
         }
-      }
     }
-
     responce = send_request(message)
+    responce.empty? ? nil : responce[0]['applicationid']
+  end
 
-    unless responce.empty? then
-      result = responce[0]['applicationid']
-    else
-      result = nil 
-    end 
-
-    return result
-  end 
 end

data/lib/zabbixapi/base.rb

@@ -25,7 +25,7 @@ module Zabbix
 
     attr_accessor :debug
 
-    def initialize ( api_url, api_user, api_password )
+    def initialize (api_url, api_user, api_password)
       @api_url = api_url
       @api_user = api_user
       @api_password = api_password
@@ -45,7 +45,7 @@ module Zabbix
       uri = URI.parse(@api_url)
       http = Net::HTTP.new(uri.host, uri.port)
 
-      if ( uri.scheme == "https" ) then
+      if uri.scheme == "https"
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
@@ -74,6 +74,11 @@ module Zabbix
 
       response_body_hash = JSON.parse(response.body)
 
+      if @debug
+        puts "[ZBXAPI] : INFO : Response body"
+        puts response_body_hash.inspect
+      end
+
       if error = response_body_hash['error']
         error_message = error['message']
         error_data = error['data']
@@ -82,17 +87,15 @@ module Zabbix
         e_message = "Code: [" + error_code.to_s + "]. Message: [" + error_message +\
               "]. Data: [" + error_data + "]."
 
-        case error_code.to_s 
-        when '-32602'
-          raise Zabbix::AlreadyExist.new(e_message)
-        else
-          raise Zabbix::ResponseError.new(e_message)
+        case error_code.to_s
+          when '-32602'
+            raise Zabbix::AlreadyExist.new(e_message)
+          else
+            raise Zabbix::ResponseError.new(e_message)
         end
       end
 
-      result = response_body_hash['result']
-
-      return result
+      return response_body_hash['result']
     end
 
     def send_request(message)
@@ -101,33 +104,29 @@ module Zabbix
     end
 
     def auth()
-
       auth_message = {
-        'auth' =>  nil,
-        'method' =>  'user.authenticate',
-        'params' =>  {
-          'user' => @api_user,
-          'password' => @api_password,
-          '0' => '0'
-        }
+          'auth' => nil,
+          'method' => 'user.authenticate',
+          'params' => {
+              'user' => @api_user,
+              'password' => @api_password,
+              '0' => '0'
+          }
       }
-
-      auth_id = do_request(auth_message)
-
-      return auth_id
+    do_request(auth_message)
     end
 
 # Utils. 
+    
     def merge_opt(a, b)
       c = {}
-
       b.each_pair do |key, value|
         if a.has_key?(key) then
           c[key] = value
         end
-     end
-
+      end
       return a.merge(c)
     end
+
   end
 end

data/lib/zabbixapi/graph.rb

@@ -3,64 +3,50 @@ module Zabbix
 
     def add_graph(graph)
       message = {
-        'method' => 'graph.create',
-        'params' => graph
+          'method' => 'graph.create',
+          'params' => graph
       }
-
       response = send_request(message)
-
       return 0
     end
 
     def get_graph_id(host_id, graph_name)
-
       message = {
-        'method' => 'graph.get',
-        'params' => {
-          'filter' => {
-            'name' => graph_name,
-            'hostid' => host_id
+          'method' => 'graph.get',
+          'params' => {
+              'filter' => {
+                  'name' => graph_name,
+                  'hostid' => host_id
+              }
           }
-        }
       }
-
       response = send_request(message)
-
-      unless ( response.empty? ) then
-        result = response[0]['graphid']
-      else
-        result = nil
-      end
+      response.empty? ? nil : response[0]['graphid']
     end
 
     def get_graphs(host_id)
-
       message = {
-        'method' => 'graph.get',
-        'params' => {
-          'extendoutput' => '1',
-          'filter' => {
-            'hostid' => host_id
+          'method' => 'graph.get',
+          'params' => {
+              'extendoutput' => '1',
+              'filter' => {
+                  'hostid' => host_id
+              }
           }
-        }
       }
-
       response = send_request(message)
-
-      unless ( response.empty? ) then
+      if response.empty?
+        result = nil
+      else
         result = {}
-
         response.each() do |graph|
           graph_id = graph['graphid']
           graph_name = graph['name']
-
           result[graph_id] = graph_name
         end
-      else
-        result = nil
       end
-
       return result
     end
+
   end
 end

data/lib/zabbixapi/group.rb

@@ -1,78 +1,58 @@
 module Zabbix
-
   class ZabbixApi
-    def get_group_id(pattern)
 
+    def get_group_id(pattern)
       message = {
-        'method' => 'hostgroup.get',
-        'params' => {
-          'filter' => {
-            'name' => pattern
+          'method' => 'hostgroup.get',
+          'params' => {
+              'filter' => {
+                  'name' => pattern
+              }
           }
-        }
       }
-
       response = send_request(message)
-
-      if not ( response.empty? ) then
-        result = response[0]['groupid']
-      else
-        result = nil
-      end
-
-      return result
+      response.empty? ? nil : response[0]['groupid']
     end
 
     def group_exist?(pattern)
-
       group_id = get_groups_id(pattern)
-
-      if ( group_id ) then
-        return true
-      else
-        return false
-      end
+      group_id ? true : false
     end
 
     def add_group(groupname)
-
       message = {
-        'method' => 'hostgroup.create',
-        'params' => {
-          'name' => groupname
-        }
+          'method' => 'hostgroup.create',
+          'params' => {
+              'name' => groupname
+          }
       }
-
       response = send_request(message)
+      response ? response['groupids'][0].to_i : nil
+    end
 
-      if ( response ) then
-        result = response['groupids'][0].to_i
-      else
-        result = nil
-      end
-
-      return result
+    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
     end
 
     def add_host_to_group(host_id, group_id)
-      
       message = {
-        'method' => 'hostgroup.massAdd',
-        'params' => {
-          'groups' => [ group_id ],
-          'hosts' => [ host_id ]
-        }
+          'method' => 'hostgroup.massAdd',
+          'params' => {
+              'groups' => [group_id],
+              'hosts' => [host_id]
+          }
       }
-
       response = send_request(message)
-
-      if not ( response.empty? ) then
-        result = true
-      else
-        result = false
-      end
-      
-      return result
+      response.empty? ?  false : true
     end
+
   end
 end

data/lib/zabbixapi/host.rb

@@ -1,86 +1,68 @@
 module Zabbix
-
   class ZabbixApi
+
     def update_host(host_id, host_options)
       host = host_options
       host['hostid'] = host_id
-
-      message = { 
-        'method' => 'host.update',
-        'params' => host
-      }   
-
+      message = {
+          'method' => 'host.update',
+          'params' => host
+      }
       responce = send_request(message)
-
-      if not ( responce.empty? ) then
-        result = responce['hostids'][0].to_i
-      else
-        result = nil 
-      end 
-
-      return result
-    end 
+      responce.empty? ?  nil : responce['hostids'][0].to_i
+    end
 
     def add_host(host_options)
-
       host_default = {
-        'host' => nil,
-        'port' => 10050,
-        'status' => 0,
-        'useip' => 0,
-        'dns' => '',
-        'ip' => '0.0.0.0',
-        'proxy_hostid' => 0,
-        'groups' => [],
-        'useipmi' => 0,
-        'ipmi_ip' => '',
-        'ipmi_port' => 623,
-        'ipmi_authtype' => 0,
-        'ipmi_privilege' => 0,
-        'ipmi_username' => '',
-        'ipmi_password' => ''
+          'host' => nil,
+          'port' => 10050,
+          'status' => 0,
+          'useip' => 0,
+          'dns' => '',
+          'ip' => '0.0.0.0',
+          'proxy_hostid' => 0,
+          'groups' => [],
+          'useipmi' => 0,
+          'ipmi_ip' => '',
+          'ipmi_port' => 623,
+          'ipmi_authtype' => 0,
+          'ipmi_privilege' => 0,
+          'ipmi_username' => '',
+          'ipmi_password' => ''
       }
-
-      host_options['groups'].map! { |group_id| {'groupid' => group_id} }
-
+      host_options['groups'].nil? || host_options['groups'].map! { |group_id| {'groupid' => get_group_id(group_id)} }
       host = merge_opt(host_default, host_options)
-
       message = {
-        'method' => 'host.create',
-        'params' => host
+          'method' => 'host.create',
+          'params' => host
       }
-
       response = send_request(message)
-
-      unless response.empty? then
-        result = response['hostids'][0].to_i
-      else
-        result = nil
-      end
-
-      return result
+      response.empty? ? nil : response['hostids'][0].to_i
     end
 
     def get_host_id(hostname)
-  
       message = {
-        'method' => 'host.get',
-        'params' => {
-          'filter' => {
-            'host' => hostname
+          'method' => 'host.get',
+          'params' => {
+              'filter' => {
+                  'host' => hostname
+              }
           }
-        }
       }
-
       response = send_request(message)
+      response.empty? ?  nil : response[0]['hostid'].to_i
+    end
 
-      unless response.empty? then
-        result = response[0]['hostid'].to_i
-      else
-        result = nil
-      end
-
-      return result
+    def delete_host(hostname)
+      host_id = get_host_id(hostname)
+      message = {
+          'method' => 'host.delete',
+          'params' => {
+              'hostid' => host_id
+          }
+      }
+      send_request(message)
     end
+
   end
 end