Merge pull request #102 from kevin-j-smith/master

.travis.yml

@@ -17,15 +17,14 @@ services:
   - postgresql
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
   - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
-  - jruby-9.1.6.0
+  - jruby-9.2.10.0
   - jruby-head
-  - rbx-2
+  - rbx-head
 
 dist: trusty
 
@@ -34,9 +33,9 @@ sudo: required
 bundler_args: --without development --retry=3 --jobs=3
 
 before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem update bundler
-  - gem install rspec
+  - gem install --no-document rubygems-update -v '<3' && update_rubygems
+  - gem update --no-document bundler
+  - gem install --no-document rspec
 
 before_script:
   - sudo sed -i "s,;date.timezone =,date.timezone = 'US/Eastern'," /etc/php5/apache2/php.ini
@@ -55,8 +54,8 @@ env:
 
 matrix:
   allow_failures:
+    - rvm: 2.7
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2
+    - rvm: rbx-head # Required rbx-head is not installed - installing
+                    # curl: (22) The requested URL returned error: 404 Not Found
   fast_finish: true
-

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
 

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.
 

lib/zabbixapi.rb

@@ -10,6 +10,7 @@
 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 @@ def configurations
     @configurations ||= Configurations.new(@client)
   end
 
+  # @return [ZabbixApi::Events]
+  def events
+    @events ||= Events.new(@client)
+  end
+
   # @return [ZabbixApi::Graphs]
   def graphs
     @graphs ||= Graphs.new(@client)

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

lib/zabbixapi/classes/items.rb

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

lib/zabbixapi/classes/server.rb

@@ -10,7 +10,7 @@ class Server
     # @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

lib/zabbixapi/classes/usergroups.rb

@@ -30,9 +30,9 @@ def indentify
     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 @@ def permissions(data)
 
     # 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 @@ def add_user(data)
     # @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

lib/zabbixapi/classes/users.rb

@@ -31,12 +31,14 @@ def indentify
     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 @@ def medias_helper(data, action)
     # @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 @@ def add_medias(data)
     # @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

lib/zabbixapi/client.rb

@@ -18,6 +18,7 @@ def id
     # @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 @@ def auth
       )
     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]
@@ -53,7 +61,8 @@ def initialize(options = {})
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
       unless api_version =~ %r{^4.[0|4]\.\d+$}
-        puts "[WARN] Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
+        message = "Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
+        raise ZabbixApi::ApiError.new(message)
       end
 
       @auth_hash = auth

lib/zabbixapi/version.rb

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