zabbixapi_mgx 5.0.0.pre.alpha2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d7fc77bea22cad3d1e4361df6ecdbc59805444dfb1f06401a6e34ad8fc5847
-  data.tar.gz: ceaf91d06a00032cdab6f5b062b3d70b07991194f895f0ad8c759c51cbc8f49c
+  metadata.gz: ba3a08c63fe50a869bcac02554129a491824376447f9909cdf8fcd7ac1b94822
+  data.tar.gz: 16341e9118f66db1cca7eb2ee1e52a3906321578712ea857edf1628228a71e50
 SHA512:
-  metadata.gz: c7cc762145f69237e13c24d2422c41e076fcb4b509ad1f1396a134049b0efb5c1529afe6e7ef118195c457df696b805cce5694d6e4b5bf942312100601af7646
-  data.tar.gz: 13934b57ec4971c3d8d594cb58d45ee3698bd26ff18c6110da65f27f3142b869efd8d18c2e06e3762a44118befeddb85df66a327421021397f3b923cbf256ac6
+  metadata.gz: f338d70e0ae66c3ab623bf416c9a74da7173d34713e74ccfcca2a89bc171917f0b7560cfc2ac9b40614b523c5a6692275e8ed8d6bcc0c31b573ee60586cefabd
+  data.tar.gz: '0770190620835682928d1abc3f8a13d772b9df4b32db54b2c49c97b3960d7b3dfa1f766c2cad60a090d602009e1a666304b5fd77f6caeb32908f665b2cec7acf'

data/lib/zabbixapi/classes/actions.rb

@@ -32,7 +32,7 @@ class ZabbixApi
           output: 'extend',
           selectOperations: "extend",
           selectRecoveryOperations: "extend",
-          selectAcknowledgeOperations: "extend",
+          selectUpdateOperations: "extend",
           selectFilter: "extend",
         }
       )

data/lib/zabbixapi/classes/hosts.rb

@@ -30,7 +30,7 @@ class ZabbixApi
             key.to_sym => data[key.to_sym]
           },
           output: 'extend',
-          selectGroups: 'extend'
+          selectHostGroups: 'extend'
         }
       )
     end
@@ -45,7 +45,6 @@ class ZabbixApi
         status: 0,
         available: 1,
         groups: [],
-        proxy_hostid: nil
       }
     end
 

data/lib/zabbixapi/classes/problems.rb

@@ -71,7 +71,6 @@ class ZabbixApi
           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,

data/lib/zabbixapi/classes/proxies.rb

@@ -11,7 +11,7 @@ class ZabbixApi
     #
     # @return [String]
     def identify
-      'host'
+      'name'
     end
 
     # Delete Proxy object using Zabbix API

data/lib/zabbixapi/classes/templates.rb

@@ -50,9 +50,9 @@ class ZabbixApi
       templateid
     end
 
-    # Mass update Templates for Hosts using Zabbix API
+    # Mass update Templates using Zabbix API
     #
-    # @param data [Hash] Should include hosts_id array and templates_id array
+    # @param data [Hash] Should include templates_id array
     # @raise [ApiError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
@@ -60,16 +60,15 @@ class ZabbixApi
       result = @client.api_request(
         method: 'template.massUpdate',
         params: {
-          hosts: data[:hosts_id].map { |t| { hostid: t } },
           templates: data[:templates_id].map { |t| { templateid: t } }
         }
       )
       result.empty? ? false : true
     end
 
-    # Mass add Templates to Hosts using Zabbix API
+    # Mass add Templates using Zabbix API
     #
-    # @param data [Hash] Should include hosts_id array and templates_id array
+    # @param data [Hash] Should include templates_id array
     # @raise [ApiError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
@@ -77,16 +76,15 @@ class ZabbixApi
       result = @client.api_request(
         method: 'template.massAdd',
         params: {
-          hosts: data[:hosts_id].map { |t| { hostid: t } },
           templates: data[:templates_id].map { |t| { templateid: t } }
         }
       )
       result.empty? ? false : true
     end
 
-    # Mass remove Templates to Hosts using Zabbix API
+    # Mass remove Templates using Zabbix API
     #
