zabbixapi 0.4.3 → 0.4.4

data/lib/zabbixapi/applications.rb

@@ -20,6 +20,13 @@ class ZabbixApi
       result.empty? ? nil : result['applicationids'][0].to_i
     end
 
+    def get_or_create(data)
+      unless appid = get_id(data)
+        appid = create(data)
+      end
+      appid
+    end
+
     def destroy(data)
       delete(data)
     end

data/lib/zabbixapi/hostgroups.rb

@@ -24,9 +24,11 @@ class ZabbixApi
       delete(data)
     end
 
-    def create_or_update(data)
-      hostgroupid = get_id(:name => data[:name])
-      hostgroupid ? update(data.merge(:groupid => hostgroupid)) : create(data)
+    def get_or_create(data)
+      unless hostgroupid = get_id(data)
+        hostgroupid = update(data)
+      end
+      hostgroupid
     end
 
     def get_full_data(data)

data/lib/zabbixapi/templates.rb

@@ -54,6 +54,36 @@ class ZabbixApi
       result
     end
 
+    # Return templateid
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
+    # * *Returns* :
+    #   - Integer
+    def get_or_create(data)
+      unless templateid = get_id(:host => data[:host])
+        templateid = create(data)
+      end
+      templateid
+    end   
+
+    # Analog Zabbix api call massUpdate
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
+    def mass_update(data)
+      result = @client.api_request(
+        :method => "template.massAdd", 
+        :params => {
+          :hosts => data[:hosts_id].map { |t| {:hostid => t} },
+          :templates => data[:templates_id].map { |t| {:templateid => t} }
+        }
+      )
+      result.empty? ? false : true
+    end
+
     # Analog Zabbix api call massAdd 
     # 
     # * *Args*    :

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/localhost.rb

@@ -45,8 +45,8 @@ describe ZabbixApi, "test_api" do
     zbx.hostgroups.get_id(:name => "#{hostgroup}______").should be_kind_of(NilClass)
   end
 
-  it "HOSTGROUP: Create or update" do
-    zbx.hostgroups.create_or_update(:name => hostgroup).should be_kind_of(Integer)
+  it "HOSTGROUP: Create or get" do
+    zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Create" do
@@ -56,6 +56,13 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "TEMPLATE: Get get or create" do
+    zbx.templates.get_or_create(
+      :host => template,
+      :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
+    ).should be_kind_of(Integer)
+  end
+
   it "TEMPLATE: Check full data" do
     zbx.templates.get_full_data(:host => template)[0]['host'].should be_kind_of(String)
   end
@@ -75,6 +82,13 @@ describe ZabbixApi, "test_api" do
     )
   end
 
+  it "APPLICATION: Get or create" do
+    zbx.applications.get_or_create(
+      :name => application,
+      :hostid => zbx.templates.get_id(:host => template)
+    )
+  end
+
   it "APPLICATION: Full info check" do
     zbx.applications.get_full_data(:name => application)[0]['applicationid'].should be_kind_of(String)
   end
@@ -169,6 +183,13 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
+  it "TEMPLATE: Update hosts with templates" do
+    zbx.templates.mass_update(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
+  end
+
   it "TEMPLATE: Unlink hosts from templates" do
     zbx.templates.mass_remove(
       :hosts_id => [zbx.hosts.get_id(:host => host)],

data/spec/run.rb

@@ -42,6 +42,10 @@ describe ZabbixApi, "test_api" do
     zbx.hostgroups.get_id(:name => "#{hostgroup}______").should be_kind_of(NilClass)
   end
 
+  it "HOSTGROUP: Get or create" do
+    zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
+  end
+
   it "TEMPLATE: Create" do
     zbx.templates.create(
       :host => template,
@@ -49,6 +53,13 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "TEMPLATE: Get get or create" do
+    zbx.templates.get_or_create(
+      :host => template,
+      :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
+    ).should be_kind_of(Integer)
+  end
+
   it "TEMPLATE: Check full data" do
     zbx.templates.get_full_data(:host => template)[0]['host'].should be_kind_of(String)
   end
@@ -68,6 +79,13 @@ describe ZabbixApi, "test_api" do
     )
   end
 
+  it "APPLICATION: Get or create" do
+    zbx.applications.get_or_create(
+      :name => application,
+      :hostid => zbx.templates.get_id(:host => template)
+    )
+  end
+
   it "APPLICATION: Full info check" do
     zbx.applications.get_full_data(:name => application)[0]['applicationid'].should be_kind_of(String)
   end
@@ -162,6 +180,13 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
+  it "TEMPLATE: Update hosts with templates" do
+    zbx.templates.mass_update(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
+  end
+
   it "TEMPLATE: Unlink hosts from templates" do
     zbx.templates.mass_remove(
       :hosts_id => [zbx.hosts.get_id(:host => host)],
@@ -169,7 +194,7 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Get all" do
+  it "TEMPLATE: Get all" do 
     zbx.templates.all.should be_kind_of(Hash)
   end
 
@@ -189,12 +214,12 @@ describe ZabbixApi, "test_api" do
     zbx.triggers.get_id(:description => trigger).should be_kind_of(Integer)
   end
 
-  it "GRAPH: Create" do
+  it "GRAPH: Create" do 
     gitems = {
-      :itemid => zbx.items.get_id(:description => item),
-      :calc_fnc => "2",
-      :type => "0",
-      :periods_cnt => "5"
+        :itemid => zbx.items.get_id(:description => item), 
+        :calc_fnc => "2",
+        :type => "0",
+        :periods_cnt => "5"
     }
     zbx.graphs.create(
       :gitems => [gitems],
@@ -218,25 +243,25 @@ describe ZabbixApi, "test_api" do
       :graphid => zbx.graphs.get_id(
         :name => graph,
         :hostid => zbx.hosts.get_id(:host => host)
-      ),
+      ), 
       :ymax_type => 1
     ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or Update" do
     gitems = {
-      :itemid => zbx.items.get_id(:description => item),
+      :itemid => zbx.items.get_id(:description => item), 
       :calc_fnc => "3",
       :type => "0",
       :periods_cnt => "5"
     }
-    zbx.graphs.create_or_update(
-      :gitems => [gitems],
-      :show_triggers => "1",
-      :name => graph,
-      :width => "900",
-      :height => "200"
-    ).should be_kind_of(Integer)
+  zbx.graphs.create_or_update(
+    :gitems => [gitems],
+    :show_triggers => "1",
+    :name => graph,
+    :width => "900",
+    :height => "200"
+  ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Delete" do
@@ -298,9 +323,9 @@ describe ZabbixApi, "test_api" do
 
   it "QUERY" do
     zbx.query(
-      :method => "apiinfo.version",
+      :method => "apiinfo.version", 
       :params => {}
     ).should be_kind_of(String)
   end
-  
+
 end

data/zabbixapi.gemspec

@@ -5,7 +5,7 @@ require "zabbixapi/version"
 Gem::Specification.new do |s|
   s.name        = "zabbixapi"
   s.version     = ZabbixApi::VERSION
-  s.authors     = %w("Vasiliev D.V.")
+  s.authors     = ["Vasiliev D.V."]
   s.email       = %w(vadv.mkn@gmail.com)
   s.homepage    = "https://github.com/vadv/zabbixapi"
   s.summary     = %q{Realization for Zabbix API.}

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
-- ! '"Vasiliev'
-- D.V."
+- Vasiliev D.V.
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -57,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2337601613432576299
+      hash: -2858425249023380591
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: