zabbix_manager 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2dd53cab35de67ecf4197410f9122102aaff9509c0860532fb751fb8d555d3f
-  data.tar.gz: 9c3ffb719aabcbfc0db37dfd1f0932cb9478d59e7c5b100493894d090b26a897
+  metadata.gz: 1eba65965b358ec8595a777c899aa54dc1835945d17ad4d42687a22ce25d620f
+  data.tar.gz: 68b13154bce3b7b7f1fcb568dc5e5472fd1b196f19d1a244fb25230e79f4a9ad
 SHA512:
-  metadata.gz: cfd62dce5eb71f75b04a2ffd6c115fa865185f29dd4a89b165beef09089be108c0d95e633457216e11d114e0b20cbd4e8cb5241c347adb78826a4f00047fe4c2
-  data.tar.gz: dbc6eb6f1788dfb8e07c0f6816cea0ec535ee1a04b379c189dc5920b1b7d895ab7eb9ac9c4344a33b752516ec1778c7938336f7de9a12efe6d1eb088b3fc5b27
+  metadata.gz: f0f0ea55235d315c9ce971e26047866a1c2a57b78a88520e98cfb2e051a75aa888a98dcc12d7e36f7fcfbad947270d99cf33192aceb3287bdb098ced135c021c
+  data.tar.gz: 948831dfc8a7f1013b4835829c171e50376b185b965ba599990c9fe574a73a2d15c982badea135a58b9ed0b31701898c65b2a990f9ba923b1ca690ca68f5442a

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

data/.idea/workspace.xml

@@ -4,10 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9f25f96c-828f-4aea-8886-dcbae369ba60" name="变更" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/zabbix_manager/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/zabbix_manager/version.rb" afterDir="false" />
-    </list>
+    <list default="true" id="9f25f96c-828f-4aea-8886-dcbae369ba60" name="变更" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -49,6 +46,7 @@
       <updated>1646727041577</updated>
       <workItem from="1646727043249" duration="3509000" />
       <workItem from="1646732978147" duration="8000" />
+      <workItem from="1646734414024" duration="13000" />
     </task>
     <servers />
   </component>

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
 
 Style/StringLiterals:
   Enabled: true

data/lib/zabbix_manager/basic/basic_alias.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Basic
     # Get Zabbix object data from API by id

data/lib/zabbix_manager/basic/basic_extend.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Basic
     # 新增 get_hostgroup_ids 方法，使用列表 flatten 功能拉平属组对象
     def get_hostgroup_ids(data)
       result = @client.api_request(
-        method: 'hostgroup.get',
+        method: "hostgroup.get",
         params: {
           output: "extend",
           filter: {
             name: [data].flatten
           }
         }
-      ).map { |item| { groupid: item['groupid'] } }
+      ).map { |item| { groupid: item["groupid"] } }
 
       # 检查是是否存在
       result.empty? ? nil : result.flatten
@@ -20,19 +22,19 @@ class ZabbixManager
     def get_or_create_hostgroups(data)
       [data].flatten.each do |item|
         # 是否存在设备属组，不存在则新建
-        begin
-          result = get_hostgroup_ids(item)
+
+        result = get_hostgroup_ids(item)
+        if result.nil?
           @client.api_request(
-            method: 'hostgroup.create',
+            method: "hostgroup.create",
             params: {
               name: item
             }
-          ) if result.nil?
-        rescue => e
-          ap e
+          )
         end
+      rescue StandardError => e
+        ap e
       end
     end
-
   end
 end

data/lib/zabbix_manager/basic/basic_func.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Basic
     # Log messages to stdout when debugging
@@ -26,12 +28,13 @@ class ZabbixManager
     # @param object [Array, Hash]
     # @return [Array, Hash]
     def symbolize_keys(object)
-      if object.is_a?(Array)
+      case object
+      when Array
         object.each_with_index do |val, index|
           object[index] = symbolize_keys(val)
         end
-      elsif object.is_a?(Hash)
-        object.keys.each do |key|
+      when Hash
+        object.each_key do |key|
           object[key.to_sym] = symbolize_keys(object.delete(key))
         end
       end
@@ -62,9 +65,10 @@ class ZabbixManager
       result = []
 
       array.each do |e|
-        if e.is_a?(Array)
+        case e
+        when Array
           result.push(normalize_array(e))
-        elsif e.is_a?(Hash)
+        when Hash
           result.push(normalize_hash(e))
         else
           result.push(e.to_s)

data/lib/zabbix_manager/basic/basic_init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Basic
     # Initializes a new Basic object with ZabbixManager Client
@@ -12,7 +14,7 @@ class ZabbixManager
     #
     # @raise [ManagerError] Basic object does not directly support method_name
     def method_name
-      raise ManagerError.new("Can't call method_name here")
+      raise ManagerError, "Can't call method_name here"
     end
 
     # Placeholder for inherited objects to provide default options
@@ -26,21 +28,21 @@ class ZabbixManager
     #
     # @return [String]
     def keys
-      key + 's'
+      "#{key}s"
     end
 
     # Returns the object's id field name (identify) based on method_name + id
     #
     # @return [String]
     def key
-      method_name + 'id'
+      "#{method_name}id"
     end
 
     # Placeholder for inherited objects to provide object-specific id field name
     #
     # @raise [ManagerError] Basic object does not directly support identify
     def identify
-      raise ManagerError.new("Can't call identify here")
+      raise ManagerError, "Can't call identify here"
     end
   end
 end

data/lib/zabbix_manager/basic/basic_logic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Basic
     # Create new Zabbix object using API (with defaults)
@@ -96,7 +98,7 @@ class ZabbixManager
           filter: {
             identify.to_sym => data[identify.to_sym]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
     end
@@ -131,7 +133,7 @@ class ZabbixManager
           filter: {
             key.to_sym => data[key.to_sym]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
     end
@@ -145,7 +147,7 @@ class ZabbixManager
       result = {}
       @client.api_request(
         method: "#{method_name}.get",
-        params: { output: 'extend' }
+        params: { output: "extend" }
       ).each do |item|
         result[item[identify]] = item[key]
       end
@@ -165,7 +167,7 @@ class ZabbixManager
       data = symbolize_keys(data) if data.key?(identify)
       # raise an error if identify name was not supplied
       name = data[identify.to_sym]
-      raise ManagerError.new("#{identify} not supplied in call to get_id") if name.nil?
+      raise ManagerError, "#{identify} not supplied in call to get_id" if name.nil?
 
       result = @client.api_request(
         method: "#{method_name}.get",
@@ -174,7 +176,7 @@ class ZabbixManager
           output: [key, identify]
         }
       )
-      id     = nil
+      id = nil
       result.each { |item| id = item[key].to_i if item[identify] == data[identify.to_sym] }
       id
     end

data/lib/zabbix_manager/classes/actions.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Actions < Basic
     # The method name used for interacting with Actions via Zabbix API
     #
     # @return [String]
     def method_name
-      'action'
+      "action"
     end
 
     # The id field name used for identifying specific Action objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # Get full/extended Action object data from API
@@ -29,11 +31,11 @@ class ZabbixManager
           filter: {
             identify.to_sym => data[identify.to_sym]
           },
-          output: 'extend',
+          output: "extend",
           selectOperations: "extend",
           selectRecoveryOperations: "extend",
           selectAcknowledgeOperations: "extend",
-          selectFilter: "extend",
+          selectFilter: "extend"
         }
       )
     end

data/lib/zabbix_manager/classes/applications.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Applications < Basic
     # The method name used for interacting with Applications via Zabbix API
     #
     # @return [String]
     def method_name
-      'application'
+      "application"
     end
 
     # The id field name used for identifying specific Application objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # Get or Create Application object using Zabbix API

data/lib/zabbix_manager/classes/configurations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Configurations < Basic
     # @return [Boolean]
@@ -9,14 +11,14 @@ class ZabbixManager
     #
     # @return [String]
     def method_name
-      'configuration'
+      "configuration"
     end
 
     # The id field name used for identifying specific Configuration objects via Zabbix API
     #
     # @return [String]
     def identify
-      'host'
+      "host"
     end
 
     # Export configuration data using Zabbix API
@@ -26,7 +28,7 @@ class ZabbixManager
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def export(data)
-      @client.api_request(method: 'configuration.export', params: data)
+      @client.api_request(method: "configuration.export", params: data)
     end
 
     # Import configuration data using Zabbix API
@@ -36,7 +38,7 @@ class ZabbixManager
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Hash]
     def import(data)
