zabbixapi 0.5.0 → 0.5.1a

data/lib/zabbixapi/classes/screens.rb

@@ -0,0 +1,68 @@
+class ZabbixApi
+  class Screens < Basic
+
+    # extracted from frontends/php/include/defines.inc.php
+    #SCREEN_RESOURCE_GRAPH => 0,
+    #SCREEN_RESOURCE_SIMPLE_GRAPH => 1,
+    #SCREEN_RESOURCE_MAP => 2,
+    #SCREEN_RESOURCE_PLAIN_TEXT => 3,
+    #SCREEN_RESOURCE_HOSTS_INFO => 4,
+    #SCREEN_RESOURCE_TRIGGERS_INFO => 5,
+    #SCREEN_RESOURCE_SERVER_INFO => 6,
+    #SCREEN_RESOURCE_CLOCK => 7,
+    #SCREEN_RESOURCE_SCREEN => 8,
+    #SCREEN_RESOURCE_TRIGGERS_OVERVIEW => 9,
+    #SCREEN_RESOURCE_DATA_OVERVIEW => 10,
+    #SCREEN_RESOURCE_URL => 11,
+    #SCREEN_RESOURCE_ACTIONS => 12,
+    #SCREEN_RESOURCE_EVENTS => 13,
+    #SCREEN_RESOURCE_HOSTGROUP_TRIGGERS => 14,
+    #SCREEN_RESOURCE_SYSTEM_STATUS => 15,
+    #SCREEN_RESOURCE_HOST_TRIGGERS => 16
+
+    def method_name
+      "screen"
+    end
+
+    def indentify
+      "name"
+    end
+
+    def delete(data)
+      result = @client.api_request(:method => "screen.delete", :params => data)
+      result.empty? ? nil : result['screenids'][0].to_i
+    end
+
+    def get_or_create_for_host(data)
+      screen_name = data[:host].to_s + "_graphs"
+      graphids = data[:graphids]
+      screenitems = []
+      hsize = data[:hsize] || 3
+      valign = data[:valign] || 2
+      halign = data[:halign] || 2
+      vsize = data[:vsize] || ((graphids.size/hsize) + 1).to_i
+      screenid = get_id(:name => screen_name)
+      unless screenid
+        # Create screen
+        graphids.each_with_index do |graphid, index|
+          screenitems << {
+            :resourcetype => 0,
+            :resourceid => graphid,
+            :x => (index % hsize).to_i,
+            :y => (index % graphids.size/hsize).to_i,
+            :valign =>valign,
+            :halign =>halign
+          }
+        end
+        screenid = create(
+          :name => screen_name,
+          :hsize => hsize,
+          :vsize => vsize,
+          :screenitems => screenitems
+        )
+      end
+      screenid
+    end
+
+  end
+end

data/lib/zabbixapi/{templates.rb → classes/templates.rb}

@@ -1,27 +1,19 @@
 class ZabbixApi
-  class Templates
+  class Templates < Basic
 
-    def initialize(client)
-      @client = client
+    def array_flag
+      true
     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 method_name
+      "template"
     end
 
-    # Add template
-    # Synonym create
-    def add(data)
-      create(data)
+    def indentify
+      "host"
     end
 
+
     # Delete template
     #
     # * *Args*    :
@@ -33,12 +25,6 @@ class ZabbixApi
       result.empty? ? nil : result['templateids'][0].to_i
     end
 
-    # Destroy template
-    # Synonym delete
-    def destroy(data)
-      delete(data)
-    end
-
     # Return templateids linked with host 
     # 
     # * *Args*    :
@@ -119,53 +105,5 @@ class ZabbixApi
       result.empty? ? false : true      
     end
 
-    # Return all templates
-    # 
-    # * *Returns* :
-    #   - Hash with {"Template_Name1" => "templateid1", "Template_Name2" => "templateid2"}
-    def all
-      result = {}
-      case @client.api_version
-        when "1.2"
-          @client.api_request(:method => "template.get", :params => {:output => "extend"}).values.each do |tmpl|
-            result[tmpl['host']] = tmpl['hostid']
-          end          
-        else
-          @client.api_request(:method => "template.get", :params => {:output => "extend"}).each do |tmpl|
-            result[tmpl['host']] = tmpl['hostid']
-          end
-      end
-      result
-    end
-
-    # Return info about template
-    # 
-    # * *Args*    : 
-    #   - +data+ -> Hash with :host => "Template name"
-    # * *Returns* :
-    #   - Hash with template info
-    def get_full_data(data)
-      case @client.api_version
-        when "1.2"
-          # in this version returned id=>{...}
-          result = @client.api_request(:method => "template.get", :params => {:filter => data, :output => "extend"})
-          result.empty? ? [] : result.values 
-        else
-          @client.api_request(:method => "template.get", :params => {:filter => data, :output => "extend"})
-      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

data/lib/zabbixapi/classes/triggers.rb

@@ -0,0 +1,17 @@
+class ZabbixApi
+  class Triggers < Basic
+    
+    def array_flag
+      true
+    end
+
+    def method_name
+      "trigger"
+    end
+
+    def indentify
+      "name"
+    end
+
+  end
+end

data/lib/zabbixapi/{usergroups.rb → classes/usergroups.rb}

@@ -1,25 +1,20 @@
 class ZabbixApi
-  class Usergroups
+  class Usergroups < Basic
 
-    def initialize(client)
-      @client = client
+    def array_flag
+      true
     end
 
-    # Create UserGroup
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "UserGroup"
-    # * *Returns* :
-    #   - Nil or Integer
-    def create(data)
-      result = @client.api_request(:method => "usergroup.create", :params => data)
-      result ? result['usrgrpids'][0].to_i : nil
+    def method_name
+      "usergroup"
+    end
+
+    def key
+      "usrgrpid"
     end
 
-    # Add UserGroup
-    # Synonym create
-    def add(data)
-      create(data)
+    def indentify
+      "name"
     end
 
     # Delete UserGroup
@@ -33,44 +28,6 @@ class ZabbixApi
       result ? result['usrgrpids'][0].to_i : nil
     end
 
-    # Destroy UserGroup
-    # Synonym delete
-    def destroy(data)
-      delete(data)
-    end
-
-    # Get UserGroup info
-    #
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "UserGroup"
-    # * *Returns* :
-    #   - Nil or Integer
-    def get_full_data(data)
-      @client.api_request(
-        :method => "usergroup.get", 
-        :params => {
-          :filter => [data[:name]],
-          :output => "extend"
-          }
-        )
-    end
-
-    def get(data)
-      get_full_data(data)
-    end
-
-    # Return usrgrpid
-    # 
-    # * *Args*    :
-    #   - +data+ -> Hash with :name => "UserGroup"
-    # * *Returns* :
-    #   - Nil or Integer 
-    def get_id(data)
-      result = get_full_data(data)
-      usrgrpid = nil
-      result.each { |usr| usrgrpid = usr['usrgrpid'].to_i if usr['name'] == data[:name] }
-      usrgrpid
-    end
 
     # Return usrgrpid
     # 

data/lib/zabbixapi/classes/users.rb

@@ -0,0 +1,32 @@
+class ZabbixApi
+  class Users < Basic
+
+    def method_name
+      "user"
+    end
+
+    def keys
+      "userids"
+    end
+
+    def key 
+      "userid"
+    end
+
+    def indentify
+      "name"
+    end
+
+    def add_medias(data)
+      result = @client.api_request(
+        :method => "user.addMedia", 
+        :params => {
+          :users => data[:userids].map { |t| {:userid => t} },
+          :medias => data[:media]
+        }
+      )
+      result ? result['userids'][0].to_i : nil
+    end
+
+  end
+end

data/lib/zabbixapi/client.rb

@@ -5,7 +5,7 @@ class ZabbixApi
   class Client
 
     def id
-      Random.rand(100000)
+      @id = @id + 1
     end
 
     def api_version
@@ -24,13 +24,14 @@ class ZabbixApi
 
     def initialize(options = {})
       @options = options
-      @auth_hash = auth
+      @id = 1
       unless ENV['http_proxy'].nil?
         @proxy_uri = URI.parse(ENV['http_proxy'])
         @proxy_host = @proxy_uri.host
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
+      @auth_hash = auth
     end
 
     def message_json(body)
@@ -52,6 +53,7 @@ class ZabbixApi
         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.basic_auth @options[:http_user], @options[:http_password] if @options[:http_user]
       request.add_field('Content-Type', 'application/json-rpc')
       request.body = body
       response = http.request(request)

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.0"
+  VERSION = "0.5.1a"
 end

data/spec/localhost.rb

@@ -311,7 +311,7 @@ describe ZabbixApi, "test_api" do
   end
 
   it "GRAPH: Delete" do
-    zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
+    zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(TrueClass)
   end
 
   it "TRIGGER: Delete" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1a
+  prerelease: 5
 platform: ruby
 authors:
 - Vasiliev D.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to work with zabbix api from ruby.
 email:
@@ -26,20 +26,24 @@ files:
 - README.md
 - Rakefile
 - lib/zabbixapi.rb
-- lib/zabbixapi/applications.rb
+- lib/zabbixapi/basic/basic_alias.rb
+- lib/zabbixapi/basic/basic_func.rb
+- lib/zabbixapi/basic/basic_init.rb
+- lib/zabbixapi/basic/basic_logic.rb
+- lib/zabbixapi/classes/applications.rb
+- lib/zabbixapi/classes/errors.rb
+- lib/zabbixapi/classes/graphs.rb
+- lib/zabbixapi/classes/hostgroups.rb
+- lib/zabbixapi/classes/hosts.rb
+- lib/zabbixapi/classes/items.rb
+- lib/zabbixapi/classes/mediatypes.rb
+- lib/zabbixapi/classes/screens.rb
+- lib/zabbixapi/classes/server.rb
+- lib/zabbixapi/classes/templates.rb
+- lib/zabbixapi/classes/triggers.rb
+- lib/zabbixapi/classes/usergroups.rb
+- lib/zabbixapi/classes/users.rb
 - lib/zabbixapi/client.rb
-- lib/zabbixapi/errors.rb
-- lib/zabbixapi/graphs.rb
-- lib/zabbixapi/hostgroups.rb
-- lib/zabbixapi/hosts.rb
-- lib/zabbixapi/items.rb
-- lib/zabbixapi/mediatypes.rb
-- lib/zabbixapi/screens.rb
-- lib/zabbixapi/server.rb
-- lib/zabbixapi/templates.rb
-- lib/zabbixapi/triggers.rb
-- lib/zabbixapi/usergroups.rb
-- lib/zabbixapi/users.rb
 - lib/zabbixapi/version.rb
 - spec/localhost.rb
 - spec/run.rb
@@ -59,13 +63,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2044765958080736329
+      hash: -2980579901879141751
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: zabbixapi
 rubygems_version: 1.8.24

data/lib/zabbixapi/graphs.rb

@@ -1,83 +0,0 @@
-class ZabbixApi
-  class Graphs
-
-    def initialize(client)
-      @client = client
-    end
-
-    def create(data)
-      result = @client.api_request(:method => "graph.create", :params => [data])
-      result.empty? ? nil : result['graphids'][0].to_i
-    end
-
-    def add(data)
-      create(data)
-    end
-
-    def delete(data)
-      result = @client.api_request(:method => "graph.delete", :params => [data])
-      case @client.api_version
-        when "1.3"
-          result ? 1 : nil  #return "true" or "false" for this api version
-        else
-          result.empty? ? nil : result['graphids'][0].to_i
-      end
-    end
-
-    def destroy(data)
-      delete(data)
-    end
-
-    def get_full_data(data)
-      @client.api_request(:method => "graph.get", :params => {:search => {:name => data}, :output => "extend"})
-    end
-
-    def get_ids_by_host(data)
-      ids = []
-      result = @client.api_request(:method => "graph.get", :params => {:filter => {:host => data[:host]}, :output => "extend"})
-      result.each do |graph|
-        ids << graph['graphid']
-      end
-      ids
-    end
-
-    def get_items(data)
-      @client.api_request(:method => "graphitem.get", :params => { :graphids => [data], :output => "extend" } )
-    end
-
-    def get_id(data)
-      result = @client.api_request(:method => "graph.get", :params => {:filter => {:name=> data[:name]}, :output => "extend"})
-      graphid = nil
-      result.each { |graph| graphid = graph['graphid'].to_i if graph['name'] == data[:name] }
-      graphid
-    end
-
-    def create_or_update(data)
-      graphid = get_id(:name => data[:name], :templateid => data[:templateid])
-      graphid ? _update(data.merge(:graphid => graphid)) : create(data)
-    end
-
-    def _update(data)
-      data.delete(:name)
-      update(data)
-    end
-
-    def get_or_create(data)
-      unless graphid = get_id(:name => data[:name], :templateid => data[:templateid])
-        graphid = create(data)
-      end
-      graphid
-    end
-
-    def update(data)
-      case @client.api_version
-        when "1.2"
-          @client.api_request(:method => "graph.update", :params => data) 
-        else
-          result = @client.api_request(:method => "graph.update", :params => data)
-          result.empty? ? nil : result['graphids'][0].to_i
-      end
-    end
-
-  end
-end