zabbixapi 0.5.3b7u → 0.5.4

data/.gitignore

@@ -2,5 +2,6 @@
 *.gem
 *.swp
 .idea
+.gemtags
 pkg
 test

data/README.md

@@ -156,6 +156,8 @@ zbx.graphs.create_or_update(
 ### Get ids by host ###
 ```ruby
 zbx.graphs.get_ids_by_host(:host => "hostname")
+#You can filter graph name:
+zbx.graphs.get_ids_by_host(:host => "hostname", filter => "CPU")
 ```
 
 ### Delete graph
@@ -221,7 +223,7 @@ zbx.graphs.delete(zbx.graphs.get_id(:name => "graph"))
 ### Create screen for host  ###
 ```ruby
 zbx.screens.get_or_create_for_host(
-  :host => "hostname",
+  :screen_name => "screen_name",
   :graphids => zbx.graphs.get_ids_by_host(:host => "hostname")
 )
 ```

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

@@ -29,9 +29,19 @@ 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}
+          if /#{filter}/ =~ name
+            ids.push(graphs[name])
+          end
+        end
       end
       ids
     end

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

@@ -34,13 +34,17 @@ class ZabbixApi
     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 +54,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/client.rb

@@ -48,7 +48,7 @@ class ZabbixApi
 
     def http_request(body)
       uri = URI.parse(@options[:url])
-      unless @proxy_uri.nil?
+      if @proxy_uri.nil?
         http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
       else
         http = Net::HTTP.new(uri.host, uri.port)

data/lib/zabbixapi/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.3b7u
-  prerelease: 5
+  version: 0.5.4
+  prerelease: 
 platform: ruby
 authors:
 - Vasiliev D.V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,15 +96,18 @@ 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:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Realization for Zabbix API.