zabbixapi 0.5.2 → 0.5.3b1

data/README.md

@@ -7,6 +7,7 @@ Simple and lightweight ruby module for work with zabbix api
 #####Now worked with zabbix 
 * 1.8.2 (api version 1.2)
 * 1.8.9 (api version 1.3)
+* 2.0.4 (api version 2.0.4) [unstable]
 
 ## Installation
 ```

data/lib/zabbixapi.rb

@@ -2,25 +2,9 @@ require "zabbixapi/version"
 require "zabbixapi/client"
 
 
-Dir["#{File.dirname(__FILE__)}/zabbixapi/basic/*.rb"].each { |f| load(f) }
-Dir["#{File.dirname(__FILE__)}/zabbixapi/classes/*.rb"].each { |f| load(f) }
-
-
 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)
@@ -35,22 +19,66 @@ class ZabbixApi
   end
 
   def initialize(options = {})
-    
     @client = Client.new(options)
+    case @client.api_version
+      when "1.3", "1.2"
+        apidir = "1.8"
+      when "2.0.4"
+        apidir = "2.0"
+      else
+        raise "unknown Api version!"
+    end
+    Dir["#{File.dirname(__FILE__)}/zabbixapi/#{apidir}/basic/*.rb"].each { |f| load(f) }
+    Dir["#{File.dirname(__FILE__)}/zabbixapi/#{apidir}/classes/*.rb"].each { |f| load(f) }
+  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
 
-    @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)
-    
+  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)
   end
 
 end
+

data/lib/zabbixapi/1.8/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
+      if get_id(:name => screen_name)
+        delete(:name => screen_name)
+      end
+      # create screan
+      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
+      
+      create(
+        :name => screen_name,
+        :hsize => hsize,
+        :vsize => vsize,
+        :screenitems => screenitems
+      )
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/basic/basic_alias.rb

@@ -0,0 +1,21 @@
+class ZabbixApi
+  class Basic
+
+    def get(data)
+      get_full_data(data)
+    end
+
+    def add(data)
+      create(data)
+    end
+
+    def destroy(data)
+      delete(data)
+    end
+
+    def method_name
+      
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/basic/basic_func.rb

@@ -0,0 +1,55 @@
+class ZabbixApi
+  class Basic
+
+    def log(message)
+      puts "#{message}" if @client.options[:debug]
+    end
+
+    def hash_equals?(a, b)
+      a_new = normalize_hash(a)
+      b_new = normalize_hash(b)
+      hash1 = a_new.merge(b_new)
+      hash2 = b_new.merge(a_new)
+      hash1 == hash2
+    end
+
+    def symbolize_keys(obj)
+      return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize_keys(v); memo} if obj.is_a? Hash
+      return obj.inject([]){|memo,v    | memo           << symbolize_keys(v); memo} if obj.is_a? Array
+      obj
+    end
+
+    def normalize_hash(hash)
+      result = hash.dup
+      result.delete(:hostid) #TODO remove to logig. TemplateID and HostID has different id 
+      result.each do |key, value|
+        case value
+          when Array
+            result.delete(key)
+          else
+            result[key] = value.to_s
+        end
+      end
+      result
+    end
+
+    def parse_keys(data)
+      case data
+      when Hash
+        data.empty? ? nil : data[keys][0].to_i
+      when TrueClass
+        true
+      when FalseClass
+        false
+      else
+        nil
+      end
+    end
+
+    def merge_params(params)
+      result = JSON.generate(default_options).to_s + "," + JSON.generate(params).to_s
+      JSON.parse(result.gsub('},{', ','))
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/basic/basic_init.rb

@@ -0,0 +1,33 @@
+class ZabbixApi
+  class Basic
+
+    def initialize(client)
+      @client = client
+    end
+
+    def method_name
+      raise "Can't call method_name here"
+    end
+
+    def default_options
+      {}
+    end
+
+    def keys
+      key + "s"
+    end
+
+    def key
+      method_name + "id"
+    end
+
+    def indentify
+      raise "Can't call indentify here"
+    end
+
+    def array_flag
+      false
+    end
+
+  end
+end

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

@@ -0,0 +1,103 @@
+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/2.0/classes/applications.rb

@@ -0,0 +1,45 @@
+class ZabbixApi
+  class Applications
+
+    def initialize(client)
+      @client = client
+    end
+
+    def create(data)
+      result = @client.api_request(:method => "application.create", :params => [data])
+      result.empty? ? nil : result['applicationids'][0].to_i
+    end
+
+    def add(data)
+      create(data)
+    end
+
+    def delete(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)
+      @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
+end

data/lib/zabbixapi/2.0/classes/errors.rb

@@ -0,0 +1,15 @@
+class ZabbixApi
+
+  class BaseError < RuntimeError
+  end
+
+  class ApiError < BaseError
+  end
+
+  class HttpError < BaseError
+  end
+
+  class SocketError < BaseError
+  end
+
+end

data/lib/zabbixapi/2.0/classes/graphs.rb

@@ -0,0 +1,54 @@
+class ZabbixApi
+  class Graphs < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "graph"
+    end
+
+    def indentify
+      "name"
+    end
+
+    def get_full_data(data)
+      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
+
+      @client.api_request(
+        :method => "#{method_name}.get",
+        :params => {
+          :search => {
+            indentify.to_sym => data[indentify.to_sym]
+          },
+          :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 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
+
+  end
+end

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

@@ -0,0 +1,26 @@
+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/2.0/classes/hosts.rb

@@ -0,0 +1,60 @@
+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]
+        }
+      )
+      result.empty? ? false : true
+    end
+
+    def create_or_update(data)
+      # https://www.zabbix.com/documentation/2.2/manual/api/reference/host/create
+      # interfaces :(
+      data_new = data.clone
+      %w( type main useip ip dns port ).each do |key|
+        data_new[:interfaces][key.to_sym] = data_new[key.to_sym]
+      end
+      puts "#{data_new.inspect}"
+      hostid = get_id(:host => data_new[:host])
+      hostid ? update(data_new.merge(:hostid => hostid)) : create(data_new)
+    end
+
+  end
+end

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

@@ -0,0 +1,54 @@
+class ZabbixApi
+  class Items < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "item"
+    end
+
+    def indentify
+      "name"
+    end
+
+    def default_options 
+      {
+        :name => 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/2.0/classes/mediatypes.rb

@@ -0,0 +1,31 @@
+class ZabbixApi
+  class Mediatypes < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "mediatype"
+    end
+
+    def indentify
+      "description"
+    end
+
+    def default_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
+
+  end
+end

data/lib/zabbixapi/2.0/classes/server.rb

@@ -0,0 +1,12 @@
+class ZabbixApi
+  class Server
+
+    attr :version
+
+    def initialize(client)
+      @client = client
+      @version = @client.api_request(:method => "apiinfo.version", :params => {})
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/classes/templates.rb

@@ -0,0 +1,109 @@
+class ZabbixApi
+  class Templates < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "template"
+    end
+
+    def indentify
+      "host"
+    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
+    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|
+        result << tmpl['templateid']
+      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
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
+    def mass_update(data)
+      result = @client.api_request(
+        :method => "template.massAdd", 
+        :params => {
+          :hosts => data[:hosts_id].map { |t| {:hostid => t} },
+          :templates => data[:templates_id].map { |t| {:templateid => t} }
+        }
+      )
+      result.empty? ? false : true
+    end
+
+    # Analog Zabbix api call massAdd 
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
+    def mass_add(data)
+      result = @client.api_request(
+        :method => "template.massAdd", 
+        :params => {
+          :hosts => data[:hosts_id].map { |t| {:hostid => t} },
+          :templates => data[:templates_id].map { |t| {:templateid => t} }
+        }
+      )
+      result.empty? ? false : true
+    end
+
+    # Analog Zabbix api call massRemove
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
+    def mass_remove(data)
+      result = @client.api_request(
+        :method => "template.massRemove", 
+        :params => {
+          :hostids => data[:hosts_id],
+          :templateids => data[:templates_id],
+          :groupids => data[:group_id],
+          :force => 1
+        }
+      )
+      result.empty? ? false : true      
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/classes/triggers.rb

@@ -0,0 +1,67 @@
+class ZabbixApi
+  class Triggers < Basic
+    
+    def array_flag
+      true
+    end
+
+    def method_name
+      "trigger"
+    end
+
+    def indentify
+      "description"
+    end
+
+    def dump_by_id(data)
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
+
+      @client.api_request(
+        :method => "trigger.get",
+        :params => {
+          :filter => {
+            key.to_sym => data[key.to_sym]
+          },
+          :output => "extend",
+          :select_items => "extend",
+          :select_functions => "extend"
+        }
+      )
+    end
+
+    def safe_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
+
+      expression = dump[:items][0][:key_]+"."+dump[:functions][0][:function]+"("+dump[:functions][0][:parameter]+")"
+      dump[:expression] = dump[:expression].gsub(/{(\d*)}/,"{#{expression}}") #TODO ugly regexp
+      dump.delete(:functions)
+      dump.delete(:items)
+
+      old_expression = data[:expression]
+      data[:expression] = data[:expression].gsub(/{.*\:/,"{") #TODO ugly regexp
+      data.delete(:templateid)
+      
+      log "[DEBUG] expression: #{dump[:expression]}\n data: #{data[:expression]}"
+
+      if hash_equals?(dump, data) 
+        log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
+        item_id
+      else
+        data[:expression] = old_expression
+        # disable old trigger
+        log "[DEBUG] disable :" + @client.api_request(:method => "#{method_name}.update", :params => [{:triggerid=> data[:triggerid], :status => "1" }]).inspect
+        # create new trigger
+        data.delete(:triggerid)
+        create(data)
+      end
+
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/classes/unusable.rb

@@ -0,0 +1,10 @@
+class ZabbixApi
+  class Triggers < Basic
+
+    def create_or_update(data)
+      log "[DEBUG] Call create_or_update with parametrs: #{data.inspect}"
+      get_or_create(data)
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/classes/usergroups.rb

@@ -0,0 +1,82 @@
+class ZabbixApi
+  class Usergroups < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "usergroup"
+    end
+
+    def key
+      "usrgrpid"
+    end
+
+    def indentify
+      "name"
+    end
+
+    # Delete UserGroup
+    #
+    # * *Args*    :
+    #   - +data+ -> Array with usrgrpids
+    # * *Returns* :
+    #   - Nil or Integer
+    def delete(data)
+      result = @client.api_request(:method => "usergroup.delete", :params => data)
+      result ? result['usrgrpids'][0].to_i : nil
+    end
+
+
+    # Return usrgrpid
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "UserGroup"
+    # * *Returns* :
+    #   - Integer
+    def get_or_create(data)
+      usrgrpid = get_id(data)
+      if usrgrpid.nil?
+        usrgrpid = create(data)
+      end
+      usrgrpid
+    end
+
+    # Set permission for usrgrp on some hostgroup
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :usrgrpids => id, :hostgroupids => [], :permission => 2,3 (read and read write)
+    # * *Returns* :
+    #   - Integer
+    def set_perms(data)
+      permission = data[:permission] || 2 
+      result = @client.api_request(
+        :method => "usergroup.massAdd", 
+        :params => {
+          :usrgrpids => [data[:usrgrpid]],
+          :rights => data[:hostgroupids].map { |t| {:permission => permission, :id => t} }
+        }
+      )
+      result ? result['usrgrpids'][0].to_i : nil
+    end
+
+    # Update usergroup, add user
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :usrgrpids => id, :userids => []
+    # * *Returns* :
+    #   - Integer
+    def add_user(data)
+      result = @client.api_request(
+        :method => "usergroup.massAdd", 
+        :params => {
+          :usrgrpids => data[:usrgrpids],
+          :userids => data[:userids]
+        }
+      )
+      result ? result['usrgrpids'][0].to_i : nil
+    end
+
+  end
+end

data/lib/zabbixapi/2.0/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/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.2"
+  VERSION = "0.5.3b1"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.5.3b1
+  prerelease: 5
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -42,24 +42,42 @@ files:
 - README.md
 - Rakefile
 - lib/zabbixapi.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/unusable.rb
-- lib/zabbixapi/classes/usergroups.rb
-- lib/zabbixapi/classes/users.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/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/users.rb
 - lib/zabbixapi/client.rb
 - lib/zabbixapi/version.rb
 - spec/localhost.rb
@@ -80,13 +98,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1798577269349894886
+      hash: 4224378575819107482
 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