zabbix-rails 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08d62e412a270dbcc25ff8c0fbed71b448217dfd461c0c14290d53b75aa155d
-  data.tar.gz: 9012f1824fee422931f7f464ccfd1bb567bc6c8f501cd7343ea406002073b4ff
+  metadata.gz: a69c9d81af95b28fc20c815ff323a31cf0dd1c29dd54aab6829a2224ab8c485e
+  data.tar.gz: 220e0328786170be774c8f835bab0ee15104fade5dd558ac840e47aed502fcd6
 SHA512:
-  metadata.gz: 9c1f62a5f09290006d51d2211061d89201303719f87836542d4d6e1af9e4e346cdece9d88cd91dc9f99c1c9ecc42408fb5c2ce868a7ecb585a19f83f8137ba24
-  data.tar.gz: ec142fb5c24d488157982a6a71c22475a67928a32ee1ebdc01a64682d5a9b5992c025a9b9f3945f16a3773307a146130b8735861600f2fb90bc24ec3d25b99ea
+  metadata.gz: e48aa2cc53f58fdec3b4dd97549a0e22b2dca70cc7806b635092dc2bd7df5697511f8cc370cf973e313c53e026da371288447cf6cccb1c9e5d13698cf20b7c20
+  data.tar.gz: 34519f575756027d787b1a8cd110cf4702840522e3bbfe701f5f30d8f859165d34607c9a352ab8a28f142141d03a439923ca76f750324750c60d7676e4b03073

data/lib/zabbix/connector.rb

@@ -1,7 +1,8 @@
+
 module Zabbix
-  module Connector
-    include ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
+  module Connector
     # 开发测试环境需要单独开启缓存功能：bin/rails dev:cache
     # 将鉴权后的 zabbix-rails 对象缓存到 Rails，减少不必要的认证动作加速执行
     # https://guides.rubyonrails.org/caching_with_rails.html

data/lib/zabbix/dns_monitor.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Zabbix
+  extend ActiveSupport::Concern
+
   module DnsMonitor
-    include ActiveSupport::Concern
+    include Zabbix::Connector
 
     # 生成 DNS 触发器表达式
     def dns_trigger_expression(name)

data/lib/zabbix/engine.rb

@@ -8,4 +8,4 @@ module Zabbix
       end
     end
   end
-end
+end

data/lib/zabbix/host_monitor.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Zabbix
+  extend ActiveSupport::Concern
+
   module HostMonitor
-    extend ActiveSupport::Concern
-    include ZabbixConnectConcern
+    include Zabbix::Connector
 
-    # 创建或更新 zabbix-rails 主机监控对象
+    # 创建或更新 HostMonitor主机监控对象
     def refresh_zabbix_host(item)
       if zabbix_connector.present? && (zabbix_connector.is_a? ZabbixManager)
         # 查询已关联的 hostid
@@ -41,5 +42,6 @@ module Zabbix
     rescue => e
       Rails.logger.warn("无法执行创建或更新监控主机: #{item.name} #{item.sn} #{e}")
     end
+
   end
 end

data/lib/zabbix/item_trigger.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Zabbix
+  extend ActiveSupport::Concern
+
   module ItemTrigger
-    include ActiveSupport::Concern
+    include Zabbix::Connector
 
     # 创建或新增触发器，返回触发器ID | 触发器的 DATA_STRUCTURE
     def refresh_trigger(data)

data/lib/zabbix/version.rb

@@ -1,3 +1,3 @@
 module Zabbix
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/lib/zabbix-rails.rb

@@ -9,7 +9,7 @@ require "zabbix/railtie"
 require "zabbix_manager"
 
 module Zabbix
-  include ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
   class << self
     attr_accessor :url, :user, :password, :debug

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2.3
+        version: '0'
 description: Description of Zabbix-rails.
 email:
 - careline@foxmail.com