zabbix_manager 5.1.2.pre.alpha2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc49067a72b48ca4afa06f930179c911da0681a08a769ca5d272349e267bc4a7
-  data.tar.gz: 6be2c176ef4409fef405f23acbe2db93d940f90524bb895883cfbfd2bd9f9531
+  metadata.gz: 96bd31db6f13198d30bc1de2ac7168b7e535b17e3b1d80d97a30d852dc509c55
+  data.tar.gz: 9022b530a873d1750502c288201583707303a6128eff5c10f82f125f1538a515
 SHA512:
-  metadata.gz: 137d96feef4c4de993b9c2e066b536a6b66e2f5401c3bbd49a462733b9f01769c635d62ff091504f9a1be3a0ecc815c6b55959893c9b72f4e59c97355241d396
-  data.tar.gz: 5c19e0c2b465148e949eb85cbab2fa3383a88a63f301b79bfa2f621687fe01b1414d4825cbdd8e9f7a9f68c97693d0322b1c9ca58c52696803c13b34d7ead853
+  metadata.gz: 8b4e51fc29613d082df8de77f4eab1b9eb12b30acf5d4d36f751bbaf8c657577f21d1faf8e715c4694f78b832b8c02696e5aeb468d1ffbfc9a2b7ecbbd7d1722
+  data.tar.gz: 5e56fdd12fc7afddc2df2f5899fa390f97ba0e7eacafa3141fcfc2dad37ab9aa85f7e8a4553797d6dfbe8aaa286d0ad5932ee2dadb231d4a3b2e2c4a01986c9c

data/lib/zabbix_manager/basic/basic_logic.rb

@@ -51,7 +51,7 @@ class ZabbixManager
     def delete(data)
       log "[DEBUG] Call #{method_name}.delete with parameters: #{data.inspect}"
 
-      result = @client.api_request(method: "#{method_name}.delete", params: data)
+      result = @client.api_request(method: "#{method_name}.delete", params: [data].flatten)
       parse_keys result
     end
 

data/lib/zabbix_manager/classes/hostinterfaces.rb

@@ -22,5 +22,16 @@ class ZabbixManager
     def key
       "interfaceid"
     end
+
+    # Get Zabbix interface id from API based on provided hostid
+    # @note 基于 hostid 查询关联的 Interfaceid
+    # @param hostid [Integer, String]
+    # @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, NilClass] Zabbix object id
+    def get_interfaceid(hostid)
+      result = get_raw({ output: key, "#{identify}": hostid })
+      result&.[](0)&.[](key)&.to_i
+    end
   end
 end

data/lib/zabbix_manager/classes/hosts.rb

@@ -98,5 +98,41 @@ class ZabbixManager
       result.empty? ? nil : result.map { |i| { "#{key}": i[key] } }
     end
 
+    # Create or update Zabbix object using API
+    # @note 创建或更新 Host 监控对象，入参为基于符号的哈希对象，返回监控对象 id
+    # @note 重写基类方法 create_or_update，特殊处理 interfaces 对象
+    # @param data [Hash] Should include object's id field name (identify) and id value
+    # @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
+    def create_or_update(data)
+      log "[DEBUG] Call #{method_name}.create_or_update with parameters: #{data.inspect}"
+
+      hostid = get_id(identify.to_sym => data[identify.to_sym])
+      return create(data) unless hostid
+
+      interface_id = get_interfaceid(hostid)
+      raise ZbxError, "interfaceid not found in call to get_interfaceid" unless interface_id
+
+      interfaces = data.delete(:interfaces)&.merge(interfaceid: interface_id)
+      params     = data.merge(interfaces: interfaces).merge(key.to_sym => hostid.to_s)
+      update(params)
+    end
+
+    # Get Zabbix interface id from API based on provided hostid
+    # @note 基于 hostid 查询关联的 Interfaceid
+    # @param hostid [Integer, String]
+    # @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, NilClass] Zabbix object id
+    def get_interfaceid(hostid)
+      result = @client.api_request(
+        method: "hostinterface.get",
+        params: { output: "interfaceid", hostids: hostid }
+      )
+      result&.[](0)&.[]("interfaceid")&.to_i
+    end
   end
 end
+

data/lib/zabbix_manager/classes/items.rb

@@ -95,7 +95,7 @@ class ZabbixManager
     # @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}"
+      log "[DEBUG] Call #{method_name}.get_interface_items with: hostid #{hostid.inspect} name #{name.inspect}"
 
       # 自动剔除收尾空白字串
       _name = name&.gsub(%r{[^/0-9]}, "").strip

data/lib/zabbix_manager/classes/triggers.rb

@@ -18,6 +18,7 @@ class ZabbixManager
 
     # The default options used when creating zabbix triggers
     # @note 缺省的 trigger 参数
+    # @see https://www.zabbix.com/documentation/current/en/manual/api/reference/trigger/get
     # @return [Hash]
     def default_options
       {
@@ -39,9 +40,7 @@ class ZabbixManager
       @client.api_request(
         method: "trigger.get",
         params: {
-          filter:           {
-            keys.to_sym => data[keys.to_sym]
-          },
+          triggerids:       data[keys.to_sym],
           output:           "extend",
           select_items:     "extend",
           select_functions: "extend"
@@ -118,7 +117,6 @@ class ZabbixManager
       triggerid ? update(data.merge(triggerid: triggerid)) : create(data)
     end
 
-
     # Add dependsOnTrigger using Zabbix API
     #
     # @param triggerid [Integer] identify for trigger via Zabbix API

data/lib/zabbix_manager/version.rb

@@ -2,5 +2,5 @@
 
 class ZabbixManager
   # @note find ./* -type f -exec sed -i 's/\[X\]/\[Y\]/g' {} +
-  VERSION = "5.1.2.pre.alpha2"
+  VERSION = "5.1.3"
 end

data/lib/zabbix_manager.rb

@@ -3,46 +3,16 @@
 require "zabbix_manager/version"
 require "zabbix_manager/client"
 
-require "zabbix_manager/basic/basic_alias"
-require "zabbix_manager/basic/basic_func"
-require "zabbix_manager/basic/basic_init"
-require "zabbix_manager/basic/basic_logic"
-
-require "zabbix_manager/classes/actions"
-require "zabbix_manager/classes/applications"
-require "zabbix_manager/classes/configurations"
-require "zabbix_manager/classes/errors"
-require "zabbix_manager/classes/events"
-require "zabbix_manager/classes/graphs"
-require "zabbix_manager/classes/hostgroups"
-require "zabbix_manager/classes/hosts"
-require "zabbix_manager/classes/httptests"
-require "zabbix_manager/classes/items"
-require "zabbix_manager/classes/maintenance"
-require "zabbix_manager/classes/mediatypes"
-require "zabbix_manager/classes/proxies"
-require "zabbix_manager/classes/problems"
-require "zabbix_manager/classes/roles"
-require "zabbix_manager/classes/screens"
-require "zabbix_manager/classes/scripts"
-require "zabbix_manager/classes/server"
-require "zabbix_manager/classes/templates"
-require "zabbix_manager/classes/triggers"
-require "zabbix_manager/classes/unusable"
-require "zabbix_manager/classes/usergroups"
-require "zabbix_manager/classes/usermacros"
-require "zabbix_manager/classes/users"
-require "zabbix_manager/classes/valuemaps"
-require "zabbix_manager/classes/drules"
-
-# Dynamically load Ruby modules
-# Dir.glob(File.join(__dir__, "zabbix_manager", "**", "*.rb")).sort.each do |module_rb|
-#   require module_rb
-# end
-
-# @author: WENWU YAN
-# @email: 968828@gmail.com
-# @date: 2023/3/25下午4:47
+# Dynamically load Basic Classes
+Dir.glob(File.join(__dir__, "zabbix_manager/basic", "**", "*.rb")).sort.each do |basic_class|
+  require basic_class
+end
+
+# Dynamically load Extend Classes
+Dir.glob(File.join(__dir__, "zabbix_manager/classes", "**", "*.rb")).sort.each do |extend_class|
+  require extend_class
+end
+
 class ZabbixManager
   # @return [ZabbixManager::Client]
   attr_reader :client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_manager
 version: !ruby/object:Gem::Version
-  version: 5.1.2.pre.alpha2
+  version: 5.1.3
 platform: ruby
 authors:
 - WENWU YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -116,9 +116,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.6
 signing_key: