zabbix_manager 5.1.0 → 5.1.1.pre.alpha1

data/lib/zabbix_manager/classes/problems.rb

@@ -2,6 +2,9 @@
 
 class ZabbixManager
   class Problems < Basic
+    require "active_support"
+    require "active_support/core_ext/date/calculations"
+
     # The method name used for interacting with Hosts via Zabbix API
     #
     # @return [String]
@@ -16,33 +19,17 @@ class ZabbixManager
       "name"
     end
 
-    # The key field name used for Problem objects via Zabbix API
-    # However, Problem object does not have a unique identifier
-    #
-    # @return [String]
-    def key
-      "problemid"
-    end
-
-    # Returns the object's plural id field name (identify) based on key
-    # However, Problem object does not have a unique identifier
-    #
-    # @return [String]
-    def keys
-      "problemids"
-    end
-
     # Dump Problem object data by key from Zabbix API
     #
     # @param data [Hash] Should include desired object's key and value
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def dump_by_id(data)
-      log "[DEBUG] Call dump_by_id with parameters: #{data.inspect}"
+      log "[DEBUG] Call #{method_name}.dump_by_id with parameters: #{data.inspect}"
 
       @client.api_request(
-        method: "problem.get",
+        method: "#{method_name}.get",
         params: {
           filter: {
             identify.to_sym => data[identify.to_sym]
@@ -55,37 +42,37 @@ class ZabbixManager
     # Get full/extended Problem data from Zabbix API
     #
     # @param data [Hash] Should include object's id field name (identify) and id value
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def get_full_data(data)
-      log "[DEBUG] Call get_full_data with parameters: #{data.inspect}"
+      log "[DEBUG] Call #{method_name}.get_full_data with parameters: #{data.inspect}"
 
       data = symbolize_keys(data)
 
       @client.api_request(
         method: "#{method_name}.get",
         params: {
-          filter: {
+          filter:                {
             identify.to_sym => data[identify.to_sym]
           },
-          eventids: data[:eventids] || nil,
-          groupids: data[:groupids] || nil,
-          hostids: data[:hostids] || nil,
-          objectids: data[:objectids] || nil,
-          applicationids: data[:applicationids] || nil,
-          tags: data[:tags] || nil,
-          time_from: data[:time_from] || nil,
-          time_till: data[:time_till] || nil,
-          eventid_from: data[:eventid_from] || nil,
-          eventid_till: data[:eventid_till] || nil,
-          recent: data[:recent] || false,
-          sortfield: data[:sortfield] || ["eventid"],
-          sortorder: data[:sortorder] || "DESC",
-          countOutput: data[:countOutput] || nil,
-          output: "extend",
-          selectAcknowledges: "extend",
-          selectTags: "extend",
+          eventids:              data[:eventids] || nil,
+          groupids:              data[:groupids] || nil,
+          hostids:               data[:hostids] || nil,
+          objectids:             data[:objectids] || nil,
+          applicationids:        data[:applicationids] || nil,
+          tags:                  data[:tags] || nil,
+          time_from:             data[:time_from] || nil,
+          time_till:             data[:time_till] || nil,
+          eventid_from:          data[:eventid_from] || nil,
+          eventid_till:          data[:eventid_till] || nil,
+          recent:                data[:recent] || false,
+          sortfield:             data[:sortfield] || ["eventid"],
+          sortorder:             data[:sortorder] || "DESC",
+          countOutput:           data[:countOutput] || nil,
+          output:                "extend",
+          selectAcknowledges:    "extend",
+          selectTags:            "extend",
           selectSuppressionData: "extend"
         }
       )
@@ -93,42 +80,37 @@ class ZabbixManager
 
     # Get full/extended Zabbix data for Problem objects from API
     #
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Array<Hash>] Array of matching objects
+    # @return [Hash] Array of matching objects
     def all
       get_full_data({})
     end
 
-    def remove_problem
-      # 设置时间区间
-      time_from = 180.days.ago.at_beginning_of_day.to_i
-      time_till = 14.days.ago.at_beginning_of_day.to_i
-
-      # 抓取制定区间的数据
-      data      = get_full_data(time_from: time_from, time_till: time_till)
+    # Acknowledged problems according to the given parameters.
+    # @note 自动确认14天前的问题单
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
+    # @return [Array, NilClass] Array of matching objects
+    def ack_problem
+      time_from = 90.days.ago.at_beginning_of_day.to_i
+      time_till = 7.days.ago.at_beginning_of_day.to_i
       event_ids = []
 
-      # 收集所有的 eventid
-      data.each do |item|
+      get_full_data(time_from: time_from, time_till: time_till).each do |item|
         event_ids << item["eventid"]
       end
+      return if event_ids.empty?
 
-      # 返回 event_ids
-      ack_event event_ids
-    end
-
-    def ack_event(eventids)
-      # 请求后端
-      @client.api_request(
+      result = @client.api_request(
         method: "event.acknowledge",
         params: {
-          eventids: eventids,
-          action: 2,
-          message: "由 RUBY SCRIPT 自动关闭"
+          eventids: event_ids,
+          action:   2,
+          message:  "本次告警通过 zabbix_api 关闭"
         }
       )
-      # 返回运行结果
+      result.empty? ? nil : result.map { |i| { eventids: i["eventids"] } }
     end
   end
 end

data/lib/zabbix_manager/classes/proxies.rb

@@ -19,9 +19,9 @@ class ZabbixManager
     # Delete Proxy object using Zabbix API
     #
     # @param data [Array] Should include array of proxyid's
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] The Proxy object id that was deleted
+    # @return [Integer, NilClass] The Proxy object id that was deleted
     def delete(data)
       result = @client.api_request(method: "proxy.delete", params: data)
       result.empty? ? nil : result["proxyids"][0].to_i
@@ -30,7 +30,7 @@ class ZabbixManager
     # Check if a Proxy object is readable using Zabbix API
     #
     # @param data [Array] Should include array of proxyid's
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean] Returns true if the given proxies are readable
     def isreadable(data)
@@ -40,31 +40,11 @@ class ZabbixManager
     # Check if a Proxy object is writable using Zabbix API
     #
     # @param data [Array] Should include array of proxyid's
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean] Returns true if the given proxies are writable
     def iswritable(data)
       @client.api_request(method: "proxy.iswritable", params: data)
     end
-
-    # 新增代理服务器查询接口
-    def get_proxy_id(proxy)
-      # 边界条件判断
-      return nil if proxy.nil?
-
-      # 请求后端接口，只支持单个代理节点
-      result = @client.api_request(
-        method: "proxy.get",
-        params: {
-          output: "extend",
-          filter: {
-            host: proxy
-          }
-        }
-      )
-
-      # 返回代理节点
-      result.empty? ? nil : result[0]["proxyid"]
-    end
   end
 end

data/lib/zabbix_manager/classes/roles.rb

@@ -26,9 +26,9 @@ class ZabbixManager
     # Set permissions for usergroup using Zabbix API
     #
     # @param data [Hash] Needs to include usrgrpids and hostgroupids along with permissions to set
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id (usergroup)
+    # @return [Integer, NilClass] Zabbix object id (usergroup)
     def rules(data)
       rules = data[:rules] || 2
       result = @client.api_request(
@@ -45,7 +45,7 @@ class ZabbixManager
     #
     # @deprecated Zabbix has removed massAdd in favor of update.
     # @param data [Hash] Needs to include userids and usrgrpids to mass add users to groups
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] Zabbix object id (usergroup)
     def add_user(data)
@@ -55,7 +55,7 @@ class ZabbixManager
     # Dump Role object data by key from Zabbix API
     #
     # @param data [Hash] Should include desired object's key and value
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def dump_by_id(data)
@@ -74,7 +74,7 @@ class ZabbixManager
     # Get Role ids by Role Name from Zabbix API
     #
     # @param data [Hash] Should include host value to query for matching graphs
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Array] Returns array of Graph ids
     def get_ids_by_name(data)
@@ -96,9 +96,9 @@ class ZabbixManager
     # Update users in Userroles using Zabbix API
     #
     # @param data [Hash] Needs to include userids and usrgrpids to mass update users in groups
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id (usergroup)
+    # @return [Integer, NilClass] Zabbix object id (usergroup)
     def update_users(data)
       user_groups = data[:usrgrpids].map do |t|
         {

data/lib/zabbix_manager/classes/screens.rb

@@ -38,9 +38,9 @@ class ZabbixManager
     # Delete Screen object using Zabbix API
     #
     # @param data [String, Array] Should include id's of the screens to delete
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
+    # @return [Integer, NilClass] Zabbix object id
     def delete(data)
       result = @client.api_request(method: "screen.delete", params: [data])
       result.empty? ? nil : result["screenids"][0].to_i
@@ -49,7 +49,7 @@ class ZabbixManager
     # Get or Create Screen object for Host using Zabbix API
     #
     # @param data [Hash] Needs to include screen_name and graphids to properly identify Screens via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] Zabbix object id
     def get_or_create_for_host(data)

data/lib/zabbix_manager/classes/templates.rb

@@ -19,9 +19,9 @@ class ZabbixManager
     # Delete Template object using Zabbix API
     #
     # @param data [Array] Should include array of templateid's
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] The Template object id that was deleted
+    # @return [Integer, NilClass] The Template object id that was deleted
     def delete(data)
       result = @client.api_request(method: "template.delete", params: [data])
       result.empty? ? nil : result["templateids"][0].to_i
@@ -30,7 +30,7 @@ class ZabbixManager
     # Get Template ids for Host from Zabbix API
     #
     # @param data [Hash] Should include host value to query for matching templates
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Array] Returns array of Template ids
     def get_ids_by_host(data)
@@ -42,27 +42,28 @@ class ZabbixManager
     # Get or Create Template object using Zabbix API
     #
     # @param data [Hash] Needs to include host to properly identify Templates via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
+    # @return [Integer, TrueClass, FalseClass] Zabbix object id
     def get_or_create(data)
-      unless (templateid = get_id(host: data[:host]))
-        templateid = create(data)
+      if (templateid = get_id(host: data[:host]))
+        templateid
+      else
+        create(data)
       end
-      templateid
     end
 
     # Mass update Templates for Hosts using Zabbix API
     #
     # @param data [Hash] Should include hosts_id array and templates_id array
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
     def mass_update(data)
       result = @client.api_request(
         method: "template.massUpdate",
         params: {
-          hosts: data[:hosts_id].map { |t| { hostid: t } },
+          hosts:     data[:hosts_id].map { |t| { hostid: t } },
           templates: data[:templates_id].map { |t| { templateid: t } }
         }
       )
@@ -72,14 +73,14 @@ class ZabbixManager
     # Mass add Templates to Hosts using Zabbix API
     #
     # @param data [Hash] Should include hosts_id array and templates_id array
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
     def mass_add(data)
       result = @client.api_request(
         method: "template.massAdd",
         params: {
-          hosts: data[:hosts_id].map { |t| { hostid: t } },
+          hosts:     data[:hosts_id].map { |t| { hostid: t } },
           templates: data[:templates_id].map { |t| { templateid: t } }
         }
       )
@@ -89,37 +90,20 @@ class ZabbixManager
     # Mass remove Templates to Hosts using Zabbix API
     #
     # @param data [Hash] Should include hosts_id array and templates_id array
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
     def mass_remove(data)
       result = @client.api_request(
         method: "template.massRemove",
         params: {
-          hostids: data[:hosts_id],
+          hostids:     data[:hosts_id],
           templateids: data[:templates_id],
-          groupids: data[:group_id],
-          force: 1
+          groupids:    data[:group_id],
+          force:       1
         }
       )
       result.empty? ? false : true
     end
-
-    # 新增 get_template_id 方法，使用列表 flatten 功能拉平数组对象
-    def get_template_ids(data)
-      # 直接调后端接口
-      result = @client.api_request(
-        method: "template.get",
-        params: {
-          output: "extend",
-          filter: {
-            host: [data].flatten
-          }
-        }
-      ).map { |temp| [templateid: temp["templateid"]] }
-
-      # 返回 template 模板数组对象
-      result.empty? ? nil : result.flatten
-    end
   end
 end

data/lib/zabbix_manager/classes/triggers.rb

@@ -16,10 +16,21 @@ class ZabbixManager
       "description"
     end
 
+    # The default options used when creating zabbix triggers
+    # @note 缺省的 trigger 参数
+    # @return [Hash]
+    def default_options
+      {
+        recovery_mode: 1,
+        type:          0,
+        manual_close:  1
+      }
+    end
+
     # Dump Trigger object data by key from Zabbix API
     #
     # @param data [Hash] Should include desired object's key and value
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def dump_by_id(data)
@@ -41,9 +52,9 @@ class ZabbixManager
     # Safely update Trigger object using Zabbix API by deleting and replacing trigger
     #
     # @param data [Hash] Needs to include description and hostid to properly identify Triggers via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
+    # @return [Integer, TrueClass, FalseClass, NilClass] Zabbix object id
     def safe_update(data)
       log "[DEBUG] Call safe_update with parameters: #{data.inspect}"
 
@@ -83,94 +94,41 @@ class ZabbixManager
     # Get or Create Trigger object using Zabbix API
     #
     # @param data [Hash] Needs to include description and hostid to properly identify Triggers via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
+    # @return [Integer, TrueClass, FalseClass, NilClass] Zabbix object id
     def get_or_create(data)
-      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
+      log "[DEBUG] Call #{method_name}.get_or_create with parameters: #{data.inspect}"
 
-      unless (id = get_id(description: data[:description], hostid: data[:hostid]))
-        id = create(data)
+      if (id = get_id(description: data[:description], hostid: data[:hostid]))
+        id
+      else
+        create(data)
       end
-      id
     end
 
     # Create or update Trigger object using Zabbix API
     #
     # @param data [Hash] Needs to include description and hostid to properly identify Triggers via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
+    # @return [Integer, NilClass, TrueClass, FalseClass] Zabbix object id
     def create_or_update(data)
       triggerid = get_id(description: data[:description], hostid: data[:hostid])
-
       triggerid ? update(data.merge(triggerid: triggerid)) : create(data)
     end
 
-    # 测试数据
-    def mojo_data
-      data = {
-        comments:            "MOJO1",
-        opdata:              "MOJO_OPDATA",
-        priority:            1,
-        description:         "MOJO1",
-        expression:          "{SZX1-ISP-SW7:net.if.in[ifHCInOctets.1].avg(15m)}>=450000000 or {SZX1-ISP-SW7:net.if.out[ifHCOutOctets.1].avg(15m)}>=450000000",
-        recovery_expression: "{SZX1-ISP-SW7:net.if.in[ifHCInOctets.1].avg(15m)}<=350000000 or {SZX1-ISP-SW7:net.if.out[ifHCOutOctets.1].avg(15m)}<=350000000"
-      }
-
-      create_trigger data.stringify_keys!
-    end
 
-    # 设置触发器
-    def create_trigger(data = {})
-      data = data.with_indifferent_access
-      # 请求生成触发器
-      result = @client.api_request(
-        method: "trigger.create",
-        params: {
-          comments:            data["comments"],
-          priority:            data["priority"],
-          description:         data["description"],
-          expression:          data["expression"],
-          recovery_expression: data["recovery_expression"],
-          opdata:              data["opdata"],
-          recovery_mode:       1,
-          type:                0,
-          manual_close:        1
-        }
-      )
-      # 检查是是否存在
-      result.empty? ? nil : result["triggerids"]
-    end
-
-    # 更新触发器
-    def update_trigger(triggerid, data = {})
-      data = data.with_indifferent_access
-      # 请求生成触发器
-      result = @client.api_request(
-        method: "trigger.update",
-        params: {
-          triggerid:           triggerid,
-          comments:            data["comments"],
-          priority:            data["priority"],
-          description:         data["description"],
-          expression:          data["expression"],
-          recovery_expression: data["recovery_expression"],
-          opdata:              data["opdata"],
-          recovery_mode:       1,
-          type:                0,
-          manual_close:        1
-        }
-      )
-      # ap result
-      # 检查是是否存在
-      result.empty? ? nil : result["triggerids"]
-    end
-
-    # 添加触发器依赖项
+    # Add dependsOnTrigger using Zabbix API
+    #
+    # @param triggerid [Integer] identify for trigger via Zabbix API
+    # @param depend_on_trigger_id [Integer] identify for dependsOnTrigger via Zabbix API
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
+    # @return [Integer, NilClass] Zabbix object id
     def add_trigger_dependency(triggerid, depend_on_trigger_id)
       log "[DEBUG] Call add_trigger_dependency with parameters: #{triggerid} #{depend_on_trigger_id}"
-      # 请求生成触发器
+
       result = @client.api_request(
         method: "trigger.adddependencies",
         params: {

data/lib/zabbix_manager/classes/usergroups.rb

@@ -26,9 +26,9 @@ class ZabbixManager
     # Set permissions for usergroup using Zabbix API
     #
     # @param data [Hash] Needs to include usrgrpids and hostgroupids along with permissions to set
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id (usergroup)
+    # @return [Integer, NilClass] Zabbix object id (usergroup)
     def permissions(data)
       permission = data[:permission] || 2
       result = @client.api_request(
@@ -45,9 +45,9 @@ class ZabbixManager
     #
     # @deprecated Zabbix has removed massAdd in favor of update.
     # @param data [Hash] Needs to include userids and usrgrpids to mass add users to groups
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id (usergroup)
+    # @return [Integer, NilClass] Zabbix object id (usergroup)
     def add_user(data)
       update_users(data)
     end
@@ -55,9 +55,9 @@ class ZabbixManager
     # Update users in usergroups using Zabbix API
     #
     # @param data [Hash] Needs to include userids and usrgrpids to mass update users in groups
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id (usergroup)
+    # @return [Integer, NilClass] Zabbix object id (usergroup)
     def update_users(data)
       user_groups = data[:usrgrpids].map do |t|
         {