zabbixapi 0.6.4 → 0.6.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTUwYjA2NzU4NDM0OGU0YzYyOTkxY2I1ZTM5OWJhOWUwOTIzMmY5ZQ==
-  data.tar.gz: !binary |-
-    NTdjNjMwYzMwOTM4OGYxMTFlM2VjMzI5YjlkZmQxNTA1M2QyNjYwZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGU3ZGZjNTAyOThmMTcxOGNiNDZmZjIwODYyMTBmNDczNDA3YTJhOTdlNjU5
-    OWIwNzNkMDM1ZDFjZmIyMzUwZGYxODRhMmEyNTIwNjliZDhjYWEzMmY4NWIy
-    MmQ2ZGZiZWY1NDk1MDQ4OWM5ODc3ZjM3NGEyMDZhOTdmMzA2NTA=
-  data.tar.gz: !binary |-
-    ODViOGRkYWM1OGRkZWFhOTg2NzFlNDQzYzdhNmI3ODE4MDBjMjI3ZGY4Mzdm
-    ZGFmYjE5ZjFkOTBhZWRmNzc5NTk4YWY4NWZhNzc5ZmY5ZDM2NTRhNjY3YzYy
-    MzllNDU1OGM3YWNjYTZjMzdkN2VhZjBmOTBhZjM0OTVhYjliM2Y=
+  metadata.gz: 635adc2b44f68bdca298f1fa7a72839901528f0e
+  data.tar.gz: f257c9c6f322b313de54fb9b4893ddc37f217488
+SHA512:
+  metadata.gz: 4e893b3fc1a1cee7cc81d9e44e2f1af92f4a5f96cf0f3f2a62d3cdb007bae119b7988078dace1818a6d73cf64087ba7b216c52905d838dbf61d5b586b40d3c5f
+  data.tar.gz: 3f1cc8fe7bfa1dc99d779c44d536fde3aa3e84dff2a666266f463c7b1f415e78f53ee75e6bcb0690f9690e5b4303b93e42c8a038b4f515e8d80b23f459e1cc72

data/README.md

@@ -314,6 +314,38 @@ zbx.users.add_medias(
 )
 ```
 
+### Create proxy (2.0 and later)
+#### Active proxy
+```ruby
+zbx.proxies.create(
+  :host => "Proxy 1",
+  :status => 5
+)
+```
+
+#### Passive Proxy
+```ruby
+zbx.proxies.create(
+  :host => "Passive proxy",
+  :status => 6,
+  :interfaces => [
+    :ip => "127.0.0.1",
+    :dns => "",
+    :useip => 1,
+    :port => 10051
+  ]
+)
+```
+
+### User and global macros
+```ruby
+zbx.usermacros.create(
+    :hostid => zbx.hosts.get_id( :host => "Zabbix server" ),
+    :macro => "{$ZZZZ}",
+    :value => 1.1.1.1
+)
+```
+
 ### Custom queries
 ```ruby
 zbx.query(

data/lib/zabbixapi/2.0/classes/hosts.rb

@@ -20,6 +20,7 @@ class ZabbixApi
         :status => 0,
         :available => 1,
         :groups => [],
+        :proxy_hostid => nil
       }
     end
 

data/lib/zabbixapi/2.0/classes/proxies.rb

@@ -0,0 +1,31 @@
+class ZabbixApi
+  class Proxies < Basic
+
+    def array_flag
+      true
+    end
+
+    def method_name
+      "proxy"
+    end
+
+    def indentify
+      "host"
+    end
+
+    def delete(data)
+      result = @client.api_request(:method => "proxy.delete", :params => data)
+      result.empty? ? nil : result['proxyids'][0].to_i
+    end
+
+    def isreadable(data)
+      result = @client.api_request(:method => "proxy.isreadable", :params => data)
+    end
+    
+    def iswritable(data)
+      result = @client.api_request(:method => "proxy.iswritable", :params => data)
+    end
+
+  end
+end
+

data/lib/zabbixapi/2.0/classes/usermacros.rb

