zabbix_manager 5.1.6 → 6.0.0

data/lib/zabbix_manager.rb

@@ -6,30 +6,30 @@ 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 "active_support/core_ext/object/deep_dup"
 require "zabbix_manager/version"
 require "zabbix_manager/classes/errors"
 require "zabbix_manager/log_sanitizer"
 require "zabbix_manager/http_transport"
+require "zabbix_manager/configuration"
 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/resource"
 
 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/host_groups"
+require "zabbix_manager/classes/host_interfaces"
 require "zabbix_manager/classes/hosts"
-require "zabbix_manager/classes/httptests"
+require "zabbix_manager/classes/http_tests"
 require "zabbix_manager/classes/items"
 require "zabbix_manager/classes/maintenance"
-require "zabbix_manager/classes/mediatypes"
+require "zabbix_manager/classes/media_types"
 require "zabbix_manager/classes/proxies"
+require "zabbix_manager/classes/proxy_groups"
 require "zabbix_manager/classes/problems"
 require "zabbix_manager/classes/roles"
 require "zabbix_manager/classes/screens"
@@ -37,37 +37,47 @@ 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/user_groups"
+require "zabbix_manager/classes/user_macros"
 require "zabbix_manager/classes/users"
-require "zabbix_manager/classes/valuemaps"
-require "zabbix_manager/classes/drules"
+require "zabbix_manager/classes/value_maps"
+require "zabbix_manager/classes/discovery_rules"
 require "zabbix_manager/monitoring"
+require "zabbix_manager/traffic"
 
+# 管理一个已认证客户端及其资源、监控和流量入口；连接生命周期由调用方负责。
+# 原生 API 透传不代替应用层授权，资源对象共享同一客户端凭据。
 class ZabbixManager
   # @return [ZabbixManager::Client]
   attr_reader :client
 
-  # 使用页面或服务配置创建管理器实例。
+  # 使用显式配置创建管理器，并立即查询 API 版本、完成认证。
   #
   # @param options [Hash]
   # @return [ZabbixManager]
-  def self.connect(options = {})
-    new(options)
+  # @raise [Invalid, ApiError, TransportError] 配置、认证或连接失败
+  def self.connect(**options)
+    new(**options)
   end
 
-  # 返回进程内默认管理器实例。
-  # @return [ZabbixManager]
-  def self.current
-    @current ||= ZabbixManager.new
+  # 仅使用文档列出的连接环境变量创建管理器。
+  # 显式选项覆盖环境配置，包含显式传入的 nil。
+  # @param env [#[]] 包含四个约定 ZABBIX_* 环境变量的映射
+  # @param options [Hash] 显式连接配置
+  # @return [ZabbixManager] 已认证管理器，其生命周期由调用方负责
+  def self.from_env(env: ENV, **options)
+    new(**Configuration.from_env(env, options))
   end
 
   # 直接执行调用方指定的 Zabbix API 方法。
   #
-  # @param data [Hash]
-  # @return [Hash]
-  def query(data)
-    @client.api_request(method: data[:method], params: data[:params])
+  # @param method [String]
+  # @param params [Hash, Array]
+  # @return [Object]
+  # @raise [ApiError] 服务端明确拒绝请求
+  # @raise [TransportError, ProtocolError] 未获得可确认结果；写请求不可盲目重试
+  def query(method:, params: {})
+    @client.api_request(method: method, params: params)
   end
 
   # 注销用户名会话并关闭连接。
@@ -77,6 +87,7 @@ class ZabbixManager
   end
 
   # 关闭持久 HTTP 连接但不改变远端凭据。
+  # @return [true] 下次请求可按需重新连接
   def close
     @client.close
   end
@@ -84,163 +95,39 @@ class ZabbixManager
   # 初始化管理器并创建唯一共享客户端。
   #
   # @param options [Hash]
-  # @return [ZabbixManager::Client]
-  def initialize(options = {})
-    @client = Client.new(options)
-  end
-
-  # 返回动作模块并复用同一客户端。
-  # @return [ZabbixManager::Actions]
-  def actions
-    @actions ||= Actions.new(@client)
-  end
-
-  # 返回应用模块并复用同一客户端。
-  # @return [ZabbixManager::Applications]
-  def applications
-    @applications ||= Applications.new(@client)
-  end
-
-  # 返回配置导入导出模块并复用同一客户端。
-  # @return [ZabbixManager::Configurations]
-  def configurations
-    @configurations ||= Configurations.new(@client)
-  end
-
-  # 返回事件模块并复用同一客户端。
-  # @return [ZabbixManager::Events]
-  def events
-    @events ||= Events.new(@client)
-  end
-
-  # 返回图形模块并复用同一客户端。
-  # @return [ZabbixManager::Graphs]
-  def graphs
-    @graphs ||= Graphs.new(@client)
-  end
-
-  # 返回主机群组模块并复用同一客户端。
-  # @return [ZabbixManager::HostGroups]
-  def hostgroups
-    @hostgroups ||= HostGroups.new(@client)
-  end
-
-  # 返回主机接口 API 模块，并复用同一客户端会话。
-  # @return [ZabbixManager::HostInterfaces]
-  def hostinterfaces
-    @hostinterfaces ||= HostInterfaces.new(@client)
-  end
-
-  # 返回主机模块并复用同一客户端。
-  # @return [ZabbixManager::Hosts]
-  def hosts
-    @hosts ||= Hosts.new(@client)
-  end
-
-  # 返回 Web 场景模块并复用同一客户端。
-  # @return [ZabbixManager::HttpTests]
-  def httptests
-    @httptests ||= HttpTests.new(@client)
-  end
-
-  # 返回监控项模块并复用同一客户端。
-  # @return [ZabbixManager::Items]
-  def items
-    @items ||= Items.new(@client)
-  end
-
-  # 返回维护模块并复用同一客户端。
-  # @return [ZabbixManager::Maintenance]
-  def maintenance
-    @maintenance ||= Maintenance.new(@client)
-  end
-
-  # 返回媒介类型模块并复用同一客户端。
-  # @return [ZabbixManager::Mediatypes]
-  def mediatypes
-    @mediatypes ||= Mediatypes.new(@client)
-  end
-
-  # 返回问题模块并复用同一客户端。
-  # @return [ZabbixManager::Problems]
-  def problems
-    @problems ||= Problems.new(@client)
-  end
-
-  # 返回代理模块并复用同一客户端。
-  # @return [ZabbixManager::Proxies]
-  def proxies
-    @proxies ||= Proxies.new(@client)
-  end
-
-  # 返回角色模块并复用同一客户端。
-  # @return [ZabbixManager::Roles]
-  def roles
-    @roles ||= Roles.new(@client)
-  end
-
-  # 返回聚合图模块并复用同一客户端。
-  # @return [ZabbixManager::Screens]
-  def screens
-    @screens ||= Screens.new(@client)
-  end
-
-  # 返回脚本模块并复用同一客户端。
-  # @return [ZabbixManager::Scripts]
-  def scripts
-    @scripts ||= Scripts.new(@client)
-  end
-
-  # 返回服务端信息模块并复用同一客户端。
-  # @return [ZabbixManager::Server]
-  def server
-    @server ||= Server.new(@client)
-  end
-
-  # 返回模板模块并复用同一客户端。
-  # @return [ZabbixManager::Templates]
-  def templates
-    @templates ||= Templates.new(@client)
-  end
-
-  # 返回触发器模块并复用同一客户端。
-  # @return [ZabbixManager::Triggers]
-  def triggers
-    @triggers ||= Triggers.new(@client)
-  end
-
-  # 返回用户群组模块并复用同一客户端。
-  # @return [ZabbixManager::Usergroups]
-  def usergroups
-    @usergroups ||= Usergroups.new(@client)
-  end
-
-  # 返回用户宏模块并复用同一客户端。
-  # @return [ZabbixManager::Usermacros]
-  def usermacros
-    @usermacros ||= Usermacros.new(@client)
-  end
-
-  # 返回用户模块并复用同一客户端。
-  # @return [ZabbixManager::Users]
-  def users
-    @users ||= Users.new(@client)
-  end
-
-  # 返回值映射模块并复用同一客户端。
-  # @return [ZabbixManager::ValueMaps]
-  def valuemaps
-    @valuemaps ||= ValueMaps.new(@client)
-  end
-
-  # 返回网络发现规则模块并复用同一客户端。
-  # @return [ZabbixManager::Drules]
-  def drules
-    @drules ||= Drules.new(@client)
-  end
-
-  # 返回设备、接口和线路监控的幂等业务编排模块。
+  # @raise [Invalid, ApiError, TransportError] 配置、认证或连接失败
+  def initialize(**options)
+    @client = Client.new(**options)
+    @resources = {}
+  end
+
+  # 各资源对象共享当前管理器的已认证客户端。
+  RESOURCES = {
+    actions: Actions, applications: Applications, configurations: Configurations,
+    events: Events, graphs: Graphs, host_groups: HostGroups, host_interfaces: HostInterfaces,
+    hosts: Hosts, http_tests: HttpTests, items: Items, maintenance: Maintenance,
+    media_types: MediaTypes, problems: Problems, proxies: Proxies, proxy_groups: ProxyGroups, roles: Roles,
+    screens: Screens, scripts: Scripts, server: Server, templates: Templates,
+    triggers: Triggers, user_groups: UserGroups, user_macros: UserMacros, users: Users,
+    value_maps: ValueMaps, discovery_rules: DiscoveryRules
+  }.freeze
+  private_constant :RESOURCES
+
+  # 在加载期按固定映射生成 actions、host_groups 等访问器，避免重复的资源工厂方法。
+  # 名称不来自外部输入；实例按管理器缓存，认证和连接由共享 Client 持有。
+  RESOURCES.each do |name, resource_class|
+    define_method(name) { @resources[name] ||= resource_class.new(@client) }
+  end
+
+  # 返回仅使用 Zabbix 原生 API 的设备、接口和线路监控编排入口。
+  # @return [ZabbixManager::Monitoring] 同一 manager 复用同一业务实例
   def monitoring
     @monitoring ||= Monitoring.new(self)
   end
