zabbixapi 0.5.0b3 → 0.5.0b4

data/README.md

@@ -3,7 +3,6 @@
 Simple and lightweight ruby module for work with zabbix api 
 
 [![Build Status](https://travis-ci.org/vadv/zabbixapi.png)](https://travis-ci.org/vadv/zabbixapi)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/vadv/zabbixapi)
 
 #####Now worked with zabbix 
 * 1.8.2 (api version 1.2)

data/lib/zabbixapi.rb

@@ -1,6 +1,5 @@
-require "zabbixapi/basic"
-require "zabbixapi/client"
 require "zabbixapi/version"
+require "zabbixapi/client"
 require "zabbixapi/server"
 require "zabbixapi/applications"
 require "zabbixapi/templates"
@@ -17,65 +16,47 @@ require "zabbixapi/mediatypes"
 class ZabbixApi
 
   attr :client
+  attr :server
+  attr :users
+  attr :items
+  attr :applications
+  attr :templates
+  attr :hostgroups
+  attr :hosts
+  attr :triggers
+  attr :graphs
+  attr :screens
+  attr :usergroups
+  attr :mediatypes
 
   def self.connect(options = {})
     new(options)
   end
 
+  def self.current
+    @current ||= ZabbixApi.new
+  end
+
   def query(data)
     @client.api_request(:method => data[:method], :params => data[:params])
   end
 
   def initialize(options = {})
+    
     @client = Client.new(options)
-  end
-
-  def server
-    @server ||= Server.new(@client)
-  end
-
-  def users
-    @users ||= Users.new(@client)
-  end
-
-  def items
-    @items ||= Items.new(@client)
-  end
-
-  def hosts
-    @hosts ||= Hosts.new(@client)
-  end
-
-  def applications
-    @applications ||= Applications.new(@client)
-  end
-
-  def templates
-    @templates ||= Templates.new(@client)
-  end
-
-  def hostgroups
-    @hostgroups ||= HostGroups.new(@client)
-  end
-
-  def triggers
-    @triggers ||= Triggers.new(@client)
-  end
-
-  def graphs
-    @graphs ||= Graphs.new(@client)
-  end
-
-  def screens
-    @screens ||= Screens.new(@client)
-  end
-
-  def usergroups
-    @usergroups ||= Usergroups.new(@client)
-  end
 
-  def mediatypes
-    @mediatypes ||= Mediatypes.new(@client)
+    @server = Server.new(@client)
+    @users   = Users.new(@client)
+    @items   = Items.new(@client)
+    @hosts   = Hosts.new(@client)
+    @applications = Applications.new(@client)
+    @templates    = Templates.new(@client)
+    @hostgroups   = HostGroups.new(@client)
+    @triggers = Triggers.new(@client)
+    @graphs = Graphs.new(@client)
+    @screens = Screens.new(@client)
+    @usergroups = Usergroups.new(@client)
+    @mediatypes = Mediatypes.new(@client)
   end
 
 end

data/lib/zabbixapi/applications.rb

@@ -1,24 +1,44 @@
 class ZabbixApi
-  class Applications < Basic
+  class Applications
 
-    def api_method_name
-      "application"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    def create(data)
+      result = @client.api_request(:method => "application.create", :params => [data])
+      result.empty? ? nil : result['applicationids'][0].to_i
     end
 
-    def create(data)
-      create_array(data)
+    def add(data)
+      create(data)
     end
 
     def delete(data)
-      delete_array(data)
+      result = @client.api_request(:method => "application.delete", :params => [data])
+      result.empty? ? nil : result['applicationids'][0].to_i
+    end
+
+    def get_or_create(data)
+      unless appid = get_id(data)
+        appid = create(data)
+      end
+      appid
+    end
+
+    def destroy(data)
+      delete(data)
     end
 
     def get_full_data(data)
-      get_full_data_filter(data)
+      @client.api_request(:method => "application.get", :params => {:filter => data, :output => "extend"})
+    end
+
+    def get_id(data)
+      result = get_full_data(data)
+      applicationid = nil
+      result.each { |app| applicationid = app['applicationid'].to_i if app['name'] == data[:name] }
+      applicationid
     end
 
   end

data/lib/zabbixapi/client.rb

@@ -46,10 +46,10 @@ class ZabbixApi
 
     def http_request(body)
       uri = URI.parse(@options[:url])
-      if @proxy_uri.nil?
-        http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
-      else
+      unless @proxy_uri.nil? 
         http = Net::HTTP.new(uri.host, uri.port)
+      else
+        http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
       end
       request = Net::HTTP::Post.new(uri.request_uri)
       request.add_field('Content-Type', 'application/json-rpc')

data/lib/zabbixapi/graphs.rb

@@ -1,17 +1,17 @@
 class ZabbixApi
-  class Graphs < Basic
+  class Graphs
 
-
-    def api_method_name
-      "graph"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    def create(data)
+      result = @client.api_request(:method => "graph.create", :params => [data])
+      result.empty? ? nil : result['graphids'][0].to_i
     end
 
-    def create(data)
-      create_array(data)
+    def add(data)
+      create(data)
     end
 
     def delete(data)
@@ -24,8 +24,12 @@ class ZabbixApi
       end
     end
 
+    def destroy(data)
+      delete(data)
+    end
+
     def get_full_data(data)
-      get_full_data_filter()
+      @client.api_request(:method => "graph.get", :params => {:search => {:name => data}, :output => "extend"})
     end
 
     def get_ids_by_host(data)

data/lib/zabbixapi/hostgroups.rb

@@ -1,28 +1,61 @@
 class ZabbixApi
-  class HostGroups < Basic
+  class HostGroups
 
-    def api_method_name
-      "hostgroup"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    def create(data)
+      result = @client.api_request(:method => "hostgroup.create", :params => [data])
+      result.empty? ? nil : result['groupids'][0].to_i
     end
 
-    def api_key
-      "groupid"
+    def add(data)
+      create(data)
     end
 
-    def create(data)
-      create_array(data)
+    def delete(data)
+      result = @client.api_request(:method => "hostgroup.delete", :params => [:groupid => data])
+      result.empty? ? nil : result['groupids'][0].to_i
     end
 
-    def delete(data)
-      delete_array_sym(data)
+    def destroy(data)
+      delete(data)
+    end
+
+    def get_or_create(data)
+      unless hostgroupid = get_id(data)
+        hostgroupid = update(data)
+      end
+      hostgroupid
     end
 
     def get_full_data(data)
-      get_full_data_filter(data)
+      case @client.api_version 
+        when "1.2"
+          @client.api_request(:method => "hostgroup.get", :params => {:filter => data, :output => "extend"})
+        else
+          @client.api_request(:method => "hostgroup.get", :params => {:filter => data, :output => "extend"})
+      end
+    end
+
+    # Return all hostgroups
+    # 
+    # * *Returns* :
+    #   - Hash with {"Hostgroup1" => "id1", "Hostgroup2" => "id2"}
+    def all
+      result = {}
+      @client.api_request(:method => "hostgroup.get", :params => {:output => "extend"}).each do |hostgrp|
+        result[hostgrp['name']] = hostgrp['groupid']
+      end
+      result
+    end
+
+    def get_id(data)
+      result = get_full_data(data)
+      hostgroupid = nil
+      result.each { |hgroup| hostgroupid = hgroup['groupid'].to_i if hgroup['name'] == data[:name] }
+      hostgroupid
     end
 
   end

data/lib/zabbixapi/hosts.rb

@@ -1,13 +1,5 @@
 class ZabbixApi
-  class Hosts < Basic
-
-    def api_method_name
-      "host"
-    end
-
-    def api_identify
-      "host"
-    end
+  class Hosts
 
     def initialize(client)
       @client = client
@@ -40,6 +32,10 @@ class ZabbixApi
       result.empty? ? nil : result['hostids'][0].to_i
     end
 
+    def add(data)
+      create(data)
+    end
+
     def unlink_templates(data)
       result = @client.api_request(
         :method => "host.massRemove", 
@@ -57,12 +53,33 @@ class ZabbixApi
     end
 
     def delete(data)
-      delete_array_sym(data)
+      result = @client.api_request(:method => "host.delete", :params => [:hostid => data])
+      result.empty? ? nil : result['hostids'][0].to_i
     end
 
+    def destroy(data)
+      delete(data)
+    end
+
+    def update(data)
+      result = @client.api_request(:method => "host.update", :params => data)
+      result.empty? ? nil : result['hostids'][0].to_i
+    end
 
     def get_full_data(data)
-      get_full_data_filter(data)
+      @client.api_request(:method => "host.get", :params => {:filter => data, :output => "extend"})
+    end
+
+    def create_or_update(data)
+      hostid = get_id(:host => data[:host])
+      hostid ? update(data.merge(:hostid => hostid)) : create(data)
+    end
+
+    def get_id(data)
+      result = get_full_data(data)
+      hostid = nil
+      result.each { |host| hostid = host['hostid'].to_i if host['host'] == data[:host] }
+      hostid
     end
 
   end

data/lib/zabbixapi/items.rb

@@ -1,13 +1,5 @@
 class ZabbixApi
-  class Items < Basic
-
-    def api_method_name
-      "item"
-    end
-
-    def api_identify
-      "description"
-    end
+  class Items
 
     def initialize(client)
       @client = client
@@ -55,14 +47,40 @@ 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  
+    end
+
+    def add(data)
+      create(data)
+    end    
 
     def get_full_data(data)
-      get_full_data_filter(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
     end
 
     def delete(data)
-      delete_array(data)
+      result = @client.api_request(:method => "item.delete", :params => [data])
+      result.empty? ? nil : result['itemids'][0].to_i
+    end
+
+    def destroy(data)
+      delete(data)
     end
 
   end

data/lib/zabbixapi/mediatypes.rb

@@ -1,28 +1,61 @@
 class ZabbixApi
-  class Mediatypes < Basic
+  class Mediatypes
 
-    #: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
+    def initialize(client)
+      @client = client
+      @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
 
-    def api_method_name
-      "mediatype"
+    # 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
     end
 
-    def api_identify
-      "name"
+    # Add MediaType
+    # Synonym create
+    def add(data)
+      create(data)
     end
 
+    # Delete MediaType
+    #
+    # * *Args*    :
+    #   - +data+ -> Array with mediatypeids
+    # * *Returns* :
+    #   - Nil or Integer
     def delete(data)
-      delete_array(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)
     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", 
@@ -33,5 +66,44 @@ 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