zabbixapi 2.4.8 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9993377c6f344fef920fc248798eec2d010ba7ec
-  data.tar.gz: 96bb61c40517a55efd1f0ca1c2dde18c7d24677b
+  metadata.gz: 3b0c4d39286a5204648a76628cc643fb5155ed4a
+  data.tar.gz: a8076c8cd8f418d0dd40828ac430cd7409285f54
 SHA512:
-  metadata.gz: 482de14774541ede7972c80dd4b082539412f5b7bfa08ccf9b2fedcc066b415319e6226665c691f4688417b2b1647256af08751c7d70ec8c59c50932ae558f46
-  data.tar.gz: 246494db24bc2cc0527459d6874f2054e58259910f9f21db23375b82ea064c3aeef882993a9e68ae4e901fa725fa3d5e2aab7c2ad4b0aa380fbd7a254958850f
+  metadata.gz: 9ceb26cc5e2ddff7674a0f5beefe99bcdf91639eb280d39862daf110d652b05aa40433ec77c8c709d37ffb19153f27529140f54bcad60ce885369bbbd9b761e0
+  data.tar.gz: 1628507b889ce7cb58b72218fb3205f41e219276a0195669f73146408b000c5037d1729ff1687e085dc20efdafa9b7140dc5e1f15586df2ee2e4b72079c50b61

data/.travis.yml

@@ -1,7 +1,17 @@
 language:
   - ruby
 addons:
-  postgresql: "9.5"
+  postgresql: '9.5'
+  apt:
+    sources:
+      - sourceline: 'deb http://repo.zabbix.com/zabbix/3.0/ubuntu/ trusty main'
+        key_url: 'http://repo.zabbix.com/zabbix-official-repo.key'
+    packages:
+      - php5-pgsql
+      - zabbix-frontend-php
+      - zabbix-server-pgsql
+services:
+  - postgresql
 rvm:
   - 1.9.3
   - 2.0
@@ -11,26 +21,10 @@ dist: trusty
 sudo: required
 
 before_script:
-  - sudo apt-get purge postgresql-9.1 postgresql-9.2 postgresql-9.3 postgresql-9.4 -y
-    #  - wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-    #  - echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | sudo tee /etc/apt/sources.list.d/postgresql.list
-  - wget -qO - http://repo.zabbix.com/zabbix-official-repo.key | sudo apt-key add -
-  - echo "deb http://repo.zabbix.com/zabbix/3.0/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/zabbix.list
-  - sudo apt-get update
-  - sudo dpkg-reconfigure locales
-  - sudo apt-get install curl -y
-  - sudo apt-get install apache2 -y
-  - sudo apt-get install libiodbc2 -y
-  - sudo apt-get install zabbix-frontend-php -y
-  - sudo useradd -r zabbix
-  - sudo apt-get install zabbix-server-pgsql -y
-  - sudo apt-get install php5-pgsql -y
   - sudo sed -i "s,;date.timezone =,date.timezone = 'US/Eastern'," /etc/php5/apache2/php.ini
-  - 'echo -e "local all postgres trust\nlocal   all   all trust\nhost all all 127.0.0.1/32 trust\nhost all all ::1/128 trust" | sudo tee /etc/postgresql/9.5/main/pg_hba.conf'
-  - sudo /etc/init.d/postgresql restart
-  - sudo pg_ctlcluster 9.5 main reload
-  - sudo -u postgres createdb zabbix
-  - sudo -u postgres createuser -a -d -E zabbix
+  - psql -c 'create database zabbix;' -U postgres
+  - psql -c 'create user zabbix;' -U postgres
+  - psql -c 'grant all privileges on database zabbix to zabbix;' -U postgres
   - zcat /usr/share/doc/zabbix-server-pgsql/create.sql.gz | LC_ALL=C psql -U zabbix
   - echo "$(curl -fsSL https://gist.githubusercontent.com/evtuhovich/9544441/raw/d661863063b76cc8e2599bc44d8595b1f86ece38/zabbix)" | sudo tee /etc/zabbix/web/zabbix.conf.php
   - sudo service apache2 restart

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.4.9
+
+[PR #55](https://github.com/express42/zabbixapi/pull/55) Add 3.2.x support (Thanx @jrbeilke)
+
+[PR #54](https://github.com/express42/zabbixapi/pull/54) Add web scenarios support (Thanx @jrbeilke)
+
+
 ## 2.4.7
 
 [PR #45](https://github.com/express42/zabbixapi/pull/45) Add support for zabbix 3.0.x (Thanx @wandenberg)

data/Gemfile

@@ -1,5 +1,5 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem "rspec"
 gem "rake"
-gem "json"
+gem "json"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    json (1.6.1)
+    json (1.8.3)
     rake (0.9.2.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)

data/README.md

@@ -11,6 +11,7 @@ Simple and lightweight ruby module for work with zabbix api
 * 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](https://github.com/express42/zabbixapi/)
 * 3.0.x (api version 3.0.x) /zabbixapi 2.4.x [master](https://github.com/express42/zabbixapi/)
+* 3.2.x (api version 3.2.x) /zabbixapi 2.4.x [master](https://github.com/express42/zabbixapi/)
 
 Because Zabbix 3.0 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
 
@@ -257,7 +258,17 @@ zbx.triggers.create(
   :priority => 5,
   :status     => 0,
   :templateid => 0,
-  :type => 0
+  :type => 0,
+  :tags => [
+    {
+      :tag => "process",
+      :value => "aaa"
+    },
+    {
+      :tag => "error",
+      :value => ""
+    }
+  ]
  )
 ```
 
@@ -275,6 +286,110 @@ triggers = zbx.query(
 )
 ```
 
+### Create Web Scenario (httptest)
+```ruby
+zbx.httptests.create(
+  :name => "web scenario",
+  :hostid => zbx.templates.get_id(:host => "template"),
+  :applicationid => zbx.applications.get_id(:name => "application"),
+  :steps => [
+    {
+      :name => "step",
+      :url => "http://localhost/zabbix/",
+      :status_codes => 200,
+      :no => 1
+    }
+  ]
+)
+# or use (lib merge json):
+zbx.httptests.create_or_update(
+  :name => "web scenario",
+  :hostid => zbx.templates.get_id(:host => "template"),
+  :applicationid => zbx.applications.get_id(:name => "application"),
+  :steps => [
+    {
+      :name => "step",
+      :url => "http://localhost/zabbix/",
+      :status_codes => 200,
+      :no => 1
+    },
+    {
+      :name => "step 2",
+      :url => "http://localhost/zabbix/index.php",
+      :status_codes => 200,
+      :no => 2
+    }
+  ]
+)
+```
+
+### Update Web Scenario (httptest)
+```ruby
+zbx.httptests.update(
+  :httptestid => zbx.httptests.get_id(:name => "web scenario"),
+  :status => 0
+)
+#You can check web scenario:
+puts zbx.httptests.get_full_data(:name => "web scenario")
+
+### Create action based on trigger
+```ruby
+zbx.actions.create(
+  :name => "trigger action",
+  :eventsource => '0',                    # event source is a triggerid
+  :status => '0',                         # action is enabled
+  :esc_period => '120',                   # how long each step should take
+  :def_shortdata => "Email header",
+  :def_longdata => "Email content",
+  :maintenance_mode => '1',
+  :filter => {
+      :evaltype => '1',                   # perform 'and' between the conditions
+      :conditions => [
+          {
+              :conditiontype => '3',      # trigger name
+              :operator => '2',           # like
+              :value => 'pattern'         # the pattern
+          },
+          {
+              :conditiontype => '4',      # trigger severity
+              :operator => '5',           # >=
+              :value => '3'               # average
+          }
+      ]
+  },
+  :operations => [
+      {
+          :operationtype => '0',              # send message
+          :opmessage_grp => [                 # who the message will be sent to
+              {
+                  :usrgrpid => '2'
+              }
+          ],
+          :opmessage => {
+              :default_msg => '0',            # use default message
+              :mediatypeid =>  '1'            # email id
+          }
+      }
+  ],
+  :recovery_operations => [
+      {
+          :operationtype => '11',             # send recovery message
+          :opmessage_grp => [                 # who the message will be sent to
+              {
+                  :usrgrpid => '2'
+              }
+          ],
+          :opmessage => {
+              :default_msg => '0',            # use default message
+              :mediatypeid =>  '1'            # email id
+          }
+      }
+  ]
+)
+# In Zabbix 3.2 and higher actions now have a maintenance_mode property which pauses notifications during host maintenance
+# A separate action condition for Maintenance status = not in “maintenance” is no longer needed
+```
+
 ### Create user
 ```ruby
 zbx.users.create(

data/lib/zabbixapi.rb

@@ -12,6 +12,7 @@ require "zabbixapi/classes/graphs"
 require "zabbixapi/classes/hostgroups"
 require "zabbixapi/classes/maintenance"
 require "zabbixapi/classes/hosts"
+require "zabbixapi/classes/httptests"
 require "zabbixapi/classes/items"
 require "zabbixapi/classes/mediatypes"
 require "zabbixapi/classes/proxies"
@@ -62,6 +63,10 @@ class ZabbixApi
     @hosts ||= Hosts.new(@client)
   end
 
+  def httptests
+    @httptests ||= HttpTests.new(@client)
+  end
+
   def applications
     @applications ||= Applications.new(@client)
   end

data/lib/zabbixapi/classes/httptests.rb

@@ -0,0 +1,25 @@
+class ZabbixApi
+  class HttpTests < Basic
+
+    def method_name
+      "httptest"
+    end
+
+    def indentify
+      "name"
+    end
+
+    def default_options
+      {
+        :hostid => nil,
+        :name => nil,
+        :steps => []
+      }
+    end
+
+    def create_or_update(data)
+      httptestid = get_id(:name => data[:name])
+      httptestid ? update(data.merge(:httptestid => httptestid)) : create(data)
+    end
+  end
+end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.8"
+  VERSION = "2.4.9"
 end

data/spec/action.rb

@@ -13,6 +13,7 @@ describe 'action' do
         :esc_period => '120',                   # how long each step should take
         :def_shortdata => "Email header",
         :def_longdata => "Email content",
+        :maintenance_mode => '1',
         :filter => {
             :evaltype => '1',                   # perform 'and' between the conditions
             :conditions => [
@@ -21,11 +22,6 @@ describe 'action' do
                     :operator => '2',           # like
                     :value => 'pattern'         # the pattern
                 },
-                {
-                    :conditiontype => '5',      # trigger value
-                    :operator => '0',           # equal
-                    :value => '1'               # 'on'
-                },
                 {
                     :conditiontype => '4',      # trigger severity
                     :operator => '5',           # >=
@@ -46,6 +42,20 @@ describe 'action' do
                     :mediatypeid =>  '1'            # email id
                 }
             }
+        ],
+        :recovery_operations => [
+            {
+                :operationtype => '11',             # send recovery message
+                :opmessage_grp => [                 # who the message will be sent to
+                    {
+                        :usrgrpid => @usergroupid
+                    }
+                ],
+                :opmessage => {
+                    :default_msg => '0',            # use default message
+                    :mediatypeid =>  '1'            # email id
+                }
+            }
         ]
     }
   end

data/spec/httptest.rb

@@ -0,0 +1,136 @@
+#encoding: utf-8
+
+require 'spec_helper'
+
+describe 'httptest' do
+  before :all do
+    @hostgroup = gen_name 'hostgroup'
+    @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
+    @template = gen_name 'template'
+    @templateid = zbx.templates.create(
+      :host => @template,
+      :groups => [:groupid => @hostgroupid]
+    )
+  end
+
+  context 'when name not exists' do
+    before do
+      @httptest_name = gen_name 'httptest_name'
+      @step_name = gen_name 'step_name'
+    end
+
+    describe 'create' do
+      it "should return integer id" do
+        httptestid = zbx.httptests.create(
+          :name => @httptest_name,
+          :hostid => @templateid,
+          :steps => [
+            {
+              :name => @step_name,
+              :url => "http://localhost/zabbix/",
+              :status_codes => 200,
+              :no => 1
+            }
+          ]
+        )
+        expect(httptestid).to be_kind_of(Integer)
+      end
+    end
+
+    describe 'get_id' do
+      it "should return nil" do
+        expect(zbx.httptests.get_id(:name => @httptest_name)).to be_kind_of(NilClass)
+        expect(zbx.httptests.get_id('name' => @httptest_name)).to be_kind_of(NilClass)
+      end
+    end
+  end
+ 
+  context 'when name exists' do
+    before :all do
+      @httptest_name = gen_name 'httptest_name'
+      @step_name = gen_name 'step_name'
+      @httptestid = zbx.httptests.create(
+        :name => @httptest_name,
+        :hostid => @templateid,
+        :steps => [
+          {
+            :name => @step_name,
+            :url => "http://localhost/zabbix/",
+            :status_codes => 200,
+            :no => 1
+          }
+        ]
+      )
+    end
+
+    describe 'get_or_create' do
+      it "should return id of httptest" do
+        expect(zbx.httptests.get_or_create(
+          :name => @httptest_name,
+          :hostid => @templateid,
+          :steps => [
+            {
+              :name => @step_name,
+              :url => "http://localhost/zabbix/",
+              :status_codes => 200,
+              :no => 1
+            }
+          ]
+        )).to eq @httptestid
+      end
+    end
+
+    describe 'get_full_data' do
+      it "should contain created httptest" do
+        expect(zbx.httptests.get_full_data(:name => @httptest_name)[0]).to include("name" => @httptest_name)
+      end
+    end
+
+    describe 'get_id' do
+      it "should return id of httptest" do
+        expect(zbx.httptests.get_id(:name => @httptest_name)).to eq @httptestid
+        expect(zbx.httptests.get_id('name' => @httptest_name)).to eq @httptestid
+      end
+    end
+
+    describe 'create_or_update' do
+      it "should return id of updated httptest" do
+        expect(zbx.httptests.create_or_update(
+          :name => @httptest_name,
+          :hostid => @templateid,
+          :steps => [
+            {
+              :name => @step_name,
+              :url => "http://localhost/zabbix/",
+              :status_codes => 200,
+              :no => 1
+            }
+          ]
+        )).to eq @httptestid
+      end
+    end
+
+    describe 'update' do
+      it "should return id" do
+        expect(zbx.httptests.update(
+          :httptestid => @httptestid,
+          :status => 0,
+          :steps => [
+            {
+              :name => @step_name,
+              :url => "http://localhost/zabbix/",
+              :status_codes => 200,
+              :no => 1
+            }
+          ]
+        )).to eq @httptestid
+      end
+    end
+
+    describe 'delete' do
+      it "HTTPTEST: Delete" do
+        expect(zbx.httptests.delete( @httptestid )).to eq @httptestid
+      end
+    end
+  end
+end

data/spec/trigger.rb

@@ -38,8 +38,18 @@ describe "trigger" do
           :expression => "{#{@template}:#{@proc}.last(0)}<1",
           :comments => "Bla-bla is faulty (disaster)",
           :priority => 5,
-          :status     => 0,
-          :type => 0
+          :status => 0,
+          :type => 0,
+          :tags => [
+            {
+              :tag => "proc",
+              :value => "#{@proc}"
+            },
+            {
+              :tag => "error",
+              :value => ""
+            }
+          ]
         )
         expect(triggerid).to be_kind_of(Integer)
       end
@@ -54,8 +64,18 @@ describe "trigger" do
         :expression => "{#{@template}:#{@proc}.last(0)}<1",
         :comments => "Bla-bla is faulty (disaster)",
         :priority => 5,
-        :status     => 0,
-        :type => 0
+        :status => 0,
+        :type => 0,
+        :tags => [
+          {
+            :tag => "proc",
+            :value => "#{@proc}"
+          },
+          {
+            :tag => "error",
+            :value => ""
+          }
+        ]
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,6 +60,7 @@ files:
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb
 - lib/zabbixapi/classes/hosts.rb
+- lib/zabbixapi/classes/httptests.rb
 - lib/zabbixapi/classes/items.rb
 - lib/zabbixapi/classes/maintenance.rb
 - lib/zabbixapi/classes/mediatypes.rb
@@ -81,6 +82,7 @@ files:
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
+- spec/httptest.rb
 - spec/item.rb
 - spec/maintenance.rb
 - spec/mediatype.rb
@@ -125,6 +127,7 @@ test_files:
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
+- spec/httptest.rb
 - spec/item.rb
 - spec/maintenance.rb
 - spec/mediatype.rb