zabbixapi 0.5.4 → 0.5.6

data/README.md

@@ -109,7 +109,7 @@ zbx.hosts.update(
 puts zbx.hosts.get_full_data(:host => "hostname")
 ```
 
-### Delete host
+
 ```ruby
 zbx.hosts.delete zbx.hosts.get_id(:host => "hostname")
 ```
@@ -228,6 +228,21 @@ zbx.screens.get_or_create_for_host(
 )
 ```
 
+### Delete screen ###
+```ruby
+zbx.screens.delete(
+  :screen_id => 1, # or screen_id => [1, 2]
+)
+```
+
+or
+
+```ruby
+zbx.screens.delete(
+  :screen_name => "foo screen", # or screen_name => ["foo screen", "bar screen"]
+)
+````
+
 ### Create UserGroup, add user and set permission ###
 ```ruby
 zbx.usergroups.get_or_create(:name => "Some user group")

data/lib/zabbixapi/1.8/classes/graphs.rb

@@ -29,9 +29,21 @@ class ZabbixApi
 
     def get_ids_by_host(data)
       ids = []
+      graphs = Hash.new
       result = @client.api_request(:method => "graph.get", :params => {:filter => {:host => data[:host]}, :output => "extend"})
       result.each do |graph|
-        ids << graph['graphid']
+        num  = graph['graphid']
+        name = graph['name']
+        graphs[name] = num
+        filter = data[:filter]
+
+        unless filter.nil?
+          if /#{filter}/ =~ name
+            ids.push(graphs[name])
+          end
+        else
+            ids.push(graphs[name])
+        end
       end
       ids
     end

data/lib/zabbixapi/1.8/classes/screens.rb

@@ -29,18 +29,40 @@ class ZabbixApi
     end
 
     def delete(data)
-      result = @client.api_request(:method => "screen.delete", :params => [data] )
+      screen_name = data[:screen_name]
+      screen_id   = data[:screen_id]
+
+      unless screen_name.nil?
+        unless screen_name.instance_of?(Array)
+          screen_id = get_id(:name => screen_name)
+        else
+          screen_id = []
+          screen_name.each do |name|
+            screen_id << get_id(:name => name)
+          end
+        end
+      end
+
+      unless screen_id.instance_of?(Array)
+        screen_id = [screen_id, screen_id]
+      end
+
+      result = @client.api_request(:method => "screen.delete", :params => screen_id)
       result.empty? ? nil : result['screenids'][0].to_i
     end
 
     def get_or_create_for_host(data)
-      screen_name = data[:host].to_s + "_graphs"
+      screen_name = data[:screen_name]
       graphids = data[:graphids]
       screenitems = []
       hsize = data[:hsize] || 3
       valign = data[:valign] || 2
       halign = data[:halign] || 2
-      vsize = data[:vsize] || ((graphids.size/hsize) + 1).to_i
+      rowspan = data[:rowspan] || 0
+      colspan = data[:colspan] || 0
+      height = data[:height] || 320 # default 320
+      width = data[:width] || 200 # default 200
+      vsize = data[:vsize] || (graphids.size/hsize).to_i
       screenid = get_id(:name => screen_name)
       unless screenid
         # Create screen
@@ -50,8 +72,12 @@ class ZabbixApi
             :resourceid => graphid,
             :x => (index % hsize).to_i,
             :y => (index % graphids.size/hsize).to_i,
-            :valign =>valign,
-            :halign =>halign
+            :valign => valign,
+            :halign => halign,
+            :rowspan => rowspan,
+            :colspan => colspan,
+            :height => height,
+            :width => width
           }
         end
         screenid = create(

data/lib/zabbixapi/2.0/classes/graphs.rb

@@ -37,10 +37,12 @@ class ZabbixApi
         graphs[name] = num
         filter = data[:filter]
 
-        unless #{filter}
+        unless filter.nil?
           if /#{filter}/ =~ name
             ids.push(graphs[name])
           end
+        else
+            ids.push(graphs[name])
         end
       end
       ids

data/lib/zabbixapi/2.0/classes/screens.rb

@@ -29,7 +29,25 @@ class ZabbixApi
     end
 
     def delete(data)
-      result = @client.api_request(:method => "screen.delete", :params => data)
+      screen_name = data[:screen_name]
+      screen_id   = data[:screen_id]
+
+      unless screen_name.nil?
+        unless screen_name.instance_of?(Array)
+          screen_id = get_id(:name => screen_name)
+        else
+          screen_id = []
+          screen_name.each do |name|
+            screen_id << get_id(:name => name)
+          end
+        end
+      end
+
+      unless screen_id.instance_of?(Array)
+        screen_id = [screen_id, screen_id]
+      end
+
+      result = @client.api_request(:method => "screen.delete", :params => screen_id)
       result.empty? ? nil : result['screenids'][0].to_i
     end
 

data/lib/zabbixapi/client.rb

@@ -48,10 +48,19 @@ class ZabbixApi
 
     def http_request(body)
       uri = URI.parse(@options[:url])
+
       if @proxy_uri.nil?
         http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
+        if uri.port == 443
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
       else
         http = Net::HTTP.new(uri.host, uri.port)
+        if uri.port == 443
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
       end
       request = Net::HTTP::Post.new(uri.request_uri)
       request.basic_auth @options[:http_user], @options[:http_password] if @options[:http_user]

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

data/spec/run.rb

@@ -19,6 +19,7 @@ template  = "template"
 application = "application"
 item = "item"
 host = "hostname"
+screen_name = "screen_name"
 trigger = "trigger"
 user = "user"
 user2 = "user2"
@@ -325,7 +326,7 @@ describe ZabbixApi do
 
   it "SCREEN: Get or create for host" do
     screenid = zbx.screens.get_or_create_for_host(
-      :host => host,
+      :screen_name => screen_name,
       :graphids => zbx.graphs.get_ids_by_host(:host => host)
     )
     screenid.should be_kind_of(Integer)
@@ -339,9 +340,7 @@ describe ZabbixApi do
   end
 
   it "SCREEN: Delete" do
-    zbx.screens.delete(
-      zbx.screens.get_id(:name => "#{host}_graphs")
-    ).should eq screenid
+    zbx.screens.delete(:screen_id => screenid).should eq screenid
   end
 
   it "GRAPH: Delete" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,9 +96,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -402697987343714468
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Realization for Zabbix API.