zabbixapi 4.1.2 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d40b3de910c34c57086f5cb96a4d849327b66eff0ed3c90013f81f911efffd5
-  data.tar.gz: 95ca03dc07172fb5d474992477e57847bf94925129316009b186bfc9ec44ecc6
+  metadata.gz: 58451fc1a06fa45c0ac63d0ec7d66c567455ae0eba7cc8a548cb223c8af3a987
+  data.tar.gz: 7574a95089d1a4c32bfb30273dfd731e726b2367e50edd849d8165e06e033868
 SHA512:
-  metadata.gz: 4c877eb09fce12d6dc5b4698f647a5c082d42ecf6a2a2ea08057c40cde7c37613eed77477e26a1ca88b08786485e69fecb61994f153e94adb69a7fd295823caf
-  data.tar.gz: b62ee57503a824904dda48b594ddb119a6977320dd0f46b549c251ccb6a97debb211a5ccd0d5c5457507b6d30fd54076bf516edd5423dedd0856ca3e3145eeb6
+  metadata.gz: 3d432eb203cfe6723dea2d47fbc4a0c064131e9e732e08f6c753e6ed567d29f83e307335ee52c670b4ab8fc4e22381dbee8c614957e710785816eaf5fad50857
+  data.tar.gz: 75cfa60403d32ab616e5caf6670c4b2a4bb3014606d6966a383a88e13e24284b49034fce287d0209a9e0637e53043b4235fe39ca70d194150c163924af32cd6f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 #CHANGELOG
 
+## 4.2.0
+[PR #102](https://github.com/express42/zabbixapi/pull/102) Add events get method method.  Fixed all testing failures. (Thanks @kevin-j-smith)
+
 ## 4.1.2
 [PR #99](https://github.com/express42/zabbixapi/pull/99) Patch addressing log error function not found
 

data/README.md

@@ -36,12 +36,10 @@ We support only two last versions of zabbix (4.0 and 4.2), so you should conside
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.0
-* Ruby 2.1
-* Ruby 2.2
-* Ruby 2.3
 * Ruby 2.4
-* JRuby 9.1.6.0
+* Ruby 2.5
+* Ruby 2.6
+* JRuby 9.2.10.0
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/zabbixapi.rb

@@ -10,6 +10,7 @@ require 'zabbixapi/classes/actions'
 require 'zabbixapi/classes/applications'
 require 'zabbixapi/classes/configurations'
 require 'zabbixapi/classes/errors'
+require 'zabbixapi/classes/events'
 require 'zabbixapi/classes/graphs'
 require 'zabbixapi/classes/hostgroups'
 require 'zabbixapi/classes/hosts'
@@ -84,6 +85,11 @@ class ZabbixApi
     @configurations ||= Configurations.new(@client)
   end
 
+  # @return [ZabbixApi::Events]
+  def events
+    @events ||= Events.new(@client)
+  end
+
   # @return [ZabbixApi::Graphs]
   def graphs
     @graphs ||= Graphs.new(@client)

data/lib/zabbixapi/classes/events.rb

@@ -0,0 +1,17 @@
+class ZabbixApi
+  class Events < Basic
+    # The method name used for interacting with Events via Zabbix API
+    #
+    # @return [String]
+    def method_name
+      'event'
+    end
+
+    # The id field name used for identifying specific Event objects via Zabbix API
+    #
+    # @return [String]
+    def indentify
+      'name'
+    end
+  end
+end

data/lib/zabbixapi/classes/items.rb

@@ -23,7 +23,7 @@ class ZabbixApi
         key_: nil,
         hostid: nil,
         delay: 60,
-        history: 60,
+        history: 3600,
         status: 0,
         type: 7,
         snmp_community: '',
@@ -40,7 +40,7 @@ class ZabbixApi
         snmpv3_authpassphrase: '',
         snmpv3_privpassphrase: '',
         formula: 0,
-        trends: 365,
+        trends: 86400,
         logtimefmt: '',
         valuemapid: 0,
         delay_flex: '',

data/lib/zabbixapi/classes/server.rb

@@ -10,7 +10,7 @@ class ZabbixApi
     # @return [String] Zabbix API version number
     def initialize(client)
       @client = client
-      @api_version = @client.api_request(method: 'apiinfo.version', params: {})
+      @version = @client.api_version()
     end
   end
 end

data/lib/zabbixapi/classes/usergroups.rb

@@ -30,9 +30,9 @@ class ZabbixApi
     def permissions(data)
       permission = data[:permission] || 2
       result = @client.api_request(
-        method: 'usergroup.massAdd',
+        method: 'usergroup.update',
         params: {
-          usrgrpids: [data[:usrgrpid]],
+          usrgrpid: data[:usrgrpid],
           rights: data[:hostgroupids].map { |t| { permission: permission, id: t } }
         }
       )
@@ -41,19 +41,13 @@ class ZabbixApi
 
     # Add users to usergroup using Zabbix API
     #
+    # @deprecated Zabbix has removed massAdd in favor of update.
     # @param data [Hash] Needs to include userids and usrgrpids to mass add users to groups
     # @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 (usergroup)
     def add_user(data)
-      result = @client.api_request(
-        method: 'usergroup.massAdd',
-        params: {
-          usrgrpids: data[:usrgrpids],
-          userids: data[:userids]
-        }
-      )
-      result ? result['usrgrpids'][0].to_i : nil
+      update_users(data)
     end
 
     # Update users in usergroups using Zabbix API
@@ -63,12 +57,15 @@ class ZabbixApi
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] Zabbix object id (usergroup)
     def update_users(data)
-      result = @client.api_request(
-        method: 'usergroup.massUpdate',
-        params: {
-          usrgrpids: data[:usrgrpids],
-          userids: data[:userids]
+      user_groups = data[:usrgrpids].map do |t|
+        {
+          usrgrpid: t,
+          userids: data[:userids],
         }
+      end
+      result = @client.api_request(
+        method: 'usergroup.update',
+        params: user_groups,
       )
       result ? result['usrgrpids'][0].to_i : nil
     end

data/lib/zabbixapi/classes/users.rb

@@ -31,12 +31,14 @@ class ZabbixApi
     def medias_helper(data, action)
       result = @client.api_request(
         method: "user.#{action}",
-        params: {
-          users: data[:userids].map { |t| { userid: t } },
-          medias: data[:media]
-        }
+        params: data[:userids].map do |t|
+          {
+            userid: t,
+            user_medias: data[:media],
+          }
+        end,
       )
-      result ? result['mediaids'][0].to_i : nil
+      result ? result['userids'][0].to_i : nil
     end
 
     # Add media to users using Zabbix API
@@ -46,7 +48,7 @@ class ZabbixApi
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] Zabbix object id (media)
     def add_medias(data)
-      medias_helper(data, 'addMedia')
+      medias_helper(data, 'update')
     end
 
     # Update media for users using Zabbix API
@@ -56,7 +58,7 @@ class ZabbixApi
     # @raise [HttpError] Error raised when HTTP status from Zabbix Server response is not a 200 OK.
     # @return [Integer] Zabbix object id (user)
     def update_medias(data)
-      medias_helper(data, 'updateMedia')
+      medias_helper(data, 'update')
     end
   end
 end

data/lib/zabbixapi/client.rb

@@ -18,6 +18,7 @@ class ZabbixApi
     # @return [String]
     def api_version
       @api_version ||= api_request(method: 'apiinfo.version', params: {})
+      @api_version
     end
 
     # Log in to the Zabbix Server and generate an auth token using the API
@@ -33,6 +34,13 @@ class ZabbixApi
       )
     end
 
+    # ZabbixApi::Basic.log does not like @client.options[:debug]
+    #
+    # @return [boolean]
+    def debug?
+      return ! @options || @options[:debug]
+    end
+
     # Initializes a new Client object
     #
     # @param options [Hash]
@@ -52,8 +60,9 @@ class ZabbixApi
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
-      unless api_version =~ %r{^4.[0|2]\.\d+$}
-        puts "[WARN] Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
+      unless api_version =~ %r{^4.[0|4]\.\d+$}
+        message = "Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
+        raise ZabbixApi::ApiError.new(message)
       end
 
       @auth_hash = auth

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = '4.1.2'.freeze
+  VERSION = '4.2.0'.freeze
 end

data/zabbixapi.gemspec

@@ -9,7 +9,7 @@ require 'zabbixapi/version'
 Gem::Specification.new do |spec|
   spec.add_dependency 'http', '~> 2.0'
   spec.add_dependency 'json', '~> 2.0'
-  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'bundler'
 
   spec.name        = 'zabbixapi'
   spec.version     = ZabbixApi::VERSION

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Vasiliev D.V.
 - Ivan Evtuhovich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -43,16 +43,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Allows you to work with zabbix api from ruby.
 email:
 - vadv.mkn@gmail.com
@@ -74,6 +74,7 @@ files:
 - lib/zabbixapi/classes/configurations.rb
 - lib/zabbixapi/classes/drules.rb
 - lib/zabbixapi/classes/errors.rb
+- lib/zabbixapi/classes/events.rb
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb
 - lib/zabbixapi/classes/hosts.rb
@@ -99,7 +100,7 @@ homepage: https://github.com/express42/zabbixapi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Simple and lightweight ruby module for working with the Zabbix API
 test_files: []