-    # @param data [Hash] Should include hosts_id array and templates_id array
+    # @param data [Hash] Should include templates_id array
     # @raise [ApiError] Error returned when there is a problem with the Zabbix API call.
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Boolean]
@@ -94,7 +92,6 @@ class ZabbixApi
       result = @client.api_request(
         method: 'template.massRemove',
         params: {
-          hostids: data[:hosts_id],
           templateids: data[:templates_id],
           groupids: data[:group_id],
           force: 1

data/lib/zabbixapi/classes/usergroups.rb

@@ -33,7 +33,7 @@ class ZabbixApi
         method: 'usergroup.update',
         params: {
           usrgrpid: data[:usrgrpid],
-          rights: data[:hostgroupids].map { |t| { permission: permission, id: t } }
+          hostgroup_rights: data[:hostgroupids].map { |t| { permission: permission, id: t } }
         }
       )
       result ? result['usrgrpids'][0].to_i : nil
@@ -60,7 +60,7 @@ class ZabbixApi
       user_groups = data[:usrgrpids].map do |t|
         {
           usrgrpid: t,
-          userids: data[:userids],
+          users: data[:userids].map { |t| { userid: t } }
         }
       end
       result = @client.api_request(

data/lib/zabbixapi/classes/users.rb

@@ -25,7 +25,7 @@ class ZabbixApi
     #
     # @return [String]
     def identify
-      'alias'
+      'username'
     end
 
     def medias_helper(data, action)
@@ -34,7 +34,7 @@ class ZabbixApi
         params: data[:userids].map do |t|
           {
             userid: t,
-            user_medias: data[:media],
+            medias: data[:media],
           }
         end,
       )

data/lib/zabbixapi/client.rb

@@ -71,7 +71,7 @@ class ZabbixApi
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
-      unless api_version =~ %r{^5.[0|2]\.\d+$}
+      unless api_version =~ %r{^7.[0|2]\.\d+$}
         message = "Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
         if @options[:ignore_version]
           puts "[WARNING] #{message}" if @options[:debug]
@@ -95,8 +95,6 @@ class ZabbixApi
         jsonrpc: '2.0'
       }
 
-      message[:auth] = @auth_hash unless body[:method] == 'apiinfo.version' || body[:method] == 'user.login'
-
       JSON.generate(message)
     end
 
@@ -125,9 +123,9 @@ class ZabbixApi
       http.read_timeout = timeout
 
       request = Net::HTTP::Post.new(uri.request_uri)
-      request.basic_auth @options[:http_user], @options[:http_password] if @options[:http_user]
       request.add_field('Content-Type', 'application/json-rpc')
-      request.body = body
+      request.add_field('Authorization', "Bearer #{@auth_hash}") unless body[:method] == 'apiinfo.version' || body[:method] == 'user.login'
+      request.body = message_json(body)
 
       response = http.request(request)
 
@@ -161,7 +159,7 @@ class ZabbixApi
     # @param body [Hash]
     # @return [Hash, String]
     def api_request(body)
-      _request message_json(body)
+      _request body
     end
   end
 end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = '5.0.0-alpha2'.freeze
+  VERSION = '7.2.0'.freeze
 end

data/lib/zabbixapi.rb

@@ -7,7 +7,6 @@ require 'zabbixapi/basic/basic_init'
 require 'zabbixapi/basic/basic_logic'
 
 require 'zabbixapi/classes/actions'
-require 'zabbixapi/classes/applications'
 require 'zabbixapi/classes/configurations'
 require 'zabbixapi/classes/errors'
 require 'zabbixapi/classes/events'
@@ -77,11 +76,6 @@ class ZabbixApi
     @actions ||= Actions.new(@client)
   end
 
-  # @return [ZabbixApi::Applications]
-  def applications
-    @applications ||= Applications.new(@client)
-  end
-
   # @return [ZabbixApi::Configurations]
   def configurations
     @configurations ||= Configurations.new(@client)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi_mgx
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.alpha2
+  version: 7.2.0
 platform: ruby
 authors:
 - Vasiliev D.V.
 - Ivan Evtuhovich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -70,7 +70,6 @@ files:
 - lib/zabbixapi/basic/basic_init.rb
 - lib/zabbixapi/basic/basic_logic.rb
 - lib/zabbixapi/classes/actions.rb
-- lib/zabbixapi/classes/applications.rb
 - lib/zabbixapi/classes/configurations.rb
 - lib/zabbixapi/classes/drules.rb
 - lib/zabbixapi/classes/errors.rb
@@ -102,7 +101,7 @@ homepage: https://github.com/express42/zabbixapi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,12 +112,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Simple and lightweight ruby module for working with the Zabbix API
 test_files: []

data/lib/zabbixapi/classes/applications.rb

@@ -1,43 +0,0 @@
-class ZabbixApi
-  class Applications < Basic
-    # The method name used for interacting with Applications via Zabbix API
-    #
-    # @return [String]
-    def method_name
-      'application'
-    end
-
-    # The id field name used for identifying specific Application objects via Zabbix API
-    #
-    # @return [String]
-    def identify
-      'name'
-    end
-
-    # Get or Create Application object using Zabbix API
-    #
-    # @param data [Hash] Needs to include name and hostid to properly identify Applications via Zabbix API
-    # @raise [ApiError] Error returned when there is a problem with the Zabbix API call.
-    # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
-    def get_or_create(data)
-      log "[DEBUG] Call get_or_create with parameters: #{data.inspect}"
-
-      unless (id = get_id(name: data[:name], hostid: data[:hostid]))
-        id = create(data)
-      end
-      id
-    end
-
-    # Create or update Application object using Zabbix API
-    #
-    # @param data [Hash] Needs to include name and hostid to properly identify Applications via Zabbix API
-    # @raise [ApiError] Error returned when there is a problem with the Zabbix API call.
-    # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
-    # @return [Integer] Zabbix object id
-    def create_or_update(data)
-      applicationid = get_id(name: data[:name], hostid: data[:hostid])
-      applicationid ? update(data.merge(applicationid: applicationid)) : create(data)
-    end
-  end
-end