zabbapi 2.4.13 → 2.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 203f967100c1bf3abb427e95601090d99739d0ab
-  data.tar.gz: 6c7a8dfd3e43355c71c3c50a7b931832a358b394
+  metadata.gz: f5957f96378fd50fd44ee94345e6a5f74a8a8179
+  data.tar.gz: 7439aef6565e08a8f7cf664257cf033845533f5c
 SHA512:
-  metadata.gz: f7208193f2529e4392ce8ba0bb497d752445e85bdc50b7b78599ccd2ebb2f61c764a5aa1f55e43d57fa2e4c29d024b528e88424d6a093b9d940259fe40deb11d
-  data.tar.gz: 70fa6e6e6a03fc2f759a5409799578261a5d2498d01d8bb8dea8cd68e661ad970df0bf3bcfce72d9bac7bf8789292c430207fb86bef6177724f0e5bd0aa5a6a8
+  metadata.gz: ed42abf624e14bbe27afaade5c76830dc182874bcdd55f59829673a5e6acf835c162e41a4061c8c4ecefb419c3a74437c59223a3d58633eddf5c503febff7d80
+  data.tar.gz: 240d71b0bbf01e2b61dc4e6edda140a0f20255bce62795846c363a6ed8aa3acc242a963801bc2b9b873176f0a34355dd6192297956a001b29a342e905dacb1a8

data/exe/wda

@@ -7,9 +7,13 @@ $email = ARGV[3]
 $activeif = ARGV[4]
 $ip = ARGV[5]
 if $type == "del"
-	Zabbapi::WatchDog.new.wddel($host)
+	$host.nil? ? abort("miss param hostname; please use $ wda del <hostname>") : Zabbapi::WatchDog.new.wddel($host)
 elsif $type == "add"
-	Zabbapi::WatchDog.new.wdadd($host, $name , $email , $activeif , $ip)
+	if $host.nil? or $name.nil? or $email.nil? or $activeif.nil? or $ip.nil?
+		abort("miss params; please use wda add <hostname> <name> <email> <activeif> <ip>")
+	else
+		Zabbapi::WatchDog.new.wdadd($host, $name , $email , $activeif , $ip)
+	end
 elsif $type == "update"
 	Zabbapi::WatchDog.new.update($host)
 else
@@ -18,6 +22,6 @@ else
 	puts "wda add <hostname> <name> <email> <activeif> <ip>"
 	puts " for del:"
 	puts "wda del <hostname>"
-	puts " for update:"
-	puts "wda update <hostname>"
+#	puts " for update:"
+#	puts "wda update <hostname>"
 end

data/lib/zabbapi.rb

@@ -3,18 +3,20 @@ require 'zabbixapi'
 require 'json'
 require 'mechanize'
 require 'hpricot'
-#require 'openssl'
+
 module Zabbapi
+
 if not File.exist?('/etc/config.json')
 	abort("please create config file with credentials /etc/config.json")
 end
+
 file = File.read('/etc/config.json')
 credentials = JSON.parse(file)
 $wd_host = credentials['host']
 $wd_admin_login = credentials['login']
 $wd_admin_pass = credentials['pass']
 
-  class WatchDog
+class WatchDog
 
 	def wddel(hostname)
 		@hostname = hostname
@@ -37,11 +39,11 @@ $wd_admin_pass = credentials['pass']
 				$idscreenfordel["screenid"]
 				)
 			rescue
-  				puts "host with hostname " + @hostname + " deleted"	
-  			else
-  				puts "host with hostname " + @hostname + " deleted"	
-  			end
-    	end
+				puts "host with hostname " + @hostname + " deleted"
+			else
+				puts "host with hostname " + @hostname + " deleted"
+			end
+		end
 end
 
 	def wdadd(hostname , name , email , activeif , ip)
@@ -89,28 +91,28 @@ end
 			zbx.users.create(
 				:alias => $name,
 				:type => 1,
-  				:passwd => passwd,
-  				:usrgrps => [zbx.usergroups.get_id(:name => @name)],
-  	 			:url => '/screens.php'
+				:passwd => passwd,
+				:usrgrps => [zbx.usergroups.get_id(:name => @name)],
+				:url => '/screens.php'
 			)
 		rescue
 			puts "User exist!"
 		else
 			puts "User created!"
 			puts " "
-			puts "#WDAmhost"
+			puts "#Zabbix"
 			puts 'https://' + $wd_host
 			puts "#{@name} / #{passwd}"
 			puts " "
