zabbixapi 0.6.6 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -47,48 +47,43 @@ files:
 - README.md
 - Rakefile
 - lib/zabbixapi.rb
-- lib/zabbixapi/1.8/basic/basic_alias.rb
-- lib/zabbixapi/1.8/basic/basic_func.rb
-- lib/zabbixapi/1.8/basic/basic_init.rb
-- lib/zabbixapi/1.8/basic/basic_logic.rb
-- lib/zabbixapi/1.8/classes/applications.rb
-- lib/zabbixapi/1.8/classes/errors.rb
-- lib/zabbixapi/1.8/classes/graphs.rb
-- lib/zabbixapi/1.8/classes/hostgroups.rb
-- lib/zabbixapi/1.8/classes/hosts.rb
-- lib/zabbixapi/1.8/classes/items.rb
-- lib/zabbixapi/1.8/classes/mediatypes.rb
-- lib/zabbixapi/1.8/classes/screens.rb
-- lib/zabbixapi/1.8/classes/server.rb
-- lib/zabbixapi/1.8/classes/templates.rb
-- lib/zabbixapi/1.8/classes/triggers.rb
-- lib/zabbixapi/1.8/classes/unusable.rb
-- lib/zabbixapi/1.8/classes/usergroups.rb
-- lib/zabbixapi/1.8/classes/users.rb
-- lib/zabbixapi/2.0/basic/basic_alias.rb
-- lib/zabbixapi/2.0/basic/basic_func.rb
-- lib/zabbixapi/2.0/basic/basic_init.rb
-- lib/zabbixapi/2.0/basic/basic_logic.rb
-- lib/zabbixapi/2.0/classes/applications.rb
-- lib/zabbixapi/2.0/classes/errors.rb
-- lib/zabbixapi/2.0/classes/graphs.rb
-- lib/zabbixapi/2.0/classes/hostgroups.rb
-- lib/zabbixapi/2.0/classes/hosts.rb
-- lib/zabbixapi/2.0/classes/items.rb
-- lib/zabbixapi/2.0/classes/mediatypes.rb
-- lib/zabbixapi/2.0/classes/proxies.rb
-- lib/zabbixapi/2.0/classes/screens.rb
-- lib/zabbixapi/2.0/classes/server.rb
-- lib/zabbixapi/2.0/classes/templates.rb
-- lib/zabbixapi/2.0/classes/triggers.rb
-- lib/zabbixapi/2.0/classes/unusable.rb
-- lib/zabbixapi/2.0/classes/usergroups.rb
-- lib/zabbixapi/2.0/classes/usermacros.rb
-- lib/zabbixapi/2.0/classes/users.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/proxies.rb
+- lib/zabbixapi/classes/screens.rb
+- lib/zabbixapi/classes/server.rb
+- lib/zabbixapi/classes/templates.rb
+- lib/zabbixapi/classes/triggers.rb
+- lib/zabbixapi/classes/unusable.rb
+- lib/zabbixapi/classes/usergroups.rb
+- lib/zabbixapi/classes/usermacros.rb
+- lib/zabbixapi/classes/users.rb
 - lib/zabbixapi/client.rb
 - lib/zabbixapi/version.rb
-- spec/localhost.rb
-- spec/run.rb
+- spec/application.rb
+- spec/basic_func.rb
+- spec/graph.rb
+- spec/host.rb
+- spec/hostgroup.rb
+- spec/item.rb
+- spec/mediatype.rb
+- spec/query.rb
+- spec/screen.rb
+- spec/server.rb
+- spec/spec_helper.rb
+- spec/template.rb
+- spec/trigger.rb
+- spec/user.rb
+- spec/usergroup.rb
 - zabbixapi.gemspec
 homepage: https://github.com/express42/zabbixapi
 licenses:
@@ -115,6 +110,19 @@ signing_key:
 specification_version: 4
 summary: Realization for Zabbix API.
 test_files:
-- spec/localhost.rb
-- spec/run.rb
+- spec/application.rb
+- spec/basic_func.rb
+- spec/graph.rb
+- spec/host.rb
+- spec/hostgroup.rb
+- spec/item.rb
+- spec/mediatype.rb
+- spec/query.rb
+- spec/screen.rb
+- spec/server.rb
+- spec/spec_helper.rb
+- spec/template.rb
+- spec/trigger.rb
+- spec/user.rb
+- spec/usergroup.rb
 has_rdoc: 

data/lib/zabbixapi/1.8/basic/basic_logic.rb

@@ -1,103 +0,0 @@
-class ZabbixApi
-  class Basic
-
-    def create(data)
-      log "[DEBUG] Call create with parametrs: #{data.inspect}"
-
-      data_with_default = default_options.empty? ? data : merge_params(data)
-      data_create = array_flag ? [data_with_default] : data_with_default
-      result = @client.api_request(:method => "#{method_name}.create", :params => data_create)
-      parse_keys result
-    end
-
-    def delete(data)
-      log "[DEBUG] Call delete with parametrs: #{data.inspect}"
-
-      data_delete = array_flag ? [data] : [key.to_sym => data]
-      result = @client.api_request(:method => "#{method_name}.delete", :params => data_delete)
-      parse_keys result
-    end
-
-    def create_or_update(data)
-      log "[DEBUG] Call create_or_update with parametrs: #{data.inspect}"
-
-      id = get_id(indentify.to_sym => data[indentify.to_sym])
-      id ? update(data.merge(key.to_sym => id.to_s)) : create(data)
-    end
-
-    def update(data)     
-      log "[DEBUG] Call update with parametrs: #{data.inspect}"
-      
-      dump = {}
-      item_id = data[key.to_sym].to_i
-      dump_by_id(key.to_sym => data[key.to_sym]).each do |item|
-        dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
-      end
-
-      if hash_equals?(dump, data) 
-        log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
-        item_id
-      else
-        data_update = array_flag ? [data] : data
-        result = @client.api_request(:method => "#{method_name}.update", :params => data_update)
-        parse_keys result
-      end
-
-    end
-
-    def get_full_data(data)
-      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
-
-      @client.api_request(
-        :method => "#{method_name}.get",
-        :params => {
-          :filter => {
-            indentify.to_sym => data[indentify.to_sym]
-          },
-          :output => "extend"
-        }
-      )
-    end
-
-    def dump_by_id(data)
-      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
-
-      @client.api_request(
-        :method => "#{method_name}.get",
-        :params => {
-          :filter => {
-            key.to_sym => data[key.to_sym]
-          },
-          :output => "extend"
-        }
-      )
-    end
-
-    def all
-      result = {}
-      @client.api_request(:method => "#{method_name}.get", :params => {:output => "extend"}).each do |item|
-        result[item[indentify]] = item[key]
-      end
-      result
-    end
-
-    def get_id(data)
-      log "[DEBUG] Call get_id with parametrs: #{data.inspect}"
-
-      result = symbolize_keys( get_full_data(data) )
-      id = nil
-      result.each { |item| id = item[key.to_sym].to_i if item[indentify.to_sym] == data[indentify.to_sym] }
-      id
-    end
-
-    def get_or_create(data)
-      log "[DEBUG] Call get_or_create with parametrs: #{data.inspect}"
-
-      unless (id = get_id(data))
-        id = create(data)
-      end
-      id
-    end
-
-  end
-end

data/lib/zabbixapi/1.8/classes/hostgroups.rb

@@ -1,26 +0,0 @@
-class ZabbixApi
-  class HostGroups < Basic
-
-    def array_flag
-      true
-    end
-
-    def method_name
-      "hostgroup"
-    end
-
-    def indentify
-      "name"
-    end
-
-    def key
-      "groupid"
-    end
-
-    def delete(data)
-      result = @client.api_request(:method => "hostgroup.delete", :params => [:groupid => data])
-      result.empty? ? nil : result['groupids'][0].to_i
-    end
-
-  end
-end

data/lib/zabbixapi/1.8/classes/hosts.rb

