zabbixapi 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ba28c4faff22b396e0e768792448a75ca4e637
-  data.tar.gz: 788a52dbb357ab631f7a2029a6485c41d0d49ca1
+  metadata.gz: 215112a4983ad12bbe114bf2b884a99e165fc0f8
+  data.tar.gz: 0d3d0c9eba2992c8dc6ac34145657773bd90ccbe
 SHA512:
-  metadata.gz: 78dd6e98b5a32bb724259b3e34c29e509cbba0fcb5c9decbdc8a9aeca25adf1f3a3692d661de57ce76c3be2c3d4607624d3addf346c123a911a9a8c4b3b629df
-  data.tar.gz: 0b5ff259f158b439285c080de706336847e52c554e3dd4f4a214fc02ce877b178717c81e99b038fcd64b1bb589698b82698c447f18060af5abf58a45d47f0b1e
+  metadata.gz: e46a3e882b2d4abefdd27d62e8839dc85f8ecc8485905e385e4fd396d914d547119c3f44ba66e27aae1d3244215189419fc62f3f0e5edbcc27f05bec5ffef01f
+  data.tar.gz: bfca90c6b3676e1ff1dd10874ab70fceb43a464c41eb7220bbbf9e5341c7aab2e150f571431a315f72f6fe61a641e5d1b020c932f1966a0fea91673a70fe5eb7

data/.rspec

@@ -1 +1 @@
---color --format nested
+--color --format documentation

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.6
+
+[PR #39](https://github.com/express42/zabbixapi/issues/39) Add support for maintenance API
+
 ## 2.4.5
 
 [PR #33](https://github.com/express42/zabbixapi/issues/33) Typed exceptions

data/README.md

@@ -227,11 +227,11 @@ zbx.graphs.delete(zbx.graphs.get_id(:name => "graph"))
 ### Get all templates linked with host
 ```ruby
 zbx.templates.get_ids_by_host( :hostids => [zbx.hosts.get_id(:host => "hostname")] )
-#returned hash:
-#{
-#  "Templatename" => "10",
-#  "Templatename" => "1021"
-#}
+#returned array:
+#[
+#   "10",
+#   "1021"
+#]
 ```
 
 ### Mass (Un)Link host with templates
@@ -324,7 +324,7 @@ zbx.usergroups.add_user(
   :userids => [zbx.users.get_id(:alias => "user")]
 )
 # set write and read permissions for UserGroup on all hostgroups
-zbx.usergroups.set_perm(
+zbx.usergroups.set_perms(
    :usrgrpid => zbx.usergroups.get_or_create(:name => "Some user group"),
    :hostgroupids => zbx.hostgroups.all.values, # kind_of Array
    :permission => 3 # 2- read (by default) and 3 - write and read

data/lib/zabbixapi.rb

@@ -10,6 +10,7 @@ require "zabbixapi/classes/applications"
 require "zabbixapi/classes/errors"
 require "zabbixapi/classes/graphs"
 require "zabbixapi/classes/hostgroups"
+require "zabbixapi/classes/maintenance"
 require "zabbixapi/classes/hosts"
 require "zabbixapi/classes/items"
 require "zabbixapi/classes/mediatypes"
@@ -72,6 +73,10 @@ class ZabbixApi
     @hostgroups ||= HostGroups.new(@client)
   end
 
+  def maintenance
+    @maintenance ||= Maintenance.new(@client)
+  end
+
   def triggers
     @triggers ||= Triggers.new(@client)
   end

data/lib/zabbixapi/classes/maintenance.rb

@@ -0,0 +1,13 @@
+class ZabbixApi
+  class Maintenance < Basic
+
+    def method_name
+      "maintenance"
+    end
+
+    def indentify
+      "name"
+    end
+
+  end
+end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.5"
+  VERSION = "2.4.6"
 end

data/spec/maintenance.rb

@@ -0,0 +1,81 @@
+#encoding: utf-8
+
+require 'spec_helper'
+
+describe 'maintenance' do
+  context 'when not exists' do
+  before :all do
+	@hostgroupid = zbx.hostgroups.create(:name => "hostgroup_#{rand(1_000_000)}")
+	end
+	
+    describe 'create' do
+      it "should return integer id after creation" do
+        maintenanceid = zbx.maintenance.create(:name => "maintenance_#{rand(1_000_000)}",
+											   :groupids => [ @hostgroupid ],
+											   :active_since => 1358844540,
+											   :active_till => 1390466940,
+											   :timeperiods => [ :timeperiod_type => 3, :every => 1, :dayofweek => 64, :start_time => 64800, :period => 3600 ]
+											)
+        expect(maintenanceid).to be_kind_of(Integer)
+		zbx.maintenance.delete(maintenanceid)
+      end
+    end
+	
+	after :all do
+		zbx.hostgroups.delete(@hostgroupid)
+	end
+
+  end
+
+  context 'when exists' do
+    before :all do
+	  @hostgroupid_when_exists = zbx.hostgroups.create(:name => "hostgroup_#{rand(1_000_000)}")
+      @maintenance = gen_name('maintenance')
+      @maintenanceid = zbx.maintenance.create(:name => @maintenance,
+											   :groupids => [ @hostgroupid_when_exists ],
+											   :active_since => 1358844540,
+											   :active_till => 1390466940,
+											   :timeperiods => [ :timeperiod_type => 3, :every => 1, :dayofweek => 64, :start_time => 64800, :period => 3600 ]
+											)
+    end
+
+    describe 'get_id' do
+      it "should return id" do
+        zbx.maintenance.get_id(:name => @maintenance).should eq @maintenanceid
+      end
+
+      it "should return nil for not existing group" do
+        zbx.maintenance.get_id(:name => "#{@maintenance}______").should be_kind_of(NilClass)
+      end
+    end
+
+    describe 'get_or_create' do
+      it "should return id of existing maintenance" do
+        zbx.maintenance.get_or_create(:name => @maintenance).should eq @maintenanceid
+      end
+    end
+
+    describe 'create_or_update' do
+      it "should return id of maintenance" do
+        zbx.maintenance.create_or_update(:name => @maintenance).should eq @maintenanceid
+      end
+    end
+
+    describe 'all' do
+      it "should contains created maintenance" do
+        zbx.maintenance.all.should include(@maintenance => @maintenanceid.to_s)
+      end
+    end
+
+    describe "delete" do
+      it "shold return id" do
+        zbx.maintenance.delete(@maintenanceid).should eq @maintenanceid
+      end
+    end
+	
+	after :all do
+		zbx.hostgroups.delete(@hostgroupid_when_exists)
+	end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,6 +60,7 @@ files:
 - lib/zabbixapi/classes/hostgroups.rb
 - lib/zabbixapi/classes/hosts.rb
 - lib/zabbixapi/classes/items.rb
+- lib/zabbixapi/classes/maintenance.rb
 - lib/zabbixapi/classes/mediatypes.rb
 - lib/zabbixapi/classes/proxies.rb
 - lib/zabbixapi/classes/screens.rb
@@ -79,6 +80,7 @@ files:
 - spec/host.rb
 - spec/hostgroup.rb
 - spec/item.rb
+- spec/maintenance.rb
 - spec/mediatype.rb
 - spec/query.rb
 - spec/screen.rb
@@ -121,6 +123,7 @@ test_files:
 - spec/host.rb
 - spec/hostgroup.rb
 - spec/item.rb
+- spec/maintenance.rb
 - spec/mediatype.rb
 - spec/query.rb
 - spec/screen.rb