-			
+
 			begin
 				getuserid =  zbx.query(
 					:method => "user.get",
 					:params => {
-    						:filter => { :alias => ["#{@name}"] },
-    						:output => {
-    							:filter => "userid"
-    						}
+						:filter => { :alias => ["#{@name}"] },
+						:output => {
+							:filter => "userid"
+						}
 					}
 
 				)
@@ -119,15 +121,15 @@ end
 
 				zbx.query(:method => "user.addmedia",
 					:params => {
-	  					:users => { :userid => getuserid["userid"]},
-	  					:medias => [
-	   					{
-	      						:mediatypeid => "100100000000001" ,
-	      						:sendto => @email,
-	      						:active => 0,
-	      						:severity => 48,
-	      						:period => "1-7,00:00-24:00"
-	    					}
+						:users => { :userid => getuserid["userid"]},
+						:medias => [
+						{
+							:mediatypeid => "100100000000001" ,
+							:sendto => @email,
+							:active => 0,
+							:severity => 48,
+							:period => "1-7,00:00-24:00"
+						}
 						]
 					}
 				)
@@ -137,7 +139,7 @@ end
 				puts "UserMedia added to #{@name}"
 			end
 
-			
+
 		end
 
 		if $host.chars.first == 'l'
@@ -151,17 +153,17 @@ end
 		begin
 			zbx.query(:method => "host.create" ,
 				:params => {
-		  			:host => @hostname ,
-		  			:interfaces => {
-		      				:type => 1,
-		      				:main => 1,
-		      				:ip => $ip ,
-		      				:dns => "",
-		      				:useip => 1,
-		      				:port => 10050
-		    			},
-		  			:groups => [{ :groupid => zbx.hostgroups.get_id(:name => @name) }],
-		  			:templates => { :templateid => $tplid }
+					:host => @hostname ,
+					:interfaces => {
+						:type => 1,
+						:main => 1,
+						:ip => $ip ,
+						:dns => "",
+						:useip => 1,
+						:port => 10050
+					},
+					:groups => [{ :groupid => zbx.hostgroups.get_id(:name => @name) }],
+					:templates => { :templateid => $tplid }
 				}
 			)
 		rescue
@@ -175,7 +177,7 @@ end
 		zbx.query(
 			:method => "action.create" ,
 			:params => [ {
-				:name => "all #{@name} triggs", 
+				:name => "all #{@name} triggs",
 				:eventsource => 0 ,
 				:status => 0 ,
 				:evaltype => 0 ,
@@ -184,22 +186,22 @@ end
 				:def_longdata => '{TRIGGER.NAME}: {STATUS}',
 				:usrgrpid => zbx.usergroups.get_id(:name => @name),
 				:conditions => [
-					{ 
+					{
 						:conditiontype => 0 ,
 						:operator => 0 ,
 						:value => zbx.hostgroups.get_id(:name => $name)
 					}
 				],
 				:operations => [
-					{ 
+					{
 						:operationtype => 0 ,
-			    		:opmessage_grp => [
-				   		{
-				   			:usrgrpid => zbx.usergroups.get_id(:name => @name)
-			    		}],
-			    		:opmessage => {:default_msg => 1 }
-			    	}
-			    ]
+					:opmessage_grp => [
+						{
+							:usrgrpid => zbx.usergroups.get_id(:name => @name)
+					}],
+					:opmessage => {:default_msg => 1 }
+				}
+				]
 			}]
 		)
 		rescue
@@ -214,7 +216,7 @@ end
 		)
 
 		puts "Add host to group..."
-		
+
 		zbx.query(:method => "hostgroup.massadd" , :params => {:groups => {:groupid => "100100000000614"} , :hosts => {:hostid => zbx.hosts.get_id(:host => @hostname)}} )
 		begin
 			puts "Update screen graphs..."
@@ -225,8 +227,8 @@ end
 			abort "Its not error!!!! please wait 5 min , and update host , because new iface not discovered."
 		end
 		begin
-		
-			iface = "Traffic " + @activeif 
+
+			iface = "Traffic " + @activeif
 			iface = "Traffic on " + @activeif unless ifaceknow.include? @activeif
 			$graphtoscreen1 = zbx.graphs.get_ids_by_host(:host => @hostname , :filter => iface )
 			$graphtoscreen2 = zbx.graphs.get_ids_by_host(:host => @hostname , :filter => "CPU\ Utilization")
@@ -243,14 +245,14 @@ end
 
 			zbx.screens.get_or_create_for_host(
 				:hosts_id => [zbx.hosts.get_id(:host => @hostname)],
-		  		:screen_name => @hostname,
-		  		:height => 180,
-		  		:width => 360,
-		  		:vsize => 3,
-		  		:hsize => 2,
-		  		:halign => 0,
-		  		:valign => 0,
-		  		:graphids => [ $graphtoscreen1[0] , $graphtoscreen2[0] , $graphtoscreen3[0] , $graphtoscreen4[0] , $graphtoscreen5[0] , $graphtoscreen6[0] ]
+				:screen_name => @hostname,
+				:height => 180,
+				:width => 360,
+				:vsize => 3,
+				:hsize => 2,
+				:halign => 0,
+				:valign => 0,
+				:graphids => [ $graphtoscreen1[0] , $graphtoscreen2[0] , $graphtoscreen3[0] , $graphtoscreen4[0] , $graphtoscreen5[0] , $graphtoscreen6[0] ]
 			)
 		rescue
 			iface = "Traffic " + @activeif
@@ -265,14 +267,14 @@ end
 
 			zbx.screens.get_or_create_for_host(
 				:hosts_id => [zbx.hosts.get_id(:host => @hostname)],
-		  		:screen_name => @hostname,
-		  		:height => 180,
-		  		:width => 360,
-		  		:vsize => 2,
-		  		:hsize => 2,
-		  		:halign => 0,
-		  		:valign => 0,
-		  		:graphids => [ $graphtoscreen1[0] , $graphtoscreen2[0] , $graphtoscreen3[0] , $graphtoscreen4[0] ]
+				:screen_name => @hostname,
+				:height => 180,
+				:width => 360,
+				:vsize => 2,
+				:hsize => 2,
+				:halign => 0,
+				:valign => 0,
+				:graphids => [ $graphtoscreen1[0] , $graphtoscreen2[0] , $graphtoscreen3[0] , $graphtoscreen4[0] ]
 			)
 		end
 		puts "Done!"
@@ -280,23 +282,23 @@ end
 end
 
 #class UpdateHostTemplates
-	def update(hostname)
-		@hostname = hostname
-		zbx = ZabbixApi.connect(
-		  :url => 'https://' + $wd_host + '/api_jsonrpc.php',
-		  :user => $wd_admin_login ,
-		  :password => $wd_admin_pass
-		)
-		zbx.templates.mass_add(
-		  :hosts_id => [zbx.hosts.get_id(:host => @hostname)],
-		  :templates_id => [100100000010962 , 100100000010003 , 100100000010099]
-		)
-		zbx.screens.get_or_create_for_host(
-		  :hosts_id => [zbx.hosts.get_id(:host => @hostname)],
-  		  :screen_name => @hostname,
-  		  :graphids => zbx.graphs.get_ids_by_host(:host => @hostname )
-		)
-	end
+#	def update(hostname)
+#		@hostname = hostname
+#		zbx = ZabbixApi.connect(
+#		:url => 'https://' + $wd_host + '/api_jsonrpc.php',
+#		:user => $wd_admin_login ,
+#		:password => $wd_admin_pass
+#		)
+#		zbx.templates.mass_add(
+#		:hosts_id => [zbx.hosts.get_id(:host => @hostname)],
+#		:templates_id => [100100000010962 , 100100000010003 , 100100000010099]
+#		)
+#		zbx.screens.get_or_create_for_host(
+#		:hosts_id => [zbx.hosts.get_id(:host => @hostname)],
+#		:screen_name => @hostname,
+#		:graphids => zbx.graphs.get_ids_by_host(:host => @hostname )
+#		)
+#	end
 #end
 
 end

data/lib/zabbapi/version.rb

@@ -1,3 +1,3 @@
 module Zabbapi
-  VERSION = "2.4.13"
+  VERSION = "2.4.14"
 end

data/zabbapi.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["nikolaev.makc@gmail.com"]
 
   spec.summary       = %q{watch dog cli}
-  spec.description   = %q{ZabbixAPI for host create / delete / update}
+  spec.description   = %q{ZabbixAPI CLI for host create / delete / update}
   spec.homepage      = "https://rubygems.org/gems/zabbapi"
   spec.license       = "MIT"
-
+  spec.required_ruby_version = '>=1.9.3'
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
 #  if spec.respond_to?(:metadata)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbapi
 version: !ruby/object:Gem::Version
-  version: 2.4.13
+  version: 2.4.14
 platform: ruby
 authors:
 - maxn maxn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zabbixapi
@@ -78,7 +78,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
-description: ZabbixAPI for host create / delete / update
+description: ZabbixAPI CLI for host create / delete / update
 email:
 - nikolaev.makc@gmail.com
 executables:
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="