mmonit 0.0.3 → 0.0.4

data/lib/mmonit/connection.rb

@@ -50,36 +50,42 @@ module MMonit
 		end
 
 		def users
-			JSON.parse(self.request('/json/admin/users/list').body)['records']
+			JSON.parse(self.request('/json/admin/users/list').body)
 		end
 
-		def rules
-			JSON.parse(self.request('/json/admin/rules/list').body)['records']
+		def alerts
+			JSON.parse(self.request('/json/admin/alerts/list').body)
 		end
 
 		def events
 			JSON.parse(self.request('/json/events/list').body)['records']
 		end
 
-		def topography
-			JSON.parse(self.request('/json/status/topography').body)['records']['Data']
-		end
+		####  topography and reports are disabled until I figure out their new equivalent in M/Monit
+		# def topography
+		# 	JSON.parse(self.request('/json/status/topography').body)
+		# end
 
-		def reports(hostid=nil)
-			body = String.new
-			body = "hostid=#{hostid.to_s}" if hostid
-			JSON.parse(self.request('/json/reports/overview', body).body)
-		end
+		# def reports(hostid=nil)
+		# 	body = String.new
+		# 	body = "hostid=#{hostid.to_s}" if hostid
+		# 	JSON.parse(self.request('/json/reports/overview', body).body)
+		# end
 
-		def get_host(fqdn)
+		def find_host(fqdn)
 			host = self.hosts.select{ |h| h['host'] == fqdn }
 			host.empty? ? nil : host.first
 		end
 
+		# another option:  /admin/hosts/json/get?id=####
+		def get_host_details(id)
+			JSON.parse(self.request("/json/status/detail?hostid=#{id}").body)['records']['host'] rescue nil
+		end
+
 		def delete_host(host)
-			host = self.get_host(host['host']) if host.key?('host') && ! host.key?('id')
+			host = self.find_host(host['host']) if host.key?('host') && ! host.key?('id')
 			return false unless host['id']
-			self.request('/admin/hosts/', "id=#{host['id']}&Delete=1")
+			self.request("/admin/hosts/delete?id=#{host['id']}")
 		end
 
 		def request(path, body="", headers = {})

data/lib/mmonit/version.rb

@@ -1,3 +1,3 @@
 module MMonit
-	VERSION = "0.0.3"
+	VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmonit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Ruby interface to M/Monit
 email: