zabbix-rails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91a0b65f3d8c11a21c801e896756b8b33c2a3ac0cbcdb5aaadc51ff77347a3f
-  data.tar.gz: 0cb4b629c690749a26f01ff2d6c3dad7ecb1aa78b17882e38b119333de361803
+  metadata.gz: d477e8482d7b336bc91a086a5b17d4623e4e6ecc3cc6e9ef86fc523fa57c97cb
+  data.tar.gz: 20ca6fb13b28defc342218df40a2a69d1b87b6a898bced5239935158659f527f
 SHA512:
-  metadata.gz: dab95a7df10f9833babcbe70aea7077df0c3b57bdc4ac3479a643d4c7450e16ebb80e216390fcf35c3c8a0b7cbdc05706634e469c43b0871b714fda6b7483283
-  data.tar.gz: 357db5c2018f7edf22d3066712fd47159eefc8a272474cddf4c5a6ef0fa4ea7cc596db6ce775f5c1b3b585c2aae5306eadd9c319e1da4746bf457805e5f4bb29
+  metadata.gz: e0b5ad8ce0ca98cbde47f8d3c745c400644853e8bbc4ce4f8151991da97cd3ce92f4aab0a370674dae50b78f7dd0dc003d1d1f386410d4e82620a0b16a2290b1
+  data.tar.gz: 85a9134058479f03dd307caab468070c55d793a97efae018a0b919cca5f7de119ec97e2b6eddd623b923027e2a92f175ed6dfd85426b73ab37879c317a5d275a

data/README.md

@@ -1,13 +1,16 @@
 # Zabbix-Rails
+
 主要实现 zabbix_connector 对象缓存，加速 API 交互效率。 依赖 zabbix_manager 作为后端请求模块
 
 ## Usage
+
 ```
 1、include Zabbix::Connector 到模块或者类对象；
 2、调用 zabbix_connector 方法自动实现后端鉴权，当前前提是配置好 'zabbix_rails.rb in config/initializers'
-3、调用 Zabbix::HostMonitor 实现自动维护监控对象
-4、调用 Zabbix::ItemTrigger 实现自动维护触发器对象
+3、调用 Zabbix::HostMonitor 实现自动维护监控对象，需要自行实现 [Zabbix::DeleteMonitor] 的JOB 消息队列函数；
+4、调用 Zabbix::ItemTrigger 实现自动维护触发器对象，需要自行实现 [Zabbix::DeleteTrigger] 的JOB 消息队列函数；
 5、调用 Zabbix::Dns 实现自动维护 DNS 监控
+6、调用 Zabbix::Chart 实现自动登录 zabbix 下载 item 的监控快照图片，同时兼容 V5 和 V6 版本，下载路径在 app/assets/images/chart;
 ```
 
 ## Installation
@@ -32,13 +35,19 @@ $ gem install zabbix-rails
 
 add zabbix_rails.rb in config/initializers
 
+```ruby
+Zabbix.configure do |config|
+  config.url      = Rails.application.credentials.zabbix.url
+  config.user     = Rails.application.credentials.zabbix.username
+  config.password = Rails.application.credentials.zabbix.password
+  config.debug    = false
+end
 ```
-# Zabbix.configure do |config|
-# c.url      = Rails.application.credentials.zabbix.url
-# c.user     = Rails.application.credentials.zabbix.username
-# c.password = Rails.application.credentials.zabbix.password
-# c.debug    = false
-# end
+
+下载 zabbix item 图片范例：
+```ruby
+include Zabbix::Chart
+save_chart_graph 37932
 ```
 
 ## Contributing

data/lib/zabbix/chart.rb

@@ -41,7 +41,7 @@ module Zabbix
       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"]   = 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"
@@ -53,12 +53,12 @@ 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))
-      "/assets/chart/#{File.basename(filename)}"
     end
 
     # 保存图片
     def save_file(filename, content)
       directory_base = "app/assets/images/chart/"
+
       # 生成绝对路径地址
       FileUtils.mkdir_p("#{Rails.root}/#{directory_base}") unless Dir.exist?("#{Rails.root}/#{directory_base}")
       filename.prepend(directory_base)
@@ -67,6 +67,8 @@ module Zabbix
       File.open(filename, "wb") do |chart|
         chart.write(content)
       end
+
+      "#{Rails.root}/#{filename}"
     end
 
     # 生成随机名称

data/lib/zabbix/connector.rb

@@ -68,12 +68,13 @@ module Zabbix
       }
 
       # 请求认证
-      ret = conn.post "/index.php" do |r|
+      ret = conn.post("/index.php") do |r|
         r.headers["Host"] = host
         r.body            = data
       end
 
-      ret.headers["set-cookie"].presence || nil
+      # 此处需要特殊处理，否则 V5 版本无法正常加载缓存
+      ret.headers["set-cookie"]&.gsub(/ HttpOnly,?/, "").presence || nil
     end
   end
 end

data/lib/zabbix/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails