zabbix-rails 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72e0a2099b3dd87de6d9a38ec3514bc2e8f6fa7720804a202457a278af39987
-  data.tar.gz: d92f35f0c3497663edc9f50f5a6fbf4815bde298fb50fd2eb2921ffa367077ed
+  metadata.gz: a35e9d3bc2ccbf034fa95b86940f7b9ce66b9d8fd3317ff98b3f002976f8b8e3
+  data.tar.gz: 802e68ec3f3284fbb86161fdfc5c426a34fba94469d35e1690ec8ff6427bea86
 SHA512:
-  metadata.gz: 239955a4196412900aad1f05e4b455274355960d3643ef1fc6572f16b16b158f7ec7b856aa069046c857774c284eaf7ef9d2b6a8f60e9727b2a4bbef1dd674c9
-  data.tar.gz: 6d3b8303de360e70c3c590faa7ed39b3b22fab9a198fd552dbe150ebf5a4a4eec090110c8b199db4c16409d54ffdbd7d143aebb4d1e372ae671435e4621b856e
+  metadata.gz: 198fade3a060207b1c2e401640d796c1e1e6985bc21dbccba8c716f066874bdfe4f5302e33faf45bd1c74354597e70d8870872e54abc761cf58d24649c9ba1ee
+  data.tar.gz: 02e31303134e3afd75f87e5c409371e948f7db3d15401d21b519b248bde323ddc77d700b0e2d8d3e666768bccbdca88c3e5817e189bd8ea3ef62502f7fcdfb8f

data/lib/zabbix/chart.rb

@@ -1,9 +1,10 @@
 require "active_support/concern"
 
 module Zabbix
-  extend ActiveSupport::Concern
-
   module Chart
+    extend ActiveSupport::Concern
+    include Zabbix::Connector
+
     # 请求生成 graph_chart 对象
     def graph_chart(graphid, height = 400, width = 900, start_at = "now-6h", end_at = "now")
       # 构造数据结构
@@ -34,10 +35,13 @@ module Zabbix
 
     # 请求后端返回图形
     def _item_chart(url = "/chart.php", data)
+      base_url = Config.url
+      host     = URI(base_url).host
+      conn = Faraday::Connection.new(base_url)
       # 请求接口
-      @conn.get "#{url}" do |r|
+      conn.get "#{url}" do |r|
         r.params.merge!(data)
-        r.headers["Host"]   = Config.url.gsub!(%r{http(s)?://}, "")
+        r.headers["Host"]   = host
         r.headers["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
         r.headers["Cookie"] = zabbix_token
       end.body

data/lib/zabbix/connector.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
+require "faraday"
 
 module Zabbix
-  extend ::ActiveSupport::Concern
-
   module Connector
+    extend ::ActiveSupport::Concern
+
     # 开发测试环境需要单独开启缓存功能：bin/rails dev:cache
     # 将鉴权后的 zabbix-rails 对象缓存到 Rails，减少不必要的认证动作加速执行
     # https://guides.rubyonrails.org/caching_with_rails.html
@@ -20,7 +21,7 @@ module Zabbix
 
     # 获取 zabbix 登录凭证缓存
     def zabbix_token
-      Rails.cache.fetch("zabbix_token", expires_in: 2.hours) do
+      Rails.cache.fetch("zabbix_token", expires_in: 1.hours) do
         Rails.logger.warn("正在请求 zabbix/index.php 登录认证")
         authenticate_with_cookie
       end
@@ -50,28 +51,29 @@ module Zabbix
     rescue => e
       Rails.logger.warn("调用 delete_trigger_monitor 接口异常，原始报错信息: #{e}")
     end
-  end
 
-  # 请求 zabbix 后端认证，返回 Cookie
-  def authenticate_with_cookie
-    # 初始化会话
-    base_url = Config.url
-    @conn    = Faraday::Connection.new(base_url)
+    # 请求 zabbix 后端认证，返回 Cookie
+    def authenticate_with_cookie
+      # 初始化会话
+      base_url = Config.url
+      host     = URI(base_url).host
+      conn     = Faraday::Connection.new(base_url)
 
-    # 登录权限凭证
-    data = {
-      name:      Config.user,
-      password:  Config.password,
-      autologin: 1,
-      enter:     "Sign in",
-    }
+      # 登录权限凭证
+      data = {
+        name:      Config.user,
+        password:  Config.password,
+        autologin: 1,
+        enter:     "Sign in",
+      }
 
-    # 请求认证
-    ret = @conn.post "/index.php" do |r|
-      r.headers["Host"] = base_url.gsub!(%r{http(s)?://}, "")
-      r.body            = data
-    end
+      # 请求认证
+      ret = conn.post "/index.php" do |r|
+        r.headers["Host"] = host
+        r.body            = data
+      end
 
-    ret.headers["set-cookie"].presence || nil
+      ret.headers["set-cookie"].presence || nil
+    end
   end
 end

data/lib/zabbix/dns_monitor.rb

@@ -3,9 +3,9 @@
 require "active_support/concern"
 
 module Zabbix
-  extend ::ActiveSupport::Concern
-
   module DnsMonitor
+    extend ::ActiveSupport::Concern
+
     include Zabbix::Connector
 
     # 生成 DNS 触发器表达式

data/lib/zabbix/host_monitor.rb

@@ -3,9 +3,9 @@
 require "active_support/concern"
 
 module Zabbix
-  extend ::ActiveSupport::Concern
-
   module HostMonitor
+    extend ::ActiveSupport::Concern
+
     include Zabbix::Connector
 
     # 创建或更新 HostMonitor主机监控对象

data/lib/zabbix/item_trigger.rb

@@ -3,9 +3,9 @@
 require "active_support/concern"
 
 module Zabbix
-  extend ::ActiveSupport::Concern
-
   module ItemTrigger
+    extend ::ActiveSupport::Concern
+
     include Zabbix::Connector
 
     # 创建或新增触发器，返回触发器ID | 触发器的 DATA_STRUCTURE

data/lib/zabbix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zabbix
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/zabbix-rails.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+# 注意加载顺序
 require "zabbix/version"
 require "zabbix/config"
 require "zabbix/connector"
+require "zabbix/chart"
 require "zabbix/host_monitor"
 require "zabbix/item_trigger"
 require "zabbix/dns_monitor"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - WENWU.YAN