@@ -0,0 +1,46 @@
+class ZabbixApi
+  class Usermacros < Basic
+    def array_flag
+      true
+    end
+
+    def indentify
+      "macro"
+    end
+
+    def method_name
+      "usermacro"
+    end
+
+    def create(data)
+      request(data, "usermacro.create", "hostmacroids")
+    end
+
+    def create_global(data)
+      request(data, "usermacro.createglobal", "globalmacroids")
+    end
+
+    def delete(data)
+      request(data, "usermacro.delete", "hostmacroids")
+    end
+
+    def delete_global(data)
+      request(data, "usermacro.deleteglobal", "globalmacroids")
+    end
+
+    def update
+      request(data, "usermacro.update", "hostmacroids")
+    end
+
+    def update_global
+      request(data, "usermacro.updateglobal", "globalmacroids")
+    end
+
+    private
+      def request(data, method, result_key)
+        result = @client.api_request(:method => method, :params => data)
+        result.empty? ? nil : result[result_key][0].to_i
+      end
+
+  end
+end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.6.4"
+  VERSION = "0.6.6"
 end

data/lib/zabbixapi.rb

@@ -69,6 +69,10 @@ class ZabbixApi
     @graphs ||= Graphs.new(@client)
   end
 
+  def proxies
+    @proxies ||= Proxies.new(@client)
+  end
+
   def screens
     @screens ||= Screens.new(@client)
   end  
@@ -77,6 +81,10 @@ class ZabbixApi
     @usergroups ||= Usergroups.new(@client)
   end
 
+  def usermacros
+    @usermacros ||= Usermacros.new(@client)
+  end
+
   def mediatypes
     @mediatypes ||= Mediatypes.new(@client)
   end

data/zabbixapi.gemspec

@@ -5,14 +5,14 @@ require 'zabbixapi/version'
 Gem::Specification.new do |s|
   s.name        = "zabbixapi"
   s.version     = ZabbixApi::VERSION
-  s.authors     = ["Vasiliev D.V."]
-  s.email       = %w(vadv.mkn@gmail.com)
-  s.homepage    = "https://github.com/vadv/zabbixapi"
+  s.authors     = ["Vasiliev D.V.", "Ivan Evtuhovich"]
+	s.email       = %w(vadv.mkn@gmail.com evtuhovich@gmail.com)
+  s.homepage    = "https://github.com/express42/zabbixapi"
   s.summary     = %q{Realization for Zabbix API.}
   s.description = %q{Allows you to work with zabbix api from ruby.}
   s.licenses    = %w(MIT)
   
-  s.add_dependency('json')
+	s.add_dependency('json', '~> 1.6', '>= 1.6.0')
 
   s.rubyforge_project = "zabbixapi"
 

metadata

@@ -1,32 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Vasiliev D.V.
+- Ivan Evtuhovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 description: Allows you to work with zabbix api from ruby.
 email:
 - vadv.mkn@gmail.com
+- evtuhovich@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -68,19 +76,21 @@ files:
 - lib/zabbixapi/2.0/classes/hosts.rb
 - lib/zabbixapi/2.0/classes/items.rb
 - lib/zabbixapi/2.0/classes/mediatypes.rb
+- lib/zabbixapi/2.0/classes/proxies.rb
 - lib/zabbixapi/2.0/classes/screens.rb
 - lib/zabbixapi/2.0/classes/server.rb
 - lib/zabbixapi/2.0/classes/templates.rb
 - lib/zabbixapi/2.0/classes/triggers.rb
 - lib/zabbixapi/2.0/classes/unusable.rb
 - lib/zabbixapi/2.0/classes/usergroups.rb
+- lib/zabbixapi/2.0/classes/usermacros.rb
 - lib/zabbixapi/2.0/classes/users.rb
 - lib/zabbixapi/client.rb
 - lib/zabbixapi/version.rb
 - spec/localhost.rb
 - spec/run.rb
 - zabbixapi.gemspec
-homepage: https://github.com/vadv/zabbixapi
+homepage: https://github.com/express42/zabbixapi
 licenses:
 - MIT
 metadata: {}
@@ -100,10 +110,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.
 test_files:
 - spec/localhost.rb
 - spec/run.rb
+has_rdoc: