zabbixapi 0.4.5 → 0.4.6

data/lib/zabbixapi/client.rb

@@ -63,7 +63,7 @@ class ZabbixApi
     def _request(body)
       puts "[DEBUG] Send request: #{body}" if @options[:debug]
       result = JSON.parse(http_request(body))
-      raise "Server answer API error: #{result['error'].inspect} on request: #{body}" if result['error']
+      raise "Server answer API error:\n #{JSON.pretty_unparse(result['error'])}\n on request:\n #{JSON.pretty_unparse(JSON.parse(body))}" if result['error']
       result['result']
     end
 

data/lib/zabbixapi/graphs.rb

@@ -46,7 +46,19 @@ class ZabbixApi
 
     def create_or_update(data)
       graphid = get_id(:name => data[:name], :templateid => data[:templateid])
-      graphid ? update(data.merge(:graphid => graphid)) : create(data)
+      graphid ? _update(data.merge(:graphid => graphid)) : create(data)
+    end
+
+    def _update(data)
+      data.delete(:name)
+      update(data)
+    end
+
+    def get_or_create(data)
+      unless graphid = get_id(:name => data[:name], :templateid => data[:templateid])
+        graphid = create(data)
+      end
+      graphid
     end
 
     def update(data)

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/localhost.rb

@@ -234,6 +234,22 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: Create or get" do 
+    gitems = {
+        :itemid => zbx.items.get_id(:description => item), 
+        :calc_fnc => "2",
+        :type => "0",
+        :periods_cnt => "5"
+    }
+    zbx.graphs.get_or_create(
+      :gitems => [gitems],
+      :show_triggers => "0",
+      :name => graph,
+      :width => "900",
+      :height => "200"
+    ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Find gititems" do
     zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end

data/spec/run.rb

@@ -24,6 +24,8 @@ graph = "graph"
 
 puts "### Zabbix API server version #{zbx.server.version} ###"
 
+puts "### Zabbix API server version #{zbx.server.version} ###"
+
 describe ZabbixApi, "test_api" do
 
   it "SERVER: Get version api" do
@@ -42,7 +44,7 @@ describe ZabbixApi, "test_api" do
     zbx.hostgroups.get_id(:name => "#{hostgroup}______").should be_kind_of(NilClass)
   end
 
-  it "HOSTGROUP: Get or create" do
+  it "HOSTGROUP: Create or get" do
     zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
   end
 
@@ -230,6 +232,22 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: Create or get" do 
+    gitems = {
+        :itemid => zbx.items.get_id(:description => item), 
+        :calc_fnc => "2",
+        :type => "0",
+        :periods_cnt => "5"
+    }
+    zbx.graphs.get_or_create(
+      :gitems => [gitems],
+      :show_triggers => "0",
+      :name => graph,
+      :width => "900",
+      :height => "200"
+    ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Find gititems" do
     zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3133925998824390450
+      hash: -225172883572635253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: