zabbixapi 0.4.7 → 0.4.8

data/README.md

@@ -144,6 +144,10 @@ zbx.graphs.create_or_update(
   :height => "200"
 )
 ```
+### Get ids by host ###
+```ruby
+zbx.graphs.get_ids_by_host(:host => "hostname")
+```
 
 ### Delete graph
 ```ruby
@@ -205,6 +209,14 @@ zbx.users.update(:userid => zbx.users.get_id(:name => "user"), :name => "user2")
 zbx.graphs.delete(zbx.graphs.get_id(:name => "graph"))
 ```
 
+### Create screen for host  ###
+```ruby
+zbx.screens.get_or_create_for_host(
+  :hostname => "hostname",
+  :graphids => zbx.graphs.get_ids_by_host(:host => "hostname")
+)
+```
+
 ### Custom queries
 ```ruby
 zbx.query(
@@ -229,4 +241,4 @@ zbx.query(
 ## Zabbix documentation
 
 * [Zabbix Project Homepage](http://zabbix.com/)
-* [Zabbix Api docs](http://www.zabbix.com/documentation/1.8/api) 
+* [Zabbix Api docs](http://www.zabbix.com/documentation/1.8/api) 

data/lib/zabbixapi.rb

@@ -9,6 +9,7 @@ require "zabbixapi/hosts"
 require "zabbixapi/triggers"
 require "zabbixapi/items"
 require "zabbixapi/graphs"
+require "zabbixapi/screens"
 
 class ZabbixApi
 
@@ -22,6 +23,7 @@ class ZabbixApi
   attr :hosts
   attr :triggers
   attr :graphs
+  attr :screens
 
   def self.connect(options = {})
     new(options)
@@ -46,6 +48,7 @@ class ZabbixApi
     @hostgroups   = HostGroups.new(options)
     @triggers = Triggers.new(options)
     @graphs = Graphs.new(options)
+    @screens = Screens.new(options)
   end
 
-end
+end

data/lib/zabbixapi/graphs.rb

@@ -33,6 +33,15 @@ class ZabbixApi
       @client.api_request(:method => "graph.get", :params => {:search => {:name => data}, :output => "extend"})
     end
 
+    def get_ids_by_host(data)
+      ids = []
+      result = @client.api_request(:method => "graph.get", :params => {:filter => {:host => data[:host]}, :output => "extend"})
+      result.each do |graph|
+        ids << graph['graphid']
+      end
+      ids
+    end
+
     def get_items(data)
       @client.api_request(:method => "graphitem.get", :params => { :graphids => [data], :output => "extend" } )
     end
@@ -72,4 +81,4 @@ class ZabbixApi
     end
 
   end
-end
+end

data/lib/zabbixapi/screens.rb

@@ -0,0 +1,129 @@
+class ZabbixApi
+  class Screens
+
+    # extracted from frontends/php/include/defines.inc.php
+    #SCREEN_RESOURCE_GRAPH => 0,
+    #SCREEN_RESOURCE_SIMPLE_GRAPH => 1,
+    #SCREEN_RESOURCE_MAP => 2,
+    #SCREEN_RESOURCE_PLAIN_TEXT => 3,
+    #SCREEN_RESOURCE_HOSTS_INFO => 4,
+    #SCREEN_RESOURCE_TRIGGERS_INFO => 5,
+    #SCREEN_RESOURCE_SERVER_INFO => 6,
+    #SCREEN_RESOURCE_CLOCK => 7,
+    #SCREEN_RESOURCE_SCREEN => 8,
+    #SCREEN_RESOURCE_TRIGGERS_OVERVIEW => 9,
+    #SCREEN_RESOURCE_DATA_OVERVIEW => 10,
+    #SCREEN_RESOURCE_URL => 11,
+    #SCREEN_RESOURCE_ACTIONS => 12,
+    #SCREEN_RESOURCE_EVENTS => 13,
+    #SCREEN_RESOURCE_HOSTGROUP_TRIGGERS => 14,
+    #SCREEN_RESOURCE_SYSTEM_STATUS => 15,
+    #SCREEN_RESOURCE_HOST_TRIGGERS => 16
+
+    def initialize(options = {})
+      @client = Client.new(options)
+      @options = options
+      @screeb_default_options = {
+        :vsize => 3
+      }
+    end
+
+    # Create screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "Screen name", hsize (rows) and vsize (columns) and array :screenitems => []
+    #   screenitems contains :resourcetype (0 - graph), :resourcetypeid (id item) and :x and :y position
+    # * *Returns* :
+    #   - Nil or Integer
+    def create(data)
+      result = @client.api_request(:method => "screen.create", :params => data)
+      result ? result['screenids'][0].to_i : nil
+    end
+
+    # Create screen
+    # Synonym create
+    def add(data)
+      create(data)
+    end
+
+    # Update screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :screenid => [ "screenid" ]
+    # * *Returns* :
+    #   - Nil or Integer
+    def update(data)
+      result = @client.api_request(:method => "screen.update", :params => data)
+      result ? result['screenids'][0].to_i : nil      
+    end
+
+    # Return info about screen
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :name => "Screen name"
+    # * *Returns* :
+    #   - Hash with screen info
+    def get_full_data(data)
+      result = @client.api_request(:method => "screen.get", :params => {:search => data, :output => "extend"})
+      result.empty? ? [] : result
+    end
+
+    # Return screenid
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :name => "Screen name"
+    # * *Returns* :
+    #   - Nil or Integer
+    def get_id(data)
+      result = get_full_data(data)
+      screenid = nil
+      result.each { |screen| screenid = screen['screenid'].to_i if screen['name'] == data[:name] }
+      screenid
+    end
+
+    # Delete screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :params => [screenid]
+    # * *Returns* :
+    #   - Nil or Integer
+    def delete(data)
+      result = @client.api_request(:method => "screen.delete", :params => data)
+      result.empty? ? nil : result['screenids'][0].to_i
+    end
+
+    # Create screen all graphs for host
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :host=> "hostname", :graphsid => [], [:hsize, :vsize]
+    # * *Returns* :
+    #   - Nil or Integer
+    def get_or_create_for_host(data)
+      screen_name = data[:host].to_s + "_graphs"
+      graphids = data[:graphids]
+      screenitems = []
+      hsize = data[:hsize] || 3
+      vsize = data[:vsize] || ((graphids.size/hsize) + 1).to_i
+      screenid = get_id(:name => screen_name)
+      unless screenid
+        # Create screen
+        graphids.each_with_index do |graphid, index|
+          screenitems << {
+            :resourcetype => 0,
+            :resourceid => graphid,
+            :x => (index % hsize).to_i,
+            :y => (index % graphids.size/hsize).to_i
+          }
+        end
+        screenid = create(
+          :name => screen_name,
+          :hsize => hsize,
+          :vsize => vsize,
+          :screenitems => screenitems
+        )
+      end
+      screenid
+    end
+
+  end
+end

data/lib/zabbixapi/templates.rb

@@ -112,7 +112,9 @@ class ZabbixApi
         :method => "template.massRemove", 
         :params => {
           :hostids => data[:hosts_id],
-          :templateids => data[:templates_id]
+          :templateids => data[:templates_id],
+          :groupids => data[:group_id],
+          :force => 1
         }
       )
       result.empty? ? false : true      

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/localhost.rb

@@ -2,8 +2,7 @@ require 'zabbixapi'
 
 # settings
 #api_url = 'http://zabbix/zabbix12/api_jsonrpc.php'
-api_url = 'http://zabbix/zabbix13/api_jsonrpc.php'
-api_url = 'http://monitor02.undev.cc/api_jsonrpc.php'
+api_url = 'http://zabbix/api_jsonrpc.php'
 #api_url = 'http://zabbix/zabbix20/api_jsonrpc.php'
 
 api_login = 'Admin'
@@ -191,13 +190,6 @@ describe ZabbixApi, "test_api" do
     ).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)],
-      :templates_id => [zbx.templates.get_id(:host => template)]
-    ).should be_kind_of(TrueClass)
-  end
-
   it "TEMPLATE: Get all" do 
     zbx.templates.all.should be_kind_of(Hash)
   end
@@ -258,6 +250,10 @@ describe ZabbixApi, "test_api" do
     zbx.graphs.get_id( :name => graph ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: get_ids_by_host" do
+    zbx.graphs.get_ids_by_host( :host => host ).should be_kind_of(Array)
+  end
+
   it "GRAPH: Update" do
     zbx.graphs.update(
       :graphid => zbx.graphs.get_id(
@@ -284,6 +280,26 @@ describe ZabbixApi, "test_api" do
   ).should be_kind_of(Integer)
   end
 
+  it "SCREEN: Get or create for host" do
+    zbx.screens.get_or_create_for_host(
+      :host => host,
+      :graphids => zbx.graphs.get_ids_by_host(:host => host)
+    ).should be_kind_of(Integer)
+  end
+
+  it "TEMPLATE: Unlink hosts from templates" do
+    zbx.templates.mass_remove(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
+  end
+
+  it "SCREEN: Delete" do
+    zbx.screens.delete(
+      [zbx.screens.get_id(:name => "#{host}_graphs")]
+    ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Delete" do
     zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
   end

data/spec/run.rb

@@ -24,8 +24,6 @@ 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
@@ -189,13 +187,6 @@ describe ZabbixApi, "test_api" do
     ).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)],
-      :templates_id => [zbx.templates.get_id(:host => template)]
-    ).should be_kind_of(TrueClass)
-  end
-
   it "TEMPLATE: Get all" do 
     zbx.templates.all.should be_kind_of(Hash)
   end
@@ -256,6 +247,10 @@ describe ZabbixApi, "test_api" do
     zbx.graphs.get_id( :name => graph ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: get_ids_by_host" do
+    zbx.graphs.get_ids_by_host( :host => host ).should be_kind_of(Array)
+  end
+
   it "GRAPH: Update" do
     zbx.graphs.update(
       :graphid => zbx.graphs.get_id(
@@ -282,6 +277,26 @@ describe ZabbixApi, "test_api" do
   ).should be_kind_of(Integer)
   end
 
+  it "SCREEN: Get or create for host" do
+    zbx.screens.get_or_create_for_host(
+      :host => host,
+      :graphids => zbx.graphs.get_ids_by_host(:host => host)
+    ).should be_kind_of(Integer)
+  end
+
+  it "TEMPLATE: Unlink hosts from templates" do
+    zbx.templates.mass_remove(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
+  end
+
+  it "SCREEN: Delete" do
+    zbx.screens.delete(
+      [zbx.screens.get_id(:name => "#{host}_graphs")]
+    ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Delete" do
     zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to work with zabbix api from ruby.
 email:
@@ -33,6 +33,7 @@ files:
 - lib/zabbixapi/hostgroups.rb
 - lib/zabbixapi/hosts.rb
 - lib/zabbixapi/items.rb
+- lib/zabbixapi/screens.rb
 - lib/zabbixapi/server.rb
 - lib/zabbixapi/templates.rb
 - lib/zabbixapi/triggers.rb
@@ -56,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3388077476884673274
+      hash: 1867199744098275115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: