zabbix-rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35e9d3bc2ccbf034fa95b86940f7b9ce66b9d8fd3317ff98b3f002976f8b8e3
-  data.tar.gz: 802e68ec3f3284fbb86161fdfc5c426a34fba94469d35e1690ec8ff6427bea86
+  metadata.gz: e91a0b65f3d8c11a21c801e896756b8b33c2a3ac0cbcdb5aaadc51ff77347a3f
+  data.tar.gz: 0cb4b629c690749a26f01ff2d6c3dad7ecb1aa78b17882e38b119333de361803
 SHA512:
-  metadata.gz: 198fade3a060207b1c2e401640d796c1e1e6985bc21dbccba8c716f066874bdfe4f5302e33faf45bd1c74354597e70d8870872e54abc761cf58d24649c9ba1ee
-  data.tar.gz: 02e31303134e3afd75f87e5c409371e948f7db3d15401d21b519b248bde323ddc77d700b0e2d8d3e666768bccbdca88c3e5817e189bd8ea3ef62502f7fcdfb8f
+  metadata.gz: dab95a7df10f9833babcbe70aea7077df0c3b57bdc4ac3479a643d4c7450e16ebb80e216390fcf35c3c8a0b7cbdc05706634e469c43b0871b714fda6b7483283
+  data.tar.gz: 357db5c2018f7edf22d3066712fd47159eefc8a272474cddf4c5a6ef0fa4ea7cc596db6ce775f5c1b3b585c2aae5306eadd9c319e1da4746bf457805e5f4bb29

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 
 require "bundler/gem_tasks"

data/lib/zabbix/chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/concern"
 
 module Zabbix
@@ -35,9 +37,9 @@ module Zabbix
 
     # 请求后端返回图形
     def _item_chart(url = "/chart.php", data)
-      base_url = Config.url
+      base_url = Zabbix.url
       host     = URI(base_url).host
-      conn = Faraday::Connection.new(base_url)
+      conn     = Faraday::Connection.new(base_url)
       # 请求接口
       conn.get "#{url}" do |r|
         r.params.merge!(data)
@@ -51,13 +53,15 @@ module Zabbix
     def save_chart_graph(itemid, height = 400, width = 900, start_at = "now-6h", end_at = "now")
       filename = generate_name(itemid)
       save_file(filename, item_chart(itemid, height, width, start_at, end_at))
-      "chart/#{File.basename(filename)}"
+      "/assets/chart/#{File.basename(filename)}"
     end
 
     # 保存图片
     def save_file(filename, content)
+      directory_base = "app/assets/images/chart/"
       # 生成绝对路径地址
-      filename.prepend("app/assets/images/chart/")
+      FileUtils.mkdir_p("#{Rails.root}/#{directory_base}") unless Dir.exist?("#{Rails.root}/#{directory_base}")
+      filename.prepend(directory_base)
 
       # 存储数据
       File.open(filename, "wb") do |chart|
@@ -65,9 +69,9 @@ module Zabbix
       end
     end
 
+    # 生成随机名称
     def generate_name(itemid)
-      require "uuidtools"
-      "#{UUIDTools::UUID.timestamp_create}-#{itemid}.png"
+      "#{SecureRandom.hex(8)}-#{itemid}.png"
     end
   end
 end

data/lib/zabbix/connector.rb

@@ -11,9 +11,9 @@ module Zabbix
     # 将鉴权后的 zabbix-rails 对象缓存到 Rails，减少不必要的认证动作加速执行
     # https://guides.rubyonrails.org/caching_with_rails.html
     def zabbix_connector
-      Rails.cache.fetch("zabbix_connector", expires_in: 2.hours) do
+      Rails.cache.fetch("zabbix_connector", expires_in: 30.minutes) do
         Rails.logger.warn("Zabbix 正在请求 API 鉴权")
-        ZabbixManager.connect(url: Config.url, user: Config.user, password: Config.password, debug: Config.debug)
+        ZabbixManager.connect(url: Zabbix.url, user: Zabbix.user, password: Zabbix.password, debug: Zabbix.debug)
       rescue => e
         Rails.logger.warn("登录 ZABBIX 异常，请检查网络或登录凭证。原始报错信息: #{e}")
       end
@@ -21,7 +21,7 @@ module Zabbix
 
     # 获取 zabbix 登录凭证缓存
     def zabbix_token
-      Rails.cache.fetch("zabbix_token", expires_in: 1.hours) do
+      Rails.cache.fetch("zabbix_token", expires_in: 30.minutes) do
         Rails.logger.warn("正在请求 zabbix/index.php 登录认证")
         authenticate_with_cookie
       end
@@ -55,14 +55,14 @@ module Zabbix
     # 请求 zabbix 后端认证，返回 Cookie
     def authenticate_with_cookie
       # 初始化会话
-      base_url = Config.url
+      base_url = Zabbix.url
       host     = URI(base_url).host
       conn     = Faraday::Connection.new(base_url)
 
       # 登录权限凭证
       data = {
-        name:      Config.user,
-        password:  Config.password,
+        name:      Zabbix.user,
+        password:  Zabbix.password,
         autologin: 1,
         enter:     "Sign in",
       }

data/lib/zabbix/version.rb

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

data/lib/zabbix-rails.rb

@@ -2,12 +2,11 @@
 
 # 注意加载顺序
 require "zabbix/version"
-require "zabbix/config"
 require "zabbix/connector"
-require "zabbix/chart"
 require "zabbix/host_monitor"
 require "zabbix/item_trigger"
 require "zabbix/dns_monitor"
+require "zabbix/chart"
 
 # 加载外部依赖
 require "active_support/concern"
@@ -19,8 +18,8 @@ module Zabbix
   class << self
     attr_accessor :url, :user, :password, :debug
 
-    def configure(&block)
-      Config.configure(&block)
+    def config
+      yield self
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,7 +36,6 @@ files:
 - lib/tasks/zabbix_tasks.rake
 - lib/zabbix-rails.rb
 - lib/zabbix/chart.rb
-- lib/zabbix/config.rb
 - lib/zabbix/connector.rb
 - lib/zabbix/dns_monitor.rb
 - lib/zabbix/engine.rb

data/lib/zabbix/config.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Zabbix
-  class Config
-    class << self
-      attr_accessor :url, :user, :password, :debug
-
-      def configure
-        yield self
-      end
-    end
-  end
-end