zabbixapi 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92de7e8f577d018cb8da54114638729fb7117d5
-  data.tar.gz: 5dc0590f4332ba0590cb07eed6c2cb1f07c73d38
+  metadata.gz: 487cf74b4af955baf4a18b789b90185235a789a1
+  data.tar.gz: d19ee4e5b3bf2e5f514795bc83a69cde75d8c29c
 SHA512:
-  metadata.gz: ef2229602eac1fac5257b9d32c2d45f079d163a989a3f25efa2ae80390ea3ffd840f6f8a637dcd73df593054480c21c3b7674b5c3f20b4300bd01a7ebf3f2f6f
-  data.tar.gz: 159e41fb0f8467456c808c0e4895e87aaf8f3ee0d0d462879815c568f8773ce3838be74234581eca655f466a234155c425a89d43b3018efa61e5f65c54476542
+  metadata.gz: bc2f217355f205c40eb991469834a45d84e7f89adf7f28a9b9233e64a085c06300fb13d49bb2c96064681ea3f44f986a84fa1952e86416b05b6547e1fcfd1480
+  data.tar.gz: acc66046eeb21fdccf0404d19c3eedef36bb31fdd49945e8eb3a6f7793e15c0f0d65f2c3128b9591af763b0157f9d0f29b1f06149d853c27798132a5899f9c51

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.1.0
+
+[PR #82](https://github.com/express42/zabbixapi/pull/82) Add logout method (Thanks @baurmatt)
+
+[PR #86](https://github.com/express42/zabbixapi/pull/86) Feature: add support for Discovery Rules (`drule` API) (Thanks @lehn-etracker)
+
 ## 4.0.0
 
 [PR #90](https://github.com/express42/zabbixapi/pull/90) Add 4.0 support (Thanks @svdasein)

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Express 42
+Copyright (c) 2015-2018 Express 42
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -59,7 +59,6 @@ dropped.
 ## Dependencies
 
 * net/http
-* net/https
 * json
 
 ## Contributing

data/lib/zabbixapi.rb

@@ -28,6 +28,7 @@ require 'zabbixapi/classes/usergroups'
 require 'zabbixapi/classes/usermacros'
 require 'zabbixapi/classes/users'
 require 'zabbixapi/classes/valuemaps'
+require 'zabbixapi/classes/drules'
 
 class ZabbixApi
   # @return [ZabbixApi::Client]
@@ -54,6 +55,12 @@ class ZabbixApi
     @client.api_request(:method => data[:method], :params => data[:params])
   end
 
+  # Invalidate current authentication token
+  # @return [Boolean]
+  def logout
+    @client.logout
+  end
+
   # Initializes a new ZabbixApi object
   #
   # @param options [Hash]
@@ -161,4 +168,9 @@ class ZabbixApi
   def valuemaps
     @valuemaps ||= ValueMaps.new(@client)
   end
+
+  # @return [ZabbixApi::Drules]
+  def drules
+    @drules ||= Drules.new(@client)
+  end
 end

data/lib/zabbixapi/classes/drules.rb

@@ -0,0 +1,55 @@
+class ZabbixApi
+  class Drules < Basic
+    # The method name used for interacting with Drules via Zabbix API
+    #
+    # @return [String]
+    def method_name
+      'drule'
+    end
+
+    # The id field name used for identifying specific Drule objects via Zabbix API
+    #
+    # @return [String]
+    def indentify
+      'name'
+    end
+
+    # The default options used when creating Drule objects via Zabbix API
+    #
+    # @return [Hash]
+    def default_options
+      {
+        name: nil,
+        iprange: nil,
+        delay: 3600,
+        status: 0,
+      }
+    end
+
+    # Get or Create Drule object using Zabbix API
+    #
+    # @param data [Hash] Needs to include name to properly identify Drule 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]))
+        id = create(data)
+      end
+      id
+    end
+
+    # Create or update Drule object using Zabbix API
+    #
+    # @param data [Hash] Needs to include name to properly identify Drules 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)
+      druleid = get_id(name: data[:name])
+      druleid ? update(data.merge(druleid: druleid)) : create(data)
+    end
+  end
+end

data/lib/zabbixapi/client.rb

@@ -32,6 +32,16 @@ class ZabbixApi
       )
     end
 
+    # Log out from the Zabbix Server
+    #
+    # @return [Boolean]
+    def logout
+      api_request(
+        :method => 'user.logout',
+        :params => []
+      )
+    end
+
     # Initializes a new Client object
     #
     # @param options [Hash]

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -73,6 +73,7 @@ files:
 - 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
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb