zabbixapi 0.5.0b2 → 0.5.0b3

data/lib/zabbixapi/items.rb

@@ -1,9 +1,16 @@
 class ZabbixApi
-  class Items
+  class Items < Basic
 
-    def initialize(options = {})
-      @client = Client.new(options)
-      @options = options
+    def api_method_name
+      "item"
+    end
+
+    def api_identify
+      "description"
+    end
+
+    def initialize(client)
+      @client = client
       @item_default_options = {
         :description => nil,
         :key_ => nil,
@@ -48,40 +55,14 @@ class ZabbixApi
     def create(data)
       result = @client.api_request(:method => "item.create", :params => [merge_params(data)] )
       result.empty? ? nil : result['itemids'][0].to_i
-    end
-
-    def add(data)
-      create(data)
-    end    
+    end  
 
     def get_full_data(data)
-      @client.api_request(:method => "item.get", :params => {:filter => data, :output => "extend"})
-    end
-
-    def get_id(data)
-      result = get_full_data(data)
-      itemid = nil
-      result.each { |item| itemid = item['itemid'].to_i if item['name'] == data[:name] }
-      itemid
-    end
-
-    def create_or_update(data)
-      itemid = get_id(:description => data[:description], :hostid => data[:hostid])
-      itemid ? update(data.merge(:itemid => itemid)) : create(data)
-    end
-
-    def update(data)
-      result = @client.api_request(:method => "item.update", :params => data)
-      result.empty? ? nil : result['itemids'][0].to_i
+      get_full_data_filter(data)
     end
 
     def delete(data)
-      result = @client.api_request(:method => "item.delete", :params => [data])
-      result.empty? ? nil : result['itemids'][0].to_i
-    end
-
-    def destroy(data)
-      delete(data)
+      delete_array(data)
     end
 
   end

data/lib/zabbixapi/mediatypes.rb

@@ -1,62 +1,28 @@
 class ZabbixApi
-  class Mediatypes
+  class Mediatypes < Basic
 
-    def initialize(options = {})
-      @client = Client.new(options)
-      @options = options
-      @default_mediatype_options = {
-        :description => "", #Name
-        :type => 0,         #0 - Email, 1 - External script, 2 - SMS, 3 - Jabber, 100 - EzTexting
-        :smtp_server => "", 
-        :smtp_helo   => "",
-        :smtp_email  => "",  #Email address of Zabbix server
-        :exec_path => "",    #Name of external script
-        :gsm_modem => "",    #Serial device name of GSM modem
-        :username  => "",    #Jabber user name used by Zabbix server
-        :passwd    => ""     #Jabber password used by Zabbix server
-      }
-    end
+    #:description => "",  #Name
+    #:type => 0,          #0 - Email, 1 - External script, 2 - SMS, 3 - Jabber, 100 - EzTexting
+    #:smtp_server => "", 
+    #:smtp_helo   => "",
+    #:smtp_email  => "",  #Email address of Zabbix server
+    #:exec_path => "",    #Name of external script
+    #:gsm_modem => "",    #Serial device name of GSM modem
+    #:username  => "",    #Jabber user name used by Zabbix server
+    #:passwd    => "",   #Jabber password used by Zabbix server
 
-    # Create MediaType
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :description => "MediaGroup" and mediatype options
-    # * *Returns* :
-    #   - Nil or Integer
-    def create(data)
-      result = @client.api_request(:method => "mediatype.create", :params => data)
-      result ? result['mediatypeids'][0].to_i : nil
+    def api_method_name
+      "mediatype"
     end
 
-    # Add MediaType
-    # Synonym create
-    def add(data)
-      create(data)
+    def api_identify
+      "name"
     end
 
-    # Delete MediaType
-    #
-    # * *Args*    :
-    #   - +data+ -> Array with mediatypeids
-    # * *Returns* :
-    #   - Nil or Integer
     def delete(data)
-      result = @client.api_request(:method => "mediatype.delete", :params => [data])
-      result ? result['mediatypeids'][0].to_i : nil
-    end
-
-    # Destroy MediaType
-    # Synonym delete
-    def destroy(data)
-      delete(data)
+      delete_array(data)
     end
 
-    # Get MediaType info
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :description => "MediaType"
-    # * *Returns* :
-    #   - Nil or Integer
     def get_full_data(data)
       @client.api_request(
         :method => "mediatype.get", 
@@ -67,44 +33,5 @@ class ZabbixApi
         )
     end
 
-    def get(data)
-      get_full_data(data)
-    end
-
-    # Return MediaTypeid
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :description => "MediaType"
-    # * *Returns* :
-    #   - Nil or Integer 
-    def get_id(data)
-      result = get_full_data(data)
-      mediatypeid = nil
-      result.each { |mt| mediatypeid = mt['mediatypeid'].to_i if mt['description'] == data[:description] }
-      mediatypeid
-    end
-
-    # Return MediaTypeid
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :description => "MediaType"
-    # * *Returns* :
-    #   - Nil or Integer
-    def update(data)
-      result = @client.api_request(:method => "mediatype.update", :params => data)
-      result.empty? ? nil : result['mediatypeids'][0].to_i
-    end
-
-    # Return MediaTypeid
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "UserGroup"
-    # * *Returns* :
-    #   - Integer
-    def create_or_update(data)
-      mediatypeid = get_id(:description => data[:description], :mediatypeid => data[:mediatypeid])
-      mediatypeid ? update(data.merge(:mediatypeid => mediatypeid)) : create(data)      
-    end
-
   end
 end

data/lib/zabbixapi/screens.rb

@@ -1,5 +1,13 @@
 class ZabbixApi
-  class Screens
+  class Screens < Basic
+
+    def api_method_name
+      "screen"
+    end
+
+    def api_identify
+      "name"
+    end
 
     # extracted from frontends/php/include/defines.inc.php
     #SCREEN_RESOURCE_GRAPH => 0,
@@ -20,42 +28,6 @@ class ZabbixApi
     #SCREEN_RESOURCE_SYSTEM_STATUS => 15,
     #SCREEN_RESOURCE_HOST_TRIGGERS => 16
 
-    def initialize(options = {})
-      @client = Client.new(options)
-      @options = options
-      @screeb_default_options = {
-        :vsize => 3
-      }
-    end
-
-    # Create screen
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "Screen name", hsize (rows) and vsize (columns) and array :screenitems => []
-    #   screenitems contains :resourcetype (0 - graph), :resourcetypeid (id item) and :x and :y position
-    # * *Returns* :
-    #   - Nil or Integer
-    def create(data)
-      result = @client.api_request(:method => "screen.create", :params => data)
-      result ? result['screenids'][0].to_i : nil
-    end
-
-    # Create screen
-    # Synonym create
-    def add(data)
-      create(data)
-    end
-
-    # Update screen
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :screenid => [ "screenid" ]
-    # * *Returns* :
-    #   - Nil or Integer
-    def update(data)
-      result = @client.api_request(:method => "screen.update", :params => data)
-      result ? result['screenids'][0].to_i : nil      
-    end
 
     # Return info about screen
     # 
@@ -68,29 +40,6 @@ class ZabbixApi
       result.empty? ? [] : result
     end
 
-    # Return screenid
-    # 
-    # * *Args*    : 
-    #   - +data+ -> Hash with :name => "Screen name"
-    # * *Returns* :
-    #   - Nil or Integer
-    def get_id(data)
-      result = get_full_data(data)
-      screenid = nil
-      result.each { |screen| screenid = screen['screenid'].to_i if screen['name'] == data[:name] }
-      screenid
-    end
-
-    # Delete screen
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :params => [screenid]
-    # * *Returns* :
-    #   - Nil or Integer
-    def delete(data)
-      result = @client.api_request(:method => "screen.delete", :params => data)
-      result.empty? ? nil : result['screenids'][0].to_i
-    end
 
     # Create screen all graphs for host
     #

data/lib/zabbixapi/server.rb

@@ -3,10 +3,10 @@ class ZabbixApi
 
     attr :version
 
-    def initialize(options = {})
-      @client = Client.new(options)
+    def initialize(client)
+      @client = client
       @version = @client.api_request(:method => "apiinfo.version", :params => {})
     end
 
   end
-end
+end

data/lib/zabbixapi/templates.rb

@@ -1,51 +1,22 @@
 class ZabbixApi
-  class Templates
+  class Templates < Basic
 
-    def initialize(options = {})
-      @client = Client.new(options)
-      @options = options
+    def api_method_name
+      "template"
     end
 
-    # Create template
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
-    # * *Returns* :
-    #   - Nil or Integer
-    def create(data)
-      result = @client.api_request(:method => "template.create", :params => [data])
-      result.empty? ? nil : result['templateids'][0].to_i
+    def api_identify
+      "name"
     end
 
-    # Add template
-    # Synonym create
-    def add(data)
-      create(data)
+    def create(data)
+      create_array(data)
     end
 
-    # Delete template
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :host => "Template_Name"
-    # * *Returns* :
-    #   - Nil or Integer
     def delete(data)
-      result = @client.api_request(:method => "template.delete", :params => [:templateid => data])
-      result.empty? ? nil : result['templateids'][0].to_i
+      delete_array_sym(data)
     end
 
-    # Destroy template
-    # Synonym delete
-    def destroy(data)
-      delete(data)
-    end
-
-    # Return templateids linked with host 
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :hostids => [hostid]
-    # * *Returns* :
-    #   - Array with templateids
     def get_ids_by_host(data)
       result = []
       @client.api_request(:method => "template.get", :params => data).each do |tmpl|
@@ -53,19 +24,7 @@ class ZabbixApi
       end
       result
     end
-
-    # Return templateid
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
-    # * *Returns* :
-    #   - Integer
-    def get_or_create(data)
-      unless templateid = get_id(:host => data[:host])
-        templateid = create(data)
-      end
-      templateid
-    end   
+   
 
     # Analog Zabbix api call massUpdate
     # 
@@ -156,17 +115,5 @@ class ZabbixApi
       end
     end
 
-    # Return info about template
-    # 
-    # * *Args*    : 
-    #   - +data+ -> Hash with :host => "Template name"
-    # * *Returns* :
-    #   - Nil or Integer
-    def get_id(data)
-      templateid = nil
-      get_full_data(data).each { |template| templateid = template['templateid'].to_i if template['host'] == data[:host] }
-      templateid
-    end
-
   end
-end
+end

data/lib/zabbixapi/triggers.rb

@@ -1,49 +1,25 @@
 class ZabbixApi
-  class Triggers
+  class Triggers < Basic
 
-    def initialize(options = {})
-      @client = Client.new(options)
-      @options = options
+    def api_method_name
+      "trigger"
     end
 
-    def create(data)
-      result = @client.api_request(:method => "trigger.create", :params => [data])
-      result.empty? ? nil : result['triggerids'][0].to_i
-    end
-
-    def add(data)
-      create(data)
+    def api_identify
+      "description"
     end
 
     def delete(data)
-      result = @client.api_request(:method => "trigger.delete", :params => [data])
-      result.empty? ? nil : result['triggerids'][0].to_i
-    end
-
-    def destroy(data)
-      delete(data)
+      delete_array(data)
     end
 
-    def update(data)
-      result = @client.api_request(:method => "trigger.update", :params => data)
-      result.empty? ? nil : result['triggerids'][0].to_i
-    end
-
-    def create_or_update(data)
-      triggerid = get_id(:description => data[:description], :templateid => data[:templateid])
-      triggerid ? update(data.merge(:triggerid => triggerid)) : create(data)
+    def create(data)
+      create_array(data)
     end
 
     def get_full_data(data)
-      @client.api_request(:method => "trigger.get", :params => {:filter => data, :output => "extend"})
-    end
-
-    def get_id(data)
-      result = get_full_data(data)
-      triggerid = nil
-      result.each { |template| triggerid = template['triggerid'].to_i if template['name'] == data[:name] }
-      triggerid
+      get_full_data_filter(data)
     end
 
   end
-end
+end