zabbix-rails 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473ef7cc7bbe32ffacd45ff386a02bdd239f6986a6cac0b5ce46197ad6f9d48c
-  data.tar.gz: 53283376f84df42a8d2801177ef66d7d4af06fda72d0614e74af7ae0f935937c
+  metadata.gz: a69c9d81af95b28fc20c815ff323a31cf0dd1c29dd54aab6829a2224ab8c485e
+  data.tar.gz: 220e0328786170be774c8f835bab0ee15104fade5dd558ac840e47aed502fcd6
 SHA512:
-  metadata.gz: 8829c2d957801e949914a38b5028341e78c0e8e6a67811658eef126b9aaf44fb4d79daad85ebdd507d86b72fb9c6a894dcd62bfcb69f588bc883c0d209d2efe2
-  data.tar.gz: 56139e405343d7541c0d01af8d963322554b9716fccf6dbc59f62739fad2972061eb170e9c23f389c0823839d9c7605e65d41d0b8b30bfbd2aba1ccf8d3b207e
+  metadata.gz: e48aa2cc53f58fdec3b4dd97549a0e22b2dca70cc7806b635092dc2bd7df5697511f8cc370cf973e313c53e026da371288447cf6cccb1c9e5d13698cf20b7c20
+  data.tar.gz: 34519f575756027d787b1a8cd110cf4702840522e3bbfe701f5f30d8f859165d34607c9a352ab8a28f142141d03a439923ca76f750324750c60d7676e4b03073

data/lib/zabbix/connector.rb

@@ -1,10 +1,8 @@
 
-require "active_support/concern"
-
 module Zabbix
-  module Connector
-    extend 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,48 +1,46 @@
 # frozen_string_literal: true
 
 module Zabbix
+  extend ActiveSupport::Concern
+
   module HostMonitor
-    extend ActiveSupport::Concern
-    include ZabbixConnectConcern
+    include Zabbix::Connector
 
-    class << self
-      # 创建或更新 zabbix-rails 主机监控对象
-      def refresh_zabbix_host(item)
-        if zabbix_connector.present? && (zabbix_connector.is_a? ZabbixManager)
-          # 查询已关联的 hostid
-          hostid = item[:hostid]
+    # 创建或更新 HostMonitor主机监控对象
+    def refresh_zabbix_host(item)
+      if zabbix_connector.present? && (zabbix_connector.is_a? ZabbixManager)
+        # 查询已关联的 hostid
+        hostid = item[:hostid]
 
-          # 封装数据之前确保设备属组已经存在
-          search_id = zabbix_connector.hosts.get_id(host: item.sn)
-          # 构建 zabbix-rails 监控对象数据结构，创建或者更新数据
-          if hostid.present?
-            if search_id.blank?
-              Rails.logger.warn("监控主机信息发生变化，正在创建监控对象: #{item}.inspect")
-              Zabbix::DeleteMonitor.perform_now(item.sn)
-              zabbix_connector.hosts.create_or_update(item.host_params)
-            elsif hostid != search_id
-              Rails.logger.warn("ZABBIX已有监控项，正在刷新数据 #{hostid} - #{search_id}")
-              search_id
-            else
-              Rails.logger.warn("正在更新监控对象: #{item.sn} - #{item.name}")
-              zabbix_connector.hosts.create_or_update(item.host_params)
-            end
+        # 封装数据之前确保设备属组已经存在
+        search_id = zabbix_connector.hosts.get_id(host: item.sn)
+        # 构建 zabbix-rails 监控对象数据结构，创建或者更新数据
+        if hostid.present?
+          if search_id.blank?
+            Rails.logger.warn("监控主机信息发生变化，正在创建监控对象: #{item}.inspect")
+            Zabbix::DeleteMonitor.perform_now(item.sn)
+            zabbix_connector.hosts.create_or_update(item.host_params)
+          elsif hostid != search_id
+            Rails.logger.warn("ZABBIX已有监控项，正在刷新数据 #{hostid} - #{search_id}")
+            search_id
           else
-            Rails.logger.warn("正在新增监控对象: #{item.sn} - #{item.name}")
+            Rails.logger.warn("正在更新监控对象: #{item.sn} - #{item.name}")
             zabbix_connector.hosts.create_or_update(item.host_params)
           end
-
-          # 返回监控对象的 host_id
-          Rails.logger.warn("成功执行创建或更新监控主机: #{item.name} #{item.sn}")
-          zabbix_connector.hosts.get_id(host: item.sn).presence || nil
         else
-          Rails.logger.warn("未获取 ZABBIX_MGMT 对象，无法执行创建或更新监控主机: #{item.name} #{item.sn}")
-          nil
+          Rails.logger.warn("正在新增监控对象: #{item.sn} - #{item.name}")
+          zabbix_connector.hosts.create_or_update(item.host_params)
         end
-      rescue => e
-        Rails.logger.warn("无法执行创建或更新监控主机: #{item.name} #{item.sn} #{e}")
-      end
 
+        # 返回监控对象的 host_id
+        Rails.logger.warn("成功执行创建或更新监控主机: #{item.name} #{item.sn}")
+        zabbix_connector.hosts.get_id(host: item.sn).presence || nil
+      else
+        Rails.logger.warn("未获取 ZABBIX_MGMT 对象，无法执行创建或更新监控主机: #{item.name} #{item.sn}")
+        nil
+      end
+    rescue => e
+      Rails.logger.warn("无法执行创建或更新监控主机: #{item.name} #{item.sn} #{e}")
     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.3"
+  VERSION = "0.1.4"
 end

data/lib/zabbix-rails.rb

@@ -4,7 +4,6 @@ require "zabbix/host_monitor"
 require "zabbix/item_trigger"
 require "zabbix/dns_monitor"
 require "zabbix/railtie"
-require "active_support/concern"
 
 # 加载外部依赖
 require "zabbix_manager"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  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