+
+  # 查询数值监控项的历史或趋势序列，不访问数据库、不补造缺失观测。
+  # @return [ZabbixManager::Traffic] 同一 manager 复用同一查询实例
+  def traffic
+    @traffic ||= Traffic.new(self)
+  end
 end

data/zabbix_manager.gemspec

@@ -1,29 +1,13 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
-
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "zabbix_manager/version"
+require_relative "lib/zabbix_manager/version"
 
 Gem::Specification.new do |spec|
-  spec.add_dependency "activesupport", ">= 6.1", "< 8"
-  spec.add_dependency "json", "~> 2.0"
+  spec.add_dependency "activesupport", ">= 7.2"
+  spec.add_dependency "bigdecimal"
+  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.add_dependency "net-http"
 
   spec.name    = "zabbix_manager"
   spec.version = ZabbixManager::VERSION
@@ -43,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.files                 = %w[CHANGELOG.md LICENSE README.md zabbix_manager.gemspec] + Dir["lib/**/*.rb"]
   spec.require_paths         = "lib"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_manager
 version: !ruby/object:Gem::Version
-  version: 5.1.6
+  version: 6.0.0
 platform: ruby
 authors:
 - WENWU YAN
@@ -15,228 +15,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
 - !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
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        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'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '1.4'
+  type: :runtime
   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
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: net-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.1
-  type: :development
+        version: '0'
+  type: :runtime
   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
+        version: '0'
 description: A reusable Zabbix API client with device and network-interface monitoring
   workflows.
 email:
@@ -249,40 +91,49 @@ files:
 - LICENSE
 - README.md
 - lib/zabbix_manager.rb
-- lib/zabbix_manager/basic/basic_alias.rb
-- lib/zabbix_manager/basic/basic_func.rb
-- lib/zabbix_manager/basic/basic_init.rb
-- lib/zabbix_manager/basic/basic_logic.rb
 - lib/zabbix_manager/classes/actions.rb
 - lib/zabbix_manager/classes/applications.rb
 - lib/zabbix_manager/classes/configurations.rb
-- lib/zabbix_manager/classes/drules.rb
+- lib/zabbix_manager/classes/discovery_rules.rb
 - lib/zabbix_manager/classes/errors.rb
 - lib/zabbix_manager/classes/events.rb
 - lib/zabbix_manager/classes/graphs.rb
-- lib/zabbix_manager/classes/hostgroups.rb
-- lib/zabbix_manager/classes/hostinterfaces.rb
+- lib/zabbix_manager/classes/host_groups.rb
+- lib/zabbix_manager/classes/host_interfaces.rb
 - lib/zabbix_manager/classes/hosts.rb
-- lib/zabbix_manager/classes/httptests.rb
+- lib/zabbix_manager/classes/http_tests.rb
 - lib/zabbix_manager/classes/items.rb
 - lib/zabbix_manager/classes/maintenance.rb
-- lib/zabbix_manager/classes/mediatypes.rb
+- lib/zabbix_manager/classes/media_types.rb
 - lib/zabbix_manager/classes/problems.rb
 - lib/zabbix_manager/classes/proxies.rb
+- lib/zabbix_manager/classes/proxy_groups.rb
 - lib/zabbix_manager/classes/roles.rb
 - lib/zabbix_manager/classes/screens.rb
 - lib/zabbix_manager/classes/scripts.rb
 - lib/zabbix_manager/classes/server.rb
 - lib/zabbix_manager/classes/templates.rb
 - lib/zabbix_manager/classes/triggers.rb
-- lib/zabbix_manager/classes/usergroups.rb
-- lib/zabbix_manager/classes/usermacros.rb
+- lib/zabbix_manager/classes/user_groups.rb
+- lib/zabbix_manager/classes/user_macros.rb
 - lib/zabbix_manager/classes/users.rb
-- lib/zabbix_manager/classes/valuemaps.rb
+- lib/zabbix_manager/classes/value_maps.rb
 - lib/zabbix_manager/client.rb
+- lib/zabbix_manager/configuration.rb
 - lib/zabbix_manager/http_transport.rb
 - lib/zabbix_manager/log_sanitizer.rb
 - lib/zabbix_manager/monitoring.rb
+- lib/zabbix_manager/monitoring/device.rb
+- lib/zabbix_manager/monitoring/expressions.rb
+- lib/zabbix_manager/monitoring/line.rb
+- lib/zabbix_manager/monitoring/line_items.rb
+- lib/zabbix_manager/monitoring/line_lifecycle.rb
+- lib/zabbix_manager/monitoring/line_plan.rb
+- lib/zabbix_manager/monitoring/thresholds.rb
+- lib/zabbix_manager/monitoring/traffic_items.rb
+- lib/zabbix_manager/monitoring/validation.rb
+- lib/zabbix_manager/resource.rb
+- lib/zabbix_manager/traffic.rb
 - lib/zabbix_manager/version.rb
 - zabbix_manager.gemspec
 homepage: https://github.com/gatework/zabbix_manager/tree/master
@@ -300,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby client and monitoring workflows for the Zabbix 4.0 through 7.x API
 test_files: []