zabbixapi 0.1.1 → 0.1.2

data/lib/application.rb

@@ -0,0 +1,29 @@
+require 'base'
+
+module Zabbix
+  class ZabbixApi
+    def add_application(app_options)
+
+      app_options_default = {
+        'hostid' => nil,
+        'name' => nil
+      }
+
+      application = merge_opt(app_options_default, app_options)
+      message = {
+        'method' => 'application.create',
+        'params' => application
+      }
+
+      responce = send_request(message)
+
+      if not ( responce.empty? ) then
+        result = responce['applicationids'][0].to_i
+      else
+        result = nil 
+      end 
+
+      return result
+    end
+  end
+end

data/lib/base.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'net/http'
 require 'net/https'
 
-module ZabbixApi
+module Zabbix
 
 	class JsonMessage < RuntimeError
 	end
@@ -21,6 +21,8 @@ module ZabbixApi
 	class Error < RuntimeError
 	end
 
+	class ZabbixApi
+
 	def initialize ( api_url, api_user, api_password )
 		@api_url = api_url
 		@api_user = api_user
@@ -36,6 +38,8 @@ module ZabbixApi
 
 		message_json = JSON.generate(message)
 
+#		puts message.inspect
+
 		uri = URI.parse(@api_url)
 		http = Net::HTTP.new(uri.host, uri.port)
 
@@ -63,6 +67,9 @@ module ZabbixApi
 
 
 		# Check errors in zabbix answer. If error exist - raise exception Zabbix::Error
+
+ #               puts responce_body_hash.inspect
+
 		if ( error = responce_body_hash['error'] ) then
 			error_message = error['message']
 			error_data = error['data']
@@ -115,5 +122,5 @@ module ZabbixApi
 
 		return a.merge(c)
 	end
-
+end
 end

data/lib/graph.rb

@@ -1,55 +1,68 @@
 module Zabbix
-	class ZabbixApi
-
-		def get_graph_id(host_id, graph_name)
-			
-			message = {
-				'method' => 'graph.get',
-				'params' => {
-					'filter' => {
-						'name' => graph_name,
-						'hostid' => host_id
-					}
-				}
-			}
-
-			responce = send_request(message)
-
-			unless ( responce.empty? ) then
-				result = responce[0]['graphid']
-			else
-				result = nil
-			end
-		end
-
-		def get_graphs(host_id)
-
-			message = {
-				'method' => 'graph.get',
-				'params' => {
-					'extendoutput' => '1',
-					'filter' => {
-						'hostid' => host_id
-					}
-				}
-			}
-
-			responce = send_request(message)
-
-			unless ( responce.empty? ) then
-				result = {}
-
-				responce.each() do |graph|
-					graph_id = graph['graphid']
-					graph_name = graph['name']
-
-					result[graph_id] = graph_name
-				end
-			else
-				result = nil
-			end
-
-			return result
-		end
-	end
+  class ZabbixApi
+
+    def add_graph(graph)
+      message = {
+        'method' => 'graph.create',
+        'params' => graph
+      }
+
+      responce = send_request(message)
+
+      puts "DEBUG: #{responce.inspect}"
+
+      return 0
+    end
+
+    def get_graph_id(host_id, graph_name)
+      
+      message = {
+        'method' => 'graph.get',
+        'params' => {
+          'filter' => {
+            'name' => graph_name,
+            'hostid' => host_id
+          }
+        }
+      }
+
+      responce = send_request(message)
+
+      unless ( responce.empty? ) then
+        result = responce[0]['graphid']
+      else
+        result = nil
+      end
+    end
+
+    def get_graphs(host_id)
+
+      message = {
+        'method' => 'graph.get',
+        'params' => {
+          'extendoutput' => '1',
+          'filter' => {
+            'hostid' => host_id
+          }
+        }
+      }
+
+      responce = send_request(message)
+
+      unless ( responce.empty? ) then
+        result = {}
+
+        responce.each() do |graph|
+          graph_id = graph['graphid']
+          graph_name = graph['name']
+
+          result[graph_id] = graph_name
+        end
+      else
+        result = nil
+      end
+
+      return result
+    end
+  end
 end

data/lib/host.rb

@@ -27,6 +27,7 @@ module Zabbix
     #   - ipmi_privilege - Default: 0;
     #   - ipmi_username - Default: '';
     #   - ipmi_password - Default: '';
+    class ZabbixApi
     def add_host(host_options)
 
       host_default = {
@@ -93,4 +94,5 @@ module Zabbix
 
       return result
     end
+end
   end

data/lib/item.rb

@@ -4,7 +4,7 @@ module Zabbix
 				
 			item_options = {
                     'description'           => nil,
-	                'key_'                  => nil,
+	            'key_'                  => nil,
                     'hostid'                => nil,
                     'delay'                 => 60,
                     'history'               => 60,
@@ -47,6 +47,7 @@ module Zabbix
 					'params' => [ item_options ]
 				}
 
+
 				responce = send_request(message)
 
 				unless ( responce.empty? ) then

data/lib/trigger.rb

@@ -8,15 +8,19 @@ module Zabbix
 				'params' => [ trigger ]
 			}
 
+
 			responce = send_request(message)
 
+
 			unless ( responce.empty? ) then
 				result = responce['triggerids'][0]
 			else
 				result = nil
 			end
 
+
 			return result
+
 		end
 
 		def get_trigger_id(host_id, trigger_name)

data/lib/zabbixapi.rb

@@ -1,9 +1,9 @@
-require 'base'
-require 'graph'
-require 'group'
-require 'host'
-require 'item'
-require 'screen'
-require 'template'
-require 'trigger'
-require 'usermacro'
+require './base'
+require './graph'
+require './group'
+require './host'
+require './item'
+require './screen'
+require './template'
+require './trigger'
+require './usermacro'

data/zabbixapi.gemspec

@@ -4,13 +4,13 @@ require 'echoe'
 
 Gem::Specification.new do |spec|
 
-  spec.version = '0.1.1'
+  spec.version = '0.1.2'
   spec.name = 'zabbixapi'
   spec.summary = 'Ruby module for work with zabbix api.'
 
   spec.email = 'verm666@gmail.com'
   spec.author = 'Eduard Snesarev'
-  spec.homepage = 'http://github.com/verm666/zabbixapi'
+  spec.homepage = 'http://github.com/verm666/RubyZabbixApi'
   spec.description = 'Ruby module for work with zabbix api. '
 
   spec.has_rdoc = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabbixapi
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Eduard Snesarev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +04:00
+date: 2011-03-28 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -28,21 +28,21 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- lib/trigger.rb
-- lib/screen.rb
-- lib/1.rb
+- lib/application.rb
+- lib/base.rb
+- lib/graph.rb
+- lib/group.rb
 - lib/host.rb
-- lib/usermacro.rb
-- lib/template.rb
 - lib/item.rb
+- lib/screen.rb
+- lib/template.rb
+- lib/trigger.rb
+- lib/usermacro.rb
 - lib/zabbixapi.rb
-- lib/base.rb
-- lib/group.rb
-- lib/graph.rb
 - zabbixapi.gemspec
 - README.rdoc
 has_rdoc: true
-homepage: http://github.com/verm666/zabbixapi
+homepage: http://github.com/verm666/RubyZabbixApi
 licenses: []
 
 post_install_message: 

data/lib/1.rb

@@ -1,8 +0,0 @@
-#!/usr/bin/ruby
-
-require 'rubygems'
-require './base'
-require './host'
-
-
-zbx = ZabbixApi.new('', '', '')