zabbix_manager 5.1.0 → 5.1.1.pre.alpha1

data/lib/zabbix_manager/classes/actions.rb

@@ -19,7 +19,7 @@ class ZabbixManager
     # Get full/extended Action object data from 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)

data/lib/zabbix_manager/classes/applications.rb

@@ -19,24 +19,25 @@ class ZabbixManager
     # Get or Create Application object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify Applications 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)
       log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
 
-      unless (id = get_id(name: data[:name], hostid: data[:hostid]))
-        id = create(data)
+      if (id = get_id(name: data[:name], hostid: data[:hostid]))
+        id
+      else
+        create(data)
       end
-      id
     end
 
     # Create or update Application object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify Applications 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 create_or_update(data)
       applicationid = get_id(name: data[:name], hostid: data[:hostid])
       applicationid ? update(data.merge(applicationid: applicationid)) : create(data)

data/lib/zabbix_manager/classes/configurations.rb

@@ -24,7 +24,7 @@ class ZabbixManager
     # Export configuration data using Zabbix API
     #
     # @param data [Hash]
-    # @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 export(data)
@@ -34,7 +34,7 @@ class ZabbixManager
     # Import configuration data using Zabbix API
     #
     # @param data [Hash]
-    # @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 import(data)

data/lib/zabbix_manager/classes/drules.rb

@@ -21,17 +21,17 @@ class ZabbixManager
     # @return [Hash]
     def default_options
       {
-        name: nil,
+        name:    nil,
         iprange: nil,
-        delay: 3600,
-        status: 0
+        delay:   3600,
+        status:  0
       }
     end
 
     # Get or Create Drule object using Zabbix API
     #
     # @param data [Hash] Needs to include name to properly identify Drule 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(data)
@@ -46,9 +46,9 @@ class ZabbixManager
     # Create or update Drule object using Zabbix API
     #
     # @param data [Hash] Needs to include name to properly identify Drules 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 create_or_update(data)
       druleid = get_id(name: data[:name])
       druleid ? update(data.merge(druleid: druleid)) : create(data)

data/lib/zabbix_manager/classes/errors.rb

@@ -21,7 +21,7 @@ class ZabbixManager
       end
   end
 
-  class ManagerError < BaseError
+  class ZbxError < BaseError
   end
 
   class HttpError < BaseError

data/lib/zabbix_manager/classes/graphs.rb

@@ -19,7 +19,7 @@ class ZabbixManager
     # Get full/extended Graph 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)
@@ -39,7 +39,7 @@ class ZabbixManager
     # Get Graph ids for Host 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_host(data)
@@ -65,7 +65,7 @@ class ZabbixManager
     # Get Graph Item object using Zabbix API
     #
     # @param data [Hash] Needs to include graphids to properly identify Graph Items 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 [Hash]
     def get_items(data)
@@ -81,7 +81,7 @@ class ZabbixManager
     # Get or Create Graph object using Zabbix API
     #
     # @param data [Hash] Needs to include name and templateid to properly identify Graphs 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(data)
@@ -97,9 +97,9 @@ class ZabbixManager
     # Create or update Graph object using Zabbix API
     #
     # @param data [Hash] Needs to include name and templateid to properly identify Graphs 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 create_or_update(data)
       graphid = get_id(name: data[:name], templateid: data[:templateid])
       graphid ? _update(data.merge(graphid: graphid)) : create(data)

data/lib/zabbix_manager/classes/hostgroups.rb

@@ -22,39 +22,5 @@ class ZabbixManager
     def key
       "groupid"
     end
-
-    # 新增 get_hostgroup_ids 方法，使用列表 flatten 功能拉平属组对象
-    def get_hostgroup_ids(data)
-      result = @client.api_request(
-        method: "hostgroup.get",
-        params: {
-          output: "extend",
-          filter: {
-            name: [data].flatten
-          }
-        }
-      ).map { |item| { groupid: item["groupid"] } }
-
-      # 检查是是否存在
-      result.empty? ? nil : result.flatten
-    end
-
-    # 新增 get_or_create_hostgroups 方法，查询或创建新的对象
-    def get_or_create_hostgroups(data)
-      # 是否存在设备属组，不存在则新建
-      [data].flatten.each do |item|
-        result = get_hostgroup_ids(item)
-        if result.nil?
-          @client.api_request(
-            method: "hostgroup.create",
-            params: {
-              name: item
-            }
-          )
-        end
-      rescue StandardError => e
-        ap e
-      end
-    end
   end
 end

data/lib/zabbix_manager/classes/hostinterfaces.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ZabbixManager
+  class HostInterfaces < Basic
+    # The method name used for interacting with HostInterfaces via Zabbix API
+    #
+    # @return [String]
+    def method_name
+      "hostinterface"
+    end
+
+    # The id field name used for identifying specific HostInterface objects via Zabbix API
+    #
+    # @return [String]
+    def identify
+      "hostids"
+    end
+
+    # The key field name used for HostInterface objects via Zabbix API
+    #
+    # @return [String]
+    def key
+      "interfaceid"
+    end
+  end
+end

data/lib/zabbix_manager/classes/hosts.rb

@@ -19,45 +19,46 @@ class ZabbixManager
     # Dump Host 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}"
+
       @client.api_request(
         method: "host.get",
         params: {
-          filter: {
+          filter:      {
             key.to_sym => data[key.to_sym]
           },
-          output: "extend"
-          # selectHosts: 'shorten'
+          output:      "extend",
+          selectHosts: "shorten"
         }
       )
     end
 
     # The default options used when creating Host objects via Zabbix API
-    #
+    # @note Create Host 缺省的配置参数
     # @return [Hash]
     def default_options
       {
-        host: nil,
-        interfaces: {
-          main: 1,
-          useip: 1,
-          type: 2,
-          ip: nil,
-          dns: "",
-          port: 161,
+        host:           nil,
+        interfaces:     {
+          main:    1,
+          useip:   1,
+          type:    2,
+          ip:      nil,
+          dns:     "",
+          port:    161,
           details: {
-            version: 2,
-            community: "transsion"
+            version:   2,
+            community: "public"
           }
         },
-        status: 0,
-        available: 1,
-        groups: [],
-        proxy_hostid: nil,
+        status:         0,
+        available:      1,
+        groups:         [],
+        proxy_hostid:   nil,
         inventory_mode: 1
       }
     end
@@ -65,156 +66,37 @@ class ZabbixManager
     # Unlink/Remove Templates from 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 unlink_templates(data)
       result = @client.api_request(
         method: "host.massRemove",
         params: {
-          hostids: data[:hosts_id],
+          hostids:   data[:hosts_id],
           templates: data[:templates_id]
         }
       )
       result.empty? ? false : true
     end
 
-    # Create or update Host object using Zabbix API
-    #
-    # @param data [Hash] Needs to include host to properly identify Hosts via Zabbix API
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call.
+    # Get Zabbix object ID by name using Zabbix API
+    # @note 基于监控对象索引键(#{identify})查询 #{key}
+    # @param data [String, Array] Needs to include host to properly identify Zabbix Objects 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] Zabbix object id
-
-    # 根据主机 hostid 获取 interfaceid
-    def get_interface_id(hostid)
-      log "[DEBUG] Call _get_interface_id with parameters: #{hostid.inspect}"
-
-      # 请求后端接口
-      result = @client.api_request(
-        method: "hostinterface.get",
-        params: {
-          hostids: hostid
-        }
-      )
-      # 是否为空
-      result.empty? ? nil : result[0]["interfaceid"]
-    end
-
-    # 批量删除主机
-    def mojo_delete(data)
-      hostid = get_id(host: data[:host])
-      log "[DEBUG] Call get_id with parameters: #{hostid.inspect}"
-
-      result = @client.api_request(
-        method: "host.delete",
-        params: [hostid]
-      )
-
-      # 是否为空
-      if result.present?
-        p "成功移除监控主机 #{data.ip}"
-      else
-        p "未能移除监控主机 #{data.ip}"
-      end
-    end
-
-    # 测试数据
-    def update_mojo
-      data = {
-        name: "SZX1-16-SW3111111111",
-        groups: [
-          {
-            groupid: 22
-          }
-        ],
-        templates: [
-          {
-            templateid: 10_227
-          }
-        ],
-        inventory_mode: 1,
-        hostid: 15_951
-      }
-
-      # 请求后端接口
-      @client.api_request(method: "host.update", params: data)
-    end
-
-    # 根据主机名查询 hostid
-    def get_host_id(name)
-      result = @client.api_request(
-        method: "host.get",
-        params: {
-          output: "extend",
-          filter: {
-            host: name
-          }
-        }
-      )
-
-      # 检查是是否存在
-      result.empty? ? nil : result[0]["hostid"]
-    end
-
-    # 根据可见名称查询 hostid
-    def get_hostid_by_name(name)
-      result = @client.api_request(
-        method: "host.get",
-        params: {
-          output: "extend",
-          filter: {
-            name: name
-          }
+    # @return [Array, NilClass] Zabbix object id
+    def get_ids_by_name(data)
+      log "[DEBUG] Call #{method_name}.get_ids_by_name with parameters: #{data.inspect}"
+
+      result = get_raw(
+        {
+          filter: { name: [data].flatten },
+          output: ["#{key}"]
         }
       )
-
-      # 检查是是否存在
-      result.empty? ? nil : result[0]["hostid"]
+      result.empty? ? nil : result.map { |i| { "#{key}": i[key] } }
     end
 
-    # update host index to serail
-    def update_host_to_serial(data)
-      # 检索出监控对象的 hostdid
-      hostid = get_hostid_by_name(host: data[:name])
-
-      if hostid.present?
-        p "已存在监控对象，正在更新 #{data[:name]} 的索引数据 #{data[:host]}"
-        # 数据更新期间不处理模板信息 | TODO 后续需要考虑实现
-        data.delete(:templates)
-        mojo_update("host.update", data.merge(hostid: hostid))
-      else
-        p "未检索到 #{data[:host]} 监控对象"
-      end
-    end
-
-    # create_or_update
-    def create_or_update(data)
-      hostid = get_id(host: data[:host])
-      # 此处更新需要拆分为 hosts 和 interfaces 的数据更新
-      if hostid.present?
-        p "已存在监控对象，正在更新 #{data[:host]} 监控数据"
-
-        # 查询接口对象
-        interfaceid = get_interface_id(hostid)
-        # 绑定接口属性
-        interfaces               = data.delete(:interfaces)
-        interfaces[:interfaceid] = interfaceid
-
-        # 数据更新期间不处理模板信息 | TODO 后续需要考虑实现
-        data.delete(:templates)
-
-        # 分别更新接口和关联信息
-        mojo_update("hostinterface.update", interfaces)
-        mojo_update("host.update", data.merge(hostid: hostid))
-      else
-        p "正在创建 #{data[:host]} 监控对象"
-        # 新增监控对象
-        create data
-      end
-    rescue StandardError => e
-      puts "创建或新增主机 #{data[:host]} 异常，异常信息：#{e}"
-      # raise NotImplementedError
-    end
   end
 end

data/lib/zabbix_manager/classes/httptests.rb

@@ -30,7 +30,7 @@ class ZabbixManager
     # Get or Create HttpTest object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify HttpTests 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(data)
@@ -45,9 +45,9 @@ class ZabbixManager
     # Create or update HttpTest object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify HttpTests 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 create_or_update(data)
       httptestid = get_id(name: data[:name], hostid: data[:hostid])
       httptestid ? update(data.merge(httptestid: httptestid)) : create(data)

data/lib/zabbix_manager/classes/items.rb

@@ -59,40 +59,51 @@ class ZabbixManager
     # Get or Create Item object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify Items 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(name: data[:name], hostid: data[:hostid]))
-        id = create(data)
+      if (id = get_id(name: data[:name], hostid: data[:hostid]))
+        id
+      else
+        create(data)
       end
-      id
     end
 
     # Create or update Item object using Zabbix API
     #
     # @param data [Hash] Needs to include name and hostid to properly identify Items 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 create_or_update(data)
       itemid = get_id(name: data[:name], hostid: data[:hostid])
       itemid ? update(data.merge(itemid: itemid)) : create(data)
     end
 
-    # 根据设备名称和接口名字查询监控项 | 15809 | GigabitEthernet1/0/12
+    # Create Dns Monitor object using Zabbix API
+    # @note 根据设备名称和接口名字查询监控项：入参 GigabitEthernet1/0/12，出参 15809
+    # @example Interface Et0/0(TO_CLOUD): Bits sent, snmpoid 1.3.6.1.2.1.31.1.1.1.10.1
+    # @example Interface Et0/0(TO_CLOUD): Operational status, snmpoid 1.3.6.1.2.1.2.2.1.8.1
+    # @example Interface Et0/0(TO_CLOUD): Speed, snmpoid 1.3.6.1.2.1.31.1.1.1.15.1
+    # @example Interface Et0/0(TO_CLOUD): Bits received, snmpoid 1.3.6.1.2.1.31.1.1.1.6.1
+    # @param hostid [String, Integer] Needs to include name and hostid to properly identify Items via Zabbix API
+    # @param name [String] Needs to include name and hostid to properly identify Items 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, TrueClass, FalseClass, NilClass] Zabbix object id
     def get_interface_items(hostid, name)
+      log "[DEBUG] Call #{method_name}.get_interface_items with parameters: #{data.inspect}"
+
       # 自动剔除收尾空白字串
-      _name = name&.gsub(%r{[^/0-9]}, "")&.strip
+      _name = name&.gsub(%r{[^/0-9]}, "").strip
       iface = "#{_name}("
 
       # 模糊查询接口下所有监控项，同时过滤出特定的 snmp_oid
-      result = @client.api_request(
-        method: "item.get",
-        params: {
-          # output:  ["itemid", "name", "snmp_oid", "key_", "triggerids"],
+      result = get_raw(
+        {
           output:  "extend",
           hostids: hostid,
           search:  {
@@ -104,49 +115,40 @@ class ZabbixManager
       }.sort_by {
         |item| item["key_"]
       }
-
-      # 检查是是否存在
       result.empty? ? nil : result
     end
 
-    # 创建单个 dns item
+    # The default options used when creating DNS Monitor objects via Zabbix API
+    # @note 缺省的 dns 参数
+    # @return [Hash]
+    def default_dns_params
+      {
+        type: 0, # 代表 zabbix_agent
+        value_type: 1, # 代表字符串
+        delay:    "1m",
+        history:  "90d",
+        lifetime: "30d",
+        timeout:  "15s"
+      }
+    end
+
+    # Create Dns Monitor object using Zabbix API
+    #
+    # @param hostid [Hash] Needs to include dns_name and hostid to properly identify Items via Zabbix API
+    # @param dns_name [Hash] Needs to include dns_name and hostid to properly identify Items 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, TrueClass, FalseClass, NilClass] Zabbix object id
     def create_dns_item(hostid, dns_name)
-      # 字串内插
-      item_name = "【DNS域名解析监控】#{dns_name}"
-      item_key_ = "net.dns.record[,#{dns_name},A,2,2]"
+      name = "【DNS域名解析监控】#{dns_name}"
+      key  = "net.dns.record[,#{dns_name},A,2,2]"
 
-      # 请求绑定 dns 监控项到特定的 hostid
+      params = default_dns_params.merge(hostid: hostid, name: name, key: key)
       result = @client.api_request(
         method: "item.create",
-        params: {
-          hostid: hostid,
-          name:   item_name,
-          key_:   item_key_,
-          # 代表 zabbix_agent
-          type: 0,
-          # 代表字符串
-          value_type: 1,
-          # 固定参数
-          delay:    "1m",
-          history:  "90d",
-          lifetime: "30d",
-          timeout:  "3s"
-        }
-      )
-      p "成功创建 dns监控 #{dns_name}"
-    rescue StandardError
-      p "创建 dns监控 #{dns_name} 异常"
-    end
-
-    # 查询某个监控项具体信息
-    def get_item_info
-      result = @client.api_request(
-        method: "item.get",
-        params: {
-          output:  "extend",
-          hostids: "16914"
-        }
+        params: params
       )
+      result.empty? ? nil : result
     end
   end
 end

data/lib/zabbix_manager/classes/mediatypes.rb

@@ -44,7 +44,7 @@ class ZabbixManager
     #
     # @param data [Hash] Should include object's id field name (identify) and id value
     # @param force [Boolean] Whether to force an object update even if provided data matches Zabbix
-    # @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 object id if a single object is created
     # @return [Boolean] True/False if multiple objects are created
@@ -71,16 +71,16 @@ class ZabbixManager
     # Get MediaType object id from API based on provided data
     #
     # @param data [Hash]
-    # @raise [ManagerError] Error returned when there is a problem with the Zabbix API call or missing object's id field name (identify).
+    # @raise [ZbxError] Error returned when there is a problem with the Zabbix API call or missing object's id field name (identify).
     # @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 get_id(data)
       log "[DEBUG] Call get_id with parameters: #{data.inspect}"
       # symbolize keys if the user used string keys instead of symbols
       data = symbolize_keys(data) if data.key?(identify)
       # raise an error if identify name was not supplied
       name = data[identify.to_sym]
-      raise ManagerError, "#{identify} not supplied in call to get_id, #{data} (#{method_name})" if name.nil?
+      raise ZbxError, "#{identify} not supplied in call to get_id, #{data} (#{method_name})" if name.nil?
 
       result = @client.api_request(
         method: "#{method_name}.get",
@@ -97,7 +97,7 @@ class ZabbixManager
     # Create or update MediaType object using 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 [Integer] The object id if a single object is created
     # @return [Boolean] True/False if multiple objects are created