zabbix_manager 5.0.5 → 5.0.8

data/lib/zabbix_manager/classes/hosts.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Hosts < Basic
     # The method name used for interacting with Hosts via Zabbix API
     #
     # @return [String]
     def method_name
-      'host'
+      "host"
     end
 
     # The id field name used for identifying specific Host objects via Zabbix API
     #
     # @return [String]
     def identify
-      'host'
+      "host"
     end
 
     # Dump Host object data by key from Zabbix API
@@ -23,12 +25,12 @@ class ZabbixManager
     def dump_by_id(data)
       log "[DEBUG] Call dump_by_id with parameters: #{data.inspect}"
       @client.api_request(
-        method: 'host.get',
+        method: "host.get",
         params: {
           filter: {
             key.to_sym => data[key.to_sym]
           },
-          output: 'extend',
+          output: "extend"
           # selectHosts: 'shorten'
         }
       )
@@ -39,23 +41,23 @@ class ZabbixManager
     # @return [Hash]
     def default_options
       {
-        host:           nil,
-        interfaces:     {
-          main:    1,
-          useip:   1,
-          type:    2,
-          ip:      nil,
-          dns:     "",
-          port:    161,
+        host: nil,
+        interfaces: {
+          main: 1,
+          useip: 1,
+          type: 2,
+          ip: nil,
+          dns: "",
+          port: 161,
           details: {
-            version:   2,
+            version: 2,
             community: "transsion"
           }
         },
-        status:         0,
-        available:      1,
-        groups:         [],
-        proxy_hostid:   nil,
+        status: 0,
+        available: 1,
+        groups: [],
+        proxy_hostid: nil,
         inventory_mode: 1
       }
     end
@@ -68,9 +70,9 @@ class ZabbixManager
     # @return [Boolean]
     def unlink_templates(data)
       result = @client.api_request(
-        method: 'host.massRemove',
+        method: "host.massRemove",
         params: {
-          hostids:   data[:hosts_id],
+          hostids: data[:hosts_id],
           templates: data[:templates_id]
         }
       )
@@ -120,19 +122,19 @@ class ZabbixManager
     # 测试数据
     def update_mojo
       data = {
-        name:           "SZX1-16-SW3111111111",
-        groups:         [
-                          {
-                            groupid: 22
-                          }
-                        ],
-        templates:      [
-                          {
-                            templateid: 10227
-                          }
-                        ],
+        name: "SZX1-16-SW3111111111",
+        groups: [
+          {
+            groupid: 22
+          }
+        ],
+        templates: [
+          {
+            templateid: 10_227
+          }
+        ],
         inventory_mode: 1,
-        hostid:         15951
+        hostid: 15_951
       }
 
       # 请求后端接口
@@ -142,7 +144,7 @@ class ZabbixManager
     # 根据主机名查询 hostid
     def get_host_id(name)
       result = @client.api_request(
-        method: 'host.get',
+        method: "host.get",
         params: {
           output: "extend",
           filter: {
@@ -158,7 +160,7 @@ class ZabbixManager
     # 根据可见名称查询 hostid
     def get_hostid_by_name(name)
       result = @client.api_request(
-        method: 'host.get',
+        method: "host.get",
         params: {
           output: "extend",
           filter: {
@@ -210,7 +212,7 @@ class ZabbixManager
         # 新增监控对象
         create data
       end
-    rescue => e
+    rescue StandardError => e
       puts "创建或新增主机 #{data[:host]} 异常，异常信息：#{e}"
       # raise NotImplementedError
     end

data/lib/zabbix_manager/classes/httptests.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class HttpTests < Basic
     # The method name used for interacting with HttpTests via Zabbix API
     #
     # @return [String]
     def method_name
-      'httptest'
+      "httptest"
     end
 
     # The id field name used for identifying specific HttpTest objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The default options used when creating HttpTest objects via Zabbix API

data/lib/zabbix_manager/classes/items.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Items < Basic
     # The method name used for interacting with Items via Zabbix API
     #
     # @return [String]
     def method_name
-      'item'
+      "item"
     end
 
     # The id field name used for identifying specific Item objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The default options used when creating Item objects via Zabbix API
@@ -26,31 +28,31 @@ class ZabbixManager
         history:               3600,
         status:                0,
         type:                  7,
-        snmp_community:        '',
-        snmp_oid:              '',
+        snmp_community:        "",
+        snmp_oid:              "",
         value_type:            3,
         data_type:             0,
-        trapper_hosts:         'localhost',
+        trapper_hosts:         "localhost",
         snmp_port:             161,
-        units:                 '',
+        units:                 "",
         multiplier:            0,
         delta:                 0,
-        snmpv3_securityname:   '',
+        snmpv3_securityname:   "",
         snmpv3_securitylevel:  0,
-        snmpv3_authpassphrase: '',
-        snmpv3_privpassphrase: '',
+        snmpv3_authpassphrase: "",
+        snmpv3_privpassphrase: "",
         formula:               0,
-        trends:                86400,
-        logtimefmt:            '',
+        trends:                86_400,
+        logtimefmt:            "",
         valuemapid:            0,
-        delay_flex:            '',
+        delay_flex:            "",
         authtype:              0,
-        username:              '',
-        password:              '',
-        publickey:             '',
-        privatekey:            '',
-        params:                '',
-        ipmi_sensor:           ''
+        username:              "",
+        password:              "",
+        publickey:             "",
+        privatekey:            "",
+        params:                "",
+        ipmi_sensor:           ""
       }
     end
 
@@ -83,21 +85,25 @@ class ZabbixManager
     # 根据设备名称和接口名字查询监控项 | 15809 | GigabitEthernet1/0/12
     def get_interface_items(hostid, name)
       # 自动剔除收尾空白字串
-      _name = name&.gsub(%r"[^\/0-9]", "")&.strip
+      _name = name&.gsub(%r{[^/0-9]}, "")&.strip
       iface = "#{_name}("
 
       # 模糊查询接口下所有监控项，同时过滤出特定的 snmp_oid
       result = @client.api_request(
-        method: 'item.get',
+        method: "item.get",
         params: {
           # output:  ["itemid", "name", "snmp_oid", "key_", "triggerids"],
-          output:  'extend',
+          output:  "extend",
           hostids: hostid,
           search:  {
             name: iface
-          },
+          }
         }
-      ).select { |item| item["snmp_oid"].match?(/1.3.6.1.2.1.31.1.1.1.(6|10)./) }
+      ).select {
+        |item| item["snmp_oid"].match?(/(1.3.6.1.2.1.31.1.1.1.(6|10|15)|1.3.6.1.2.1.2.2.1.8)./)
+      }.sort_by {
+        |item| item["key_"]
+      }
 
       # 检查是是否存在
       result.empty? ? nil : result
@@ -111,7 +117,7 @@ class ZabbixManager
 
       # 请求绑定 dns 监控项到特定的 hostid
       result = @client.api_request(
-        method: 'item.create',
+        method: "item.create",
         params: {
           hostid: hostid,
           name:   item_name,
@@ -124,21 +130,21 @@ class ZabbixManager
           delay:    "1m",
           history:  "90d",
           lifetime: "30d",
-          timeout:  "3s",
+          timeout:  "3s"
         }
       )
       p "成功创建 dns监控 #{dns_name}"
-    rescue
+    rescue StandardError
       p "创建 dns监控 #{dns_name} 异常"
     end
 
     # 查询某个监控项具体信息
     def get_item_info
       result = @client.api_request(
-        method: 'item.get',
+        method: "item.get",
         params: {
           output:  "extend",
-          hostids: "16914",
+          hostids: "16914"
         }
       )
     end

data/lib/zabbix_manager/classes/maintenance.rb

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

data/lib/zabbix_manager/classes/mediatypes.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Mediatypes < Basic
     # The method name used for interacting with MediaTypes via Zabbix API
     #
     # @return [String]
     def method_name
-      'mediatype'
+      "mediatype"
     end
 
     # The id field name used for identifying specific MediaType objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The default options used when creating MediaType objects via Zabbix API
@@ -19,16 +21,16 @@ class ZabbixManager
     # @return [Hash]
     def default_options
       {
-        name: '', # Name
-        description: '', # Description
+        name: "", # Name
+        description: "", # Description
         type: 0, # 0 - Email, 1 - External script, 2 - SMS, 3 - Jabber, 100 - EzTexting
-        smtp_server: '',
-        smtp_helo: '',
-        smtp_email: '', # Email address of Zabbix server
-        exec_path: '',  # Name of external script
-        gsm_modem: '',  # Serial device name of GSM modem
-        username: '', # Jabber user name used by Zabbix server
-        passwd: '' # Jabber password used by Zabbix server
+        smtp_server: "",
+        smtp_helo: "",
+        smtp_email: "", # Email address of Zabbix server
+        exec_path: "",  # Name of external script
+        gsm_modem: "",  # Serial device name of GSM modem
+        username: "", # Jabber user name used by Zabbix server
+        passwd: "" # Jabber password used by Zabbix server
       }
     end
 
@@ -78,12 +80,12 @@ 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, #{data} (#{method_name})") if name.nil?
+      raise ManagerError, "#{identify} not supplied in call to get_id, #{data} (#{method_name})" if name.nil?
 
       result = @client.api_request(
         method: "#{method_name}.get",
         params: {
-          filter: {name: name},
+          filter: { name: name },
           output: [key, identify]
         }
       )

data/lib/zabbix_manager/classes/problems.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Problems < Basic
     # The method name used for interacting with Hosts via Zabbix API
     #
     # @return [String]
     def method_name
-      'problem'
+      "problem"
     end
 
     # The id field name used for identifying specific Problem objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # The key field name used for Problem objects via Zabbix API
@@ -19,7 +21,7 @@ class ZabbixManager
     #
     # @return [String]
     def key
-      'problemid'
+      "problemid"
     end
 
     # Returns the object's plural id field name (identify) based on key
@@ -27,7 +29,7 @@ class ZabbixManager
     #
     # @return [String]
     def keys
-      'problemids'
+      "problemids"
     end
 
     # Dump Problem object data by key from Zabbix API
@@ -40,12 +42,12 @@ class ZabbixManager
       log "[DEBUG] Call dump_by_id with parameters: #{data.inspect}"
 
       @client.api_request(
-        method: 'problem.get',
+        method: "problem.get",
         params: {
           filter: {
             identify.to_sym => data[identify.to_sym]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
     end
@@ -64,27 +66,27 @@ class ZabbixManager
       @client.api_request(
         method: "#{method_name}.get",
         params: {
-          filter:                {
+          filter: {
             identify.to_sym => data[identify.to_sym]
           },
-          eventids:              data[:eventids] || nil,
-          groupids:              data[:groupids] || nil,
-          hostids:               data[:hostids] || nil,
-          objectids:             data[:objectids] || nil,
-          applicationids:        data[:applicationids] || nil,
-          tags:                  data[:tags] || nil,
-          time_from:             data[:time_from] || nil,
-          time_till:             data[:time_till] || nil,
-          eventid_from:          data[:eventid_from] || nil,
-          eventid_till:          data[:eventid_till] || nil,
-          recent:                data[:recent] || false,
-          sortfield:             data[:sortfield] || ['eventid'],
-          sortorder:             data[:sortorder] || 'DESC',
-          countOutput:           data[:countOutput] || nil,
-          output:                'extend',
-          selectAcknowledges:    'extend',
-          selectTags:            'extend',
-          selectSuppressionData: 'extend'
+          eventids: data[:eventids] || nil,
+          groupids: data[:groupids] || nil,
+          hostids: data[:hostids] || nil,
+          objectids: data[:objectids] || nil,
+          applicationids: data[:applicationids] || nil,
+          tags: data[:tags] || nil,
+          time_from: data[:time_from] || nil,
+          time_till: data[:time_till] || nil,
+          eventid_from: data[:eventid_from] || nil,
+          eventid_till: data[:eventid_till] || nil,
+          recent: data[:recent] || false,
+          sortfield: data[:sortfield] || ["eventid"],
+          sortorder: data[:sortorder] || "DESC",
+          countOutput: data[:countOutput] || nil,
+          output: "extend",
+          selectAcknowledges: "extend",
+          selectTags: "extend",
+          selectSuppressionData: "extend"
         }
       )
     end
@@ -118,16 +120,15 @@ class ZabbixManager
 
     def ack_event(eventids)
       # 请求后端
-      result = @client.api_request(
+      @client.api_request(
         method: "event.acknowledge",
         params: {
           eventids: eventids,
-          action:   2,
-          message:  "由 RUBY SCRIPT 自动关闭"
+          action: 2,
+          message: "由 RUBY SCRIPT 自动关闭"
         }
       )
       # 返回运行结果
-      result
     end
   end
-end
+end

data/lib/zabbix_manager/classes/proxies.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Proxies < Basic
     # The method name used for interacting with Proxies via Zabbix API
     #
     # @return [String]
     def method_name
-      'proxy'
+      "proxy"
     end
 
     # The id field name used for identifying specific Proxy objects via Zabbix API
     #
     # @return [String]
     def identify
-      'host'
+      "host"
     end
 
     # Delete Proxy object using Zabbix API
@@ -21,8 +23,8 @@ class ZabbixManager
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] The Proxy object id that was deleted
     def delete(data)
-      result = @client.api_request(method: 'proxy.delete', params: data)
-      result.empty? ? nil : result['proxyids'][0].to_i
+      result = @client.api_request(method: "proxy.delete", params: data)
+      result.empty? ? nil : result["proxyids"][0].to_i
     end
 
     # Check if a Proxy object is readable using Zabbix API
@@ -32,7 +34,7 @@ class ZabbixManager
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean] Returns true if the given proxies are readable
     def isreadable(data)
-      @client.api_request(method: 'proxy.isreadable', params: data)
+      @client.api_request(method: "proxy.isreadable", params: data)
     end
 
     # Check if a Proxy object is writable using Zabbix API
@@ -42,7 +44,7 @@ class ZabbixManager
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean] Returns true if the given proxies are writable
     def iswritable(data)
-      @client.api_request(method: 'proxy.iswritable', params: data)
+      @client.api_request(method: "proxy.iswritable", params: data)
     end
 
     # 新增代理服务器查询接口
@@ -52,7 +54,7 @@ class ZabbixManager
 
       # 请求后端接口，只支持单个代理节点
       result = @client.api_request(
-        method: 'proxy.get',
+        method: "proxy.get",
         params: {
           output: "extend",
           filter: {

data/lib/zabbix_manager/classes/roles.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 class ZabbixManager
   class Roles < Basic
     # The method name used for interacting with Role via Zabbix API
     #
     # @return [String]
     def method_name
-      'role'
+      "role"
     end
 
     # The key field name used for Role objects via Zabbix API
     #
     # @return [String]
     def key
-      'roleid'
+      "roleid"
     end
 
     # The id field name used for identifying specific Role objects via Zabbix API
     #
     # @return [String]
     def identify
-      'name'
+      "name"
     end
 
     # Set permissions for usergroup using Zabbix API
@@ -30,13 +32,13 @@ class ZabbixManager
     def rules(data)
       rules = data[:rules] || 2
       result = @client.api_request(
-        method: 'role.update',
+        method: "role.update",
         params: {
           roleid: data[:roleid],
           rules: data[:hostgroupids].map { |t| { permission: permission, id: t } }
         }
       )
-      result ? result['usrgrpids'][0].to_i : nil
+      result ? result["usrgrpids"][0].to_i : nil
     end
 
     # Add users to usergroup using Zabbix API
@@ -60,10 +62,10 @@ class ZabbixManager
       log "[DEBUG] Call dump_by_id with parameters: #{data.inspect}"
 
       @client.api_request(
-        method: 'role.get',
+        method: "role.get",
         params: {
-          output: 'extend',
-          selectRules: 'extend',
+          output: "extend",
+          selectRules: "extend",
           roleids: data[:id]
         }
       )
@@ -77,18 +79,18 @@ class ZabbixManager
     # @return [Array] Returns array of Graph ids
     def get_ids_by_name(data)
       result = @client.api_request(
-        method: 'role.get',
+        method: "role.get",
         params: {
           filter: {
             name: data[:name]
           },
-          output: 'extend'
+          output: "extend"
         }
       )
 
-      result.map do |rule|
-        rule['roleid']
-      end.compact
+      result.filter_map do |rule|
+        rule["roleid"]
+      end
     end
 
     # Update users in Userroles using Zabbix API
@@ -101,14 +103,14 @@ class ZabbixManager
       user_groups = data[:usrgrpids].map do |t|
         {
           usrgrpid: t,
-          userids: data[:userids],
+          userids: data[:userids]
         }
       end
       result = @client.api_request(
-        method: 'usergroup.update',
-        params: user_groups,
+        method: "usergroup.update",
+        params: user_groups
       )
-      result ? result['usrgrpids'][0].to_i : nil
+      result ? result["usrgrpids"][0].to_i : nil
     end
   end
 end