@@ -1,58 +0,0 @@
-class ZabbixApi
-  class Hosts < Basic
-
-    def array_flag
-      true
-    end
-
-    def method_name
-      "host"
-    end
-
-    def indentify
-      "host"
-    end
-
-    def default_options
-      {
-        :host => nil,
-        :port => 10050,
-        :status => 1,
-        :useip => 1,
-        :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 => ''
-      }
-    end
-
-    def unlink_templates(data)
-      result = @client.api_request(
-        :method => "host.massRemove",
-        :params => {
-          :hostids => data[:hosts_id],
-          :templates => data[:templates_id]
-        }
-      )
-      case @client.api_version
-        when "1.2"
-          result ? true : false
-        else
-          result.empty? ? false : true
-      end
-    end
-
-    def create_or_update(data)
-      hostid = get_id(:host => data[:host])
-      hostid ? update(data.merge(:hostid => hostid)) : create(data)
-    end
-
-  end
-end

data/lib/zabbixapi/1.8/classes/items.rb

@@ -1,54 +0,0 @@
-class ZabbixApi
-  class Items < Basic
-
-    def array_flag
-      true
-    end
-
-    def method_name
-      "item"
-    end
-
-    def indentify
-      "description"
-    end
-
-    def default_options 
-      {
-        :description => nil,
-        :key_ => nil,
-        :hostid => nil,
-        :delay => 60,
-        :history => 60,
-        :status => 0,
-        :type => 7,
-        :snmp_community => '',
-        :snmp_oid => '',
-        :value_type => 3,
-        :data_type => 0,
-        :trapper_hosts => 'localhost',
-        :snmp_port => 161,
-        :units => '',
-        :multiplier => 0,
-        :delta => 0,
-        :snmpv3_securityname => '',
-        :snmpv3_securitylevel => 0,
-        :snmpv3_authpassphrase => '',
-        :snmpv3_privpassphrase => '',
-        :formula => 0,
-        :trends => 365,
-        :logtimefmt => '',
-        :valuemapid => 0,
-        :delay_flex => '',
-        :authtype => 0,
-        :username => '',
-        :password => '',
-        :publickey => '',
-        :privatekey => '',
-        :params => '',
-        :ipmi_sensor => ''
-      }
-    end
-
-  end
-end

data/lib/zabbixapi/1.8/classes/screens.rb

@@ -1,101 +0,0 @@
-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)
-      screen_name = data[:screen_name]
-      screen_id   = data[:screen_id]
-
-      unless screen_name.nil?
-        unless screen_name.instance_of?(Array)
-          screen_id = get_id(:name => screen_name)
-        else
-          screen_id = []
-          screen_name.each do |name|
-            screen_id << get_id(:name => name)
-          end
-        end
-      end
-
-      unless screen_id.instance_of?(Array)
-        screen_id = [screen_id, screen_id]
-      end
-
-      result = @client.api_request(:method => "screen.delete", :params => screen_id)
-      result.empty? ? nil : result['screenids'][0].to_i
-    end
-
-    def get_or_create_for_host(data)
-      screen_name = data[:screen_name]
-      graphids = data[:graphids]
-      screenitems = []
-      hsize = data[:hsize] || 3
-      valign = data[:valign] || 2
-      halign = data[:halign] || 2
-      rowspan = data[:rowspan] || 0
-      colspan = data[:colspan] || 0
-      height = data[:height] || 320 # default 320
-      width = data[:width] || 200 # default 200
-      vsize = data[:vsize] || (graphids.size/hsize).to_i
-      screenid = get_id(:name => screen_name)
-
-      if ((graphids.size/hsize) / 2) == 0
-        vsize = data[:vsize] || (graphids.size/hsize).to_i
-      else
-        vsize = data[:vsize] || ((graphids.size/hsize)+1).to_i
-      end
-
-      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,
-            :rowspan => rowspan,
-            :colspan => colspan,
-            :height => height,
-            :width => width
-          }
-        end
-        screenid = create(
-          :name => screen_name,
-          :hsize => hsize,
-          :vsize => vsize,
-          :screenitems => screenitems
-        )
-      end
-      screenid
-    end
-
-  end
-end