zabbixapi 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8238184f0f09f3d6c538181126166da072a5169e
-  data.tar.gz: 6d4cadbadda8ccaffb3d99aec2234ed26135b727
+  metadata.gz: 4a430b3b9e7367023a5a75e19414e842eb791a3c
+  data.tar.gz: 0f78b7cfbbecbb96223ed5e5fc43fc6babc63c05
 SHA512:
-  metadata.gz: 8ddd92123ebe7bb0164340f8ff08beee81fdfe759b796a43b59c02053884bca9f70308069a6ec00f992fb6c5a2bd08254cefdafe450b1a4dec1a3eb6c377a64b
-  data.tar.gz: bbbe5b33e8da8c79c4cc68537dc327cdf905431baece04a3e4d0c2740ef70ea3de72de68cdfbda0297a243e8b0e7bfecefac93ea90a8b7f9f7ebc045794ef883
+  metadata.gz: 2fa71a223935015b12a3c319bc649a4e6a5ee12c676305f18a25de690cc0feb0e1da86bb31b716dae402f4637a61d0afa80feb9c2ed30fc791c7260c373b4870
+  data.tar.gz: e23d53427667a09bf898a5e6c5b17acd59fa5d77df155e0a480045abb4a565c5c1000ca4e21dc1562b5e081cda412477ac7139ea5986d53f35dea4c05f7e6a55

data/.travis.yml

@@ -1,14 +1,24 @@
 language:
   - ruby
+addons:
+  postgresql: "9.4"
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
 before_script:
-  - wget -qO - http://obs.express42.com/project_root:/zabbix2.4/precise/Release.key | sudo apt-key add -
-  - echo "deb http://obs.express42.com/project_root:/zabbix2.4/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list
+  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3
+  - wget -qO - http://repo.zabbix.com/zabbix-official-repo.key | sudo apt-key add -
+  - echo "deb http://repo.zabbix.com/zabbix/2.4/ubuntu/ precise main" | sudo tee /etc/apt/sources.list.d/zabbix.list
   - sudo apt-get update
   - sudo apt-get install libiodbc2
-  - sudo apt-get install zabbix-server-pgsql zabbix-frontend-php
+  - sudo apt-get install postgresql
+  - sudo apt-get install zabbix-frontend-php
+  - sudo useradd -r zabbix
+  - sudo apt-get install zabbix-server-pgsql
+  - sudo apt-get install php5-pgsql
+  - sudo service apache2 restart
+  - 'echo -e "local   all   all trust\nhost all all 127.0.0.1/32 trust\nhost all all ::1/128 trust" | sudo tee /etc/postgresql/9.4/main/pg_hba.conf'
+  - sudo pg_ctlcluster 9.4 main reload
   - echo "$(curl -fsSL https://gist.githubusercontent.com/evtuhovich/9544441/raw/d661863063b76cc8e2599bc44d8595b1f86ece38/zabbix)" | sudo tee /etc/zabbix/web/zabbix.conf.php
 script: "ZABBIX_HOST_URL=http://localhost/zabbix/api_jsonrpc.php bundle exec rspec spec/*"

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 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
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -8,10 +8,10 @@ Simple and lightweight ruby module for work with zabbix api
 * 1.8.2 (api version 1.2) /zabbixapi 0.6.x [branch zabbix1.8](https://github.com/express42/zabbixapi/tree/zabbix1.8)
 * 1.8.9 (api version 1.3) /zabbixapi 0.6.x [branch zabbix1.8](https://github.com/express42/zabbixapi/tree/zabbix1.8)
 * 2.0.x (api version 1.4 -> 2.0.10) /zabbixapi 2.0.x [branch zabbix2.0](https://github.com/express42/zabbixapi/tree/zabbix2.0)
-* 2.2.x (api version 2.2.x) /zabbixapi 2.2.x [master or branch zabbix2.2](https://github.com/express42/zabbixapi/tree/master)
-* 2.4.x (api version 2.2.x) /zabbixapi 2.4.x [branch zabbix2.4](https://github.com/express42/zabbixapi/tree/zabbix2.4)
+* 2.2.x (api version 2.2.x) /zabbixapi 2.2.x [branch zabbix2.2](https://github.com/express42/zabbixapi/tree/zabbix2.2)
+* 2.4.x (api version 2.2.x) /zabbixapi 2.4.x [master or branch zabbix2.4](https://github.com/express42/zabbixapi/)
 
-Because Zabbix 2.2 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
+Because Zabbix 2.4 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
 
 ## Version policy
 
@@ -24,7 +24,7 @@ Zabbixapi has next version policy:
 The PATCH (third digit) version of zabbixapi should not correspond to PATCH version of zabbix, for example
 zabbixapi-2.0.x should works with all version of zabbix 2.0.y
 
-We support only three last versions of zabbix (2.0, 2.2 and 2.4), so you should consider zabbixapi 0.6.x depricated.
+We support only two last versions of zabbix (2.2 and 2.4), so you should consider zabbixapi 0.6.x and 2.0.x depricated.
 
 ## Installation
 ```
@@ -98,11 +98,11 @@ zbx.items.create_or_update(
 ### Update Item
 ```ruby
 zbx.items.update(
-  :itemid => zbx.items.get_id(:description => "item"),
+  :itemid => zbx.items.get_id(:name => "item"),
   :status => 0
 )
 #You can check item:
-puts zbx.items.get_full_data(:description => "item")
+puts zbx.items.get_full_data(:name => "item")
 ```
 
 ### Create host
@@ -157,7 +157,7 @@ zbx.hosts.delete zbx.hosts.get_id(:host => "hostname")
 ### Create graph
 ```ruby
 gitems = {
-  :itemid => zbx.items.get_id(:description => "item"),
+  :itemid => zbx.items.get_id(:name => "item"),
   :calc_fnc => "2",
   :type => "0",
   :periods_cnt => "5"
@@ -175,12 +175,12 @@ zbx.graphs.create(
 ### Update graph
 ```ruby
 zbx.graphs.update(
-  :graphid => zbx.graphs.get_id( :name => "graph"),
+  :graphid => zbx.graphs.get_id(:name => "graph"),
   :ymax_type => 1
 )
 #Also you can use:
 gitems = {
-  :itemid => zbx.items.get_id(:description => item),
+  :itemid => zbx.items.get_id(:name => "item"),
   :calc_fnc => "3",
   :type => "0",
   :periods_cnt => "5"
@@ -238,7 +238,21 @@ zbx.triggers.create(
   :templateid => 0,
   :type => 0
  )
-````
+```
+
+### Get trigger with certain filter
+```ruby
+triggers = zbx.query(
+  :method => "trigger.get",
+  :params => {
+    :filter => {
+      :url => ""
+    },
+    :templated => true,
+    :output => "extend"
+  }
+)
+```
 
 ### Create user
 ```ruby
@@ -320,6 +334,22 @@ zbx.users.add_medias(
 )
 ```
 
+### Update media ###
+```ruby
+zbx.users.update_medias(
+  :userids => [zbx.users.get_id(:alias => "user")],
+  :media => [
+    {
+      :mediatypeid => zbx.mediatypes.get_id(:description => "mediatype"),
+      :sendto => "test@test",
+      :active => 0,
+      :period => "1-7,00:00-24:00", # 1-7 days and 00:00-24:00 hours
+      :severity => "56"
+    }
+  ]
+)
+```
+
 ### Create proxy
 #### Active proxy
 ```ruby

data/lib/zabbixapi/basic/basic_func.rb

@@ -25,7 +25,7 @@ class ZabbixApi
       result.each do |key, value|
         case value
           when Array
-            result.delete(key)
+            result[key] = normalize_array(value)
           else
             result[key] = value.to_s
         end
@@ -33,6 +33,20 @@ class ZabbixApi
       result
     end
 
+    def normalize_array(array)
+      result = []
+      array.each do |e|
+        case e
+          when Array
+            result << normalize_array(e)
+          when Hash
+            result << normalize_hash(e)
+          else
+            result << e.to_s
+        end
+      end
+    end
+
     def parse_keys(data)
       case data
       when Hash

data/lib/zabbixapi/classes/hosts.rb

@@ -9,6 +9,21 @@ class ZabbixApi
       "host"
     end
 
+    def dump_by_id(data)
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
+
+      @client.api_request(
+        :method => "host.get",
+        :params => {
+          :filter => {
+            key.to_sym => data[key.to_sym]
+          },
+          :output => "extend",
+          :selectGroups => "shorten"
+        }
+      )
+    end
+
     def default_options
       {
         :host => nil,

data/lib/zabbixapi/classes/templates.rb

@@ -56,7 +56,7 @@ class ZabbixApi
     #   - True or False
     def mass_update(data)
       result = @client.api_request(
-        :method => "template.massAdd", 
+        :method => "template.massUpdate", 
         :params => {
           :hosts => data[:hosts_id].map { |t| {:hostid => t} },
           :templates => data[:templates_id].map { |t| {:templateid => t} }

data/lib/zabbixapi/classes/users.rb

@@ -28,5 +28,16 @@ class ZabbixApi
       result ? result['mediaids'][0].to_i : nil
     end
 
+    def update_medias(data)
+      result = @client.api_request(
+        :method => "user.updateMedia",
+        :params => {
+          :users => data[:userids].map { |t| {:userid => t} },
+          :medias => data[:media]
+        }
+      )
+      result ? result['userids'][0].to_i : nil
+    end
+
   end
 end

data/lib/zabbixapi/client.rb

@@ -47,7 +47,7 @@ class ZabbixApi
         :jsonrpc => '2.0'
       }
 
-      message[:auth] = @auth_hash unless body[:method] == 'apiinfo.version'
+      message[:auth] = @auth_hash unless (body[:method] == 'apiinfo.version' or body[:method] == 'user.login')
 
       JSON.generate(message)
     end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/spec/host.rb

@@ -124,6 +124,18 @@ describe 'host' do
           :status => 0
         ).should eq @hostid
       end
+
+      it "should update groups" do
+        @hostgroupid2 = zbx.hostgroups.create(:name => gen_name('hostgroup'))
+
+        zbx.hosts.update(
+            :hostid  =>  @hostid,
+            :groups => [ :groupid => @hostgroupid2]
+        ).should eq @hostid
+
+        expect(zbx.hosts.dump_by_id(:hostid => @hostid).first['groups'].first["groupid"]).to eq @hostgroupid2.to_s
+
+      end
     end
 
     describe 'delete' do

data/spec/user.rb

@@ -16,6 +16,16 @@ describe 'user' do
     )
   end
 
+  def media
+    {
+      :mediatypeid => @mediatypeid,
+      :sendto => "test@test",
+      :active => 0,
+      :period => "1-7,00:00-24:00",
+      :severity => "56"
+    }
+  end
+
   context 'when not exists' do
     describe 'create' do
       it "should return integer id" do
@@ -77,19 +87,25 @@ describe 'user' do
       it "should return integer media id" do
         zbx.users.add_medias(
           :userids => [@userid],
-          :media => [
-            {
-              :mediatypeid => @mediatypeid,
-              :sendto => "test@test",
-              :active => 0,
-              :period => "1-7,00:00-24:00",
-              :severity => "56"
-            }
-          ]
+          :media => [media]
         ).should be_kind_of(Integer)
       end
     end
 
+    describe 'update_medias' do
+      it "should return the user id" do
+        # Call twice to ensure update_medias first successfully creates the media, then updates it
+        2.times do
+          returned_userid = zbx.users.update_medias(
+            :userids => [@userid],
+            :media => [media]
+          )
+
+          returned_userid.should eq @userid
+        end
+      end
+    end
+
     describe 'delete' do
       it "should return id" do
         zbx.users.delete(@userid).should eq @userid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-05-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: 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: 1.6.0
 description: Allows you to work with zabbix api from ruby.
@@ -39,11 +39,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - lib/zabbixapi.rb
@@ -97,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.