zabbix_manager 5.1.4 → 5.1.6

data/lib/zabbix_manager.rb

@@ -1,168 +1,246 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/hash/indifferent_access"
+require "active_support/core_ext/hash/keys"
+require "active_support/core_ext/hash/deep_transform_values"
+require "active_support/core_ext/enumerable"
+require "active_support/core_ext/array/wrap"
+require "active_support/core_ext/object/blank"
 require "zabbix_manager/version"
+require "zabbix_manager/classes/errors"
+require "zabbix_manager/log_sanitizer"
+require "zabbix_manager/http_transport"
 require "zabbix_manager/client"
 
-# 动态加载基础类
-Dir.glob(File.join(__dir__, "zabbix_manager/basic", "**", "*.rb")).sort.each do |basic_class|
-  require basic_class
-end
-
-# 动态加载扩展类
-Dir.glob(File.join(__dir__, "zabbix_manager/classes", "**", "*.rb")).sort.each do |extend_class|
-  require extend_class
-end
+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/events"
+require "zabbix_manager/classes/graphs"
+require "zabbix_manager/classes/hostgroups"
+require "zabbix_manager/classes/hostinterfaces"
+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/usergroups"
+require "zabbix_manager/classes/usermacros"
+require "zabbix_manager/classes/users"
+require "zabbix_manager/classes/valuemaps"
+require "zabbix_manager/classes/drules"
+require "zabbix_manager/monitoring"
 
 class ZabbixManager
+  # @return [ZabbixManager::Client]
   attr_reader :client
 
-  # 初始化一个新的 ZabbixManager 对象
+  # 使用页面或服务配置创建管理器实例。
+  #
+  # @param options [Hash]
+  # @return [ZabbixManager]
   def self.connect(options = {})
     new(options)
   end
 
-  # 获取当前 ZabbixManager 对象
+  # 返回进程内默认管理器实例。
+  # @return [ZabbixManager]
   def self.current
-    @current ||= new
+    @current ||= ZabbixManager.new
   end
 
-  # 直接使用自定义查询执行 API 请求
+  # 直接执行调用方指定的 Zabbix API 方法。
+  #
+  # @param data [Hash]
+  # @return [Hash]
   def query(data)
     @client.api_request(method: data[:method], params: data[:params])
   end
 
-  # 注销当前身份验证令牌
+  # 注销用户名会话并关闭连接。
+  # @return [Boolean]
   def logout
     @client.logout
   end
 
-  # 初始化一个新的 ZabbixManager 对象
+  # 关闭持久 HTTP 连接但不改变远端凭据。
+  def close
+    @client.close
+  end
+
+  # 初始化管理器并创建唯一共享客户端。
+  #
+  # @param options [Hash]
+  # @return [ZabbixManager::Client]
   def initialize(options = {})
     @client = Client.new(options)
   end
 
-  # 返回 ZabbixManager::Actions 对象
+  # 返回动作模块并复用同一客户端。
+  # @return [ZabbixManager::Actions]
   def actions
     @actions ||= Actions.new(@client)
   end
 
-  # 返回 ZabbixManager::Applications 对象
+  # 返回应用模块并复用同一客户端。
+  # @return [ZabbixManager::Applications]
   def applications
     @applications ||= Applications.new(@client)
   end
 
-  # 返回 ZabbixManager::Configurations 对象
+  # 返回配置导入导出模块并复用同一客户端。
+  # @return [ZabbixManager::Configurations]
   def configurations
     @configurations ||= Configurations.new(@client)
   end
 
-  # 返回 ZabbixManager::Events 对象
+  # 返回事件模块并复用同一客户端。
+  # @return [ZabbixManager::Events]
   def events
     @events ||= Events.new(@client)
   end
 
-  # 返回 ZabbixManager::Graphs 对象
+  # 返回图形模块并复用同一客户端。
+  # @return [ZabbixManager::Graphs]
   def graphs
     @graphs ||= Graphs.new(@client)
   end
 
-  # 返回 ZabbixManager::HostGroups 对象
+  # 返回主机群组模块并复用同一客户端。
+  # @return [ZabbixManager::HostGroups]
   def hostgroups
     @hostgroups ||= HostGroups.new(@client)
   end
 
-  # 返回 ZabbixManager::HostInterfaces 对象
+  # 返回主机接口 API 模块，并复用同一客户端会话。
+  # @return [ZabbixManager::HostInterfaces]
   def hostinterfaces
     @hostinterfaces ||= HostInterfaces.new(@client)
   end
 
-  # 返回 ZabbixManager::Hosts 对象
+  # 返回主机模块并复用同一客户端。
+  # @return [ZabbixManager::Hosts]
   def hosts
     @hosts ||= Hosts.new(@client)
   end
 
-  # 返回 ZabbixManager::HttpTests 对象
+  # 返回 Web 场景模块并复用同一客户端。
+  # @return [ZabbixManager::HttpTests]
   def httptests
     @httptests ||= HttpTests.new(@client)
   end
 
-  # 返回 ZabbixManager::Items 对象
+  # 返回监控项模块并复用同一客户端。
+  # @return [ZabbixManager::Items]
   def items
     @items ||= Items.new(@client)
   end
 
-  # 返回 ZabbixManager::Maintenance 对象
+  # 返回维护模块并复用同一客户端。
+  # @return [ZabbixManager::Maintenance]
   def maintenance
     @maintenance ||= Maintenance.new(@client)
   end
 
-  # 返回 ZabbixManager::Mediatypes 对象
+  # 返回媒介类型模块并复用同一客户端。
+  # @return [ZabbixManager::Mediatypes]
   def mediatypes
     @mediatypes ||= Mediatypes.new(@client)
   end
 
-  # 返回 ZabbixManager::Problems 对象
+  # 返回问题模块并复用同一客户端。
+  # @return [ZabbixManager::Problems]
   def problems
     @problems ||= Problems.new(@client)
   end
 
-  # 返回 ZabbixManager::Proxies 对象
+  # 返回代理模块并复用同一客户端。
+  # @return [ZabbixManager::Proxies]
   def proxies
     @proxies ||= Proxies.new(@client)
   end
 
-  # 返回 ZabbixManager::Roles 对象
+  # 返回角色模块并复用同一客户端。
+  # @return [ZabbixManager::Roles]
   def roles
     @roles ||= Roles.new(@client)
   end
 
-  # 返回 ZabbixManager::Screens 对象
+  # 返回聚合图模块并复用同一客户端。
+  # @return [ZabbixManager::Screens]
   def screens
     @screens ||= Screens.new(@client)
   end
 
-  # 返回 ZabbixManager::Scripts 对象
+  # 返回脚本模块并复用同一客户端。
+  # @return [ZabbixManager::Scripts]
   def scripts
     @scripts ||= Scripts.new(@client)
   end
 
-  # 返回 ZabbixManager::Server 对象
+  # 返回服务端信息模块并复用同一客户端。
+  # @return [ZabbixManager::Server]
   def server
     @server ||= Server.new(@client)
   end
 
-  # 返回 ZabbixManager::Templates 对象
+  # 返回模板模块并复用同一客户端。
+  # @return [ZabbixManager::Templates]
   def templates
     @templates ||= Templates.new(@client)
   end
 
-  # 返回 ZabbixManager::Triggers 对象
+  # 返回触发器模块并复用同一客户端。
+  # @return [ZabbixManager::Triggers]
   def triggers
     @triggers ||= Triggers.new(@client)
   end
 
-  # 返回 ZabbixManager::Usergroups 对象
+  # 返回用户群组模块并复用同一客户端。
+  # @return [ZabbixManager::Usergroups]
   def usergroups
     @usergroups ||= Usergroups.new(@client)
   end
 
-  # 返回 ZabbixManager::Usermacros 对象
+  # 返回用户宏模块并复用同一客户端。
+  # @return [ZabbixManager::Usermacros]
   def usermacros
     @usermacros ||= Usermacros.new(@client)
   end
 
-  # 返回 ZabbixManager::Users 对象
+  # 返回用户模块并复用同一客户端。
+  # @return [ZabbixManager::Users]
   def users
     @users ||= Users.new(@client)
   end
 
-  # 返回 ZabbixManager::ValueMaps 对象
+  # 返回值映射模块并复用同一客户端。
+  # @return [ZabbixManager::ValueMaps]
   def valuemaps
     @valuemaps ||= ValueMaps.new(@client)
   end
 
-  # 返回 ZabbixManager::Drules 对象
+  # 返回网络发现规则模块并复用同一客户端。
+  # @return [ZabbixManager::Drules]
   def drules
     @drules ||= Drules.new(@client)
   end
+
+  # 返回设备、接口和线路监控的幂等业务编排模块。
+  def monitoring
+    @monitoring ||= Monitoring.new(self)
+  end
 end

data/zabbix_manager.gemspec

@@ -8,25 +8,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "zabbix_manager/version"
 
 Gem::Specification.new do |spec|
-  spec.add_dependency "http"
-  spec.add_dependency "json"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", ">= 6.1", "< 8"
+  spec.add_dependency "json", "~> 2.0"
+  spec.add_dependency "logger", ">= 1.4"
+  spec.add_development_dependency "bundler", "~> 2.3", ">= 2.3.9"
+  spec.add_development_dependency "base64", ">= 0.2"
+  spec.add_development_dependency "benchmark", ">= 0.3"
+  spec.add_development_dependency "minitest", "~> 5.27"
+  spec.add_development_dependency "ostruct", ">= 0.6"
+  spec.add_development_dependency "racc", ">= 1.6"
+
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "yard", "~> 0.9.27"
+  spec.add_development_dependency "yardstick", "~> 0.9.9"
+  spec.add_development_dependency "rubocop", "~> 1.25", ">= 1.25.1"
+  spec.add_development_dependency "rubocop-performance", "~> 1.13"
+  spec.add_development_dependency "rubocop-packaging", "~> 0.5.1"
 
   spec.name    = "zabbix_manager"
   spec.version = ZabbixManager::VERSION
   spec.authors = ["WENWU YAN"]
   spec.email   = ["careline@foxmail.com"]
 
-  spec.summary     = "Common code for Zabbix API clients"
-  spec.description = "A Ruby interface to the Zabbix API"
-  spec.homepage    = "https://github.com/snmpd/zabbix_manager"
+  spec.summary     = "Ruby client and monitoring workflows for the Zabbix 4.0 through 7.x API"
+  spec.description = "A reusable Zabbix API client with device and network-interface monitoring workflows."
+  spec.homepage    = "https://github.com/gatework/zabbix_manager/tree/master"
   spec.licenses    = "MIT"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"]    = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/snmpd/zabbix_manager"
-  spec.metadata["changelog_uri"]   = "https://github.com/snmpd/zabbix_manager"
+  spec.metadata["source_code_uri"] = "https://github.com/gatework/zabbix_manager"
+  spec.metadata["changelog_uri"]   = "https://github.com/gatework/zabbix_manager/blob/master/CHANGELOG.md"
 
   spec.files                 = %w[CHANGELOG.md LICENSE README.md zabbix_manager.gemspec] + Dir["lib/**/*.rb"]
   spec.require_paths         = "lib"

metadata

@@ -1,58 +1,244 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_manager
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - WENWU YAN
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 2.3.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.9
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.27'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.27'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.27
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.27
+- !ruby/object:Gem::Dependency
+  name: yardstick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: A Ruby interface to the Zabbix API
+        version: 1.25.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+description: A reusable Zabbix API client with device and network-interface monitoring
+  workflows.
 email:
 - careline@foxmail.com
 executables: []
@@ -89,23 +275,24 @@ files:
 - lib/zabbix_manager/classes/server.rb
 - lib/zabbix_manager/classes/templates.rb
 - lib/zabbix_manager/classes/triggers.rb
-- lib/zabbix_manager/classes/unusable.rb
 - lib/zabbix_manager/classes/usergroups.rb
 - lib/zabbix_manager/classes/usermacros.rb
 - lib/zabbix_manager/classes/users.rb
 - lib/zabbix_manager/classes/valuemaps.rb
 - lib/zabbix_manager/client.rb
+- lib/zabbix_manager/http_transport.rb
+- lib/zabbix_manager/log_sanitizer.rb
+- lib/zabbix_manager/monitoring.rb
 - lib/zabbix_manager/version.rb
 - zabbix_manager.gemspec
-homepage: https://github.com/snmpd/zabbix_manager
+homepage: https://github.com/gatework/zabbix_manager/tree/master
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/snmpd/zabbix_manager
-  source_code_uri: https://github.com/snmpd/zabbix_manager
-  changelog_uri: https://github.com/snmpd/zabbix_manager
-post_install_message: 
+  homepage_uri: https://github.com/gatework/zabbix_manager/tree/master
+  source_code_uri: https://github.com/gatework/zabbix_manager
+  changelog_uri: https://github.com/gatework/zabbix_manager/blob/master/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 4.0.12
 specification_version: 4
-summary: Common code for Zabbix API clients
+summary: Ruby client and monitoring workflows for the Zabbix 4.0 through 7.x API
 test_files: []

data/lib/zabbix_manager/classes/unusable.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class ZabbixManager
-  class Triggers < Basic
-    # 使用 Zabbix API 创建或更新触发器对象
-    def create_or_update(data)
-      log "[DEBUG] 调用 create_or_update 方法，参数: #{data.inspect}"
-      get_or_create(data)
-    end
-  end
-end