-      @client.api_request(method: 'configuration.import', params: data)
+      @client.api_request(method: "configuration.import", params: data)
     end
   end
 end

data/lib/zabbix_manager/classes/drules.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Drules < Basic
     # The method name used for interacting with Drules via Zabbix API
     #
     # @return [String]
     def method_name
-      'drule'
+      "drule"
     end
 
     # The id field name used for identifying specific Drule objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The default options used when creating Drule objects via Zabbix API
@@ -22,7 +24,7 @@ class ZabbixManager
         name: nil,
         iprange: nil,
         delay: 3600,
-        status: 0,
+        status: 0
       }
     end
 

data/lib/zabbix_manager/classes/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class BaseError < RuntimeError
     attr_accessor :response, :error, :error_message
@@ -9,11 +11,11 @@ class ZabbixManager
       set_error! if @response
     end
 
-  private
+    private
 
     def set_error!
-      @error = @response['error']
-      @error_message = "#{@error['message']}: #{@error['data']}"
+      @error = @response["error"]
+      @error_message = "#{@error["message"]}: #{@error["data"]}"
     rescue StandardError
       @error = nil
       @error_message = nil

data/lib/zabbix_manager/classes/events.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Events < Basic
     # The method name used for interacting with Events via Zabbix API
     #
     # @return [String]
     def method_name
-      'event'
+      "event"
     end
 
     # The id field name used for identifying specific Event objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
-
   end
 end

data/lib/zabbix_manager/classes/graphs.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Graphs < Basic
     # The method name used for interacting with Graphs via Zabbix API
     #
     # @return [String]
     def method_name
-      'graph'
+      "graph"
     end
 
     # The id field name used for identifying specific Graph objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # Get full/extended Graph data from Zabbix API
@@ -29,7 +31,7 @@ class ZabbixManager
           search: {
             identify.to_sym => data[identify.to_sym]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
     end
@@ -42,18 +44,18 @@ class ZabbixManager
     # @return [Array] Returns array of Graph ids
     def get_ids_by_host(data)
       result = @client.api_request(
-        method: 'graph.get',
+        method: "graph.get",
         params: {
           filter: {
             host: data[:host]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
 
       result.map do |graph|
-        num  = graph['graphid']
-        name = graph['name']
+        num  = graph["graphid"]
+        name = graph["name"]
         filter = data[:filter]
 
         num if filter.nil? || /#{filter}/ =~ name
@@ -68,10 +70,10 @@ class ZabbixManager
     # @return [Hash]
     def get_items(data)
       @client.api_request(
-        method: 'graphitem.get',
+        method: "graphitem.get",
         params: {
           graphids: [data],
-          output: 'extend'
+          output: "extend"
         }
       )
     end

data/lib/zabbix_manager/classes/hostgroups.rb

@@ -1,37 +1,39 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class HostGroups < Basic
     # The method name used for interacting with HostGroups via Zabbix API
     #
     # @return [String]
     def method_name
-      'hostgroup'
+      "hostgroup"
     end
 
     # The id field name used for identifying specific HostGroup objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The key field name used for HostGroup objects via Zabbix API
     #
     # @return [String]
     def key
-      'groupid'
+      "groupid"
     end
 
     # 新增 get_hostgroup_ids 方法，使用列表 flatten 功能拉平属组对象
     def get_hostgroup_ids(data)
       result = @client.api_request(
-        method: 'hostgroup.get',
+        method: "hostgroup.get",
         params: {
           output: "extend",
           filter: {
             name: [data].flatten
           }
         }
-      ).map { |item| { groupid: item['groupid'] } }
+      ).map { |item| { groupid: item["groupid"] } }
 
       # 检查是是否存在
       result.empty? ? nil : result.flatten
@@ -41,17 +43,17 @@ class ZabbixManager
     def get_or_create_hostgroups(data)
       # 是否存在设备属组，不存在则新建
       [data].flatten.each do |item|
-        begin
-          result = get_hostgroup_ids(item)
+        result = get_hostgroup_ids(item)
+        if result.nil?
           @client.api_request(
-            method: 'hostgroup.create',
+            method: "hostgroup.create",
             params: {
               name: item
             }
-          ) if result.nil?
-        rescue => e
-          ap e
+          )
         end
+      rescue StandardError => e
+        ap e
       end
     end
   end