mmonit-client 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d763b946f016249a9b2c81fcc3b91c9176a97347
-  data.tar.gz: 28e09524be8e954e564a6af6a297f0877839421d
+  metadata.gz: d72688d408a77e7dae6bbaf62df4e2a86a44587c
+  data.tar.gz: dc729baff00331101cc5bf25c3cc38f93c4d431d
 SHA512:
-  metadata.gz: 7f9d9341ce720885aefed54045fee40b5e3bbb8f779d4f169a83629f1cfcc8251016fb2c54e39181547da7a33ccb2f1b7787c0867986cedd37bdb297e90eae35
-  data.tar.gz: 3da21f644c91400da1ede18052cb197d0538e2ca67f2d145aea249dc9e53d110b8edde27cb9b8c805e570374c2a6801c2485ec37a09eb04b38883145d324c1bc
+  metadata.gz: cb90206f48cd6ca903d9063a0f12130169839115f3cb9caac3f729a7721f8606b78ed8ce88699506f3bb86a2c2bcc905b0f4f2df89e4703d98de8b230c81ce25
+  data.tar.gz: 330a088028ea4f97e64e36db7c9f7297662caf730847391f5352ec6c82663b3743b4b002def9608177d8eb0fc835a9fa29316aeee0668e1926d6a9b9a373388a

data/lib/mmonit/connection.rb

@@ -3,106 +3,111 @@ require 'net/https'
 require 'json'
 
 module MMonit
-	class Connection
-		attr_reader :http, :address, :port, :ssl, :username, :useragent, :headers
-		attr_writer :password
-
-		def initialize(options = {})
-			@ssl = options[:ssl] || false
-			@address = options[:address]
-			options[:port] ||= @ssl ? '8443' : '8080'
-			@port = options[:port]
-			@username = options[:username]
-			@password = options[:password]
-			options[:useragent] ||= "MMonit-Ruby/#{MMonit::VERSION}"
-			@useragent = options[:useragent]
-			@headers = {
-				'Host' => @address,
-				'Referer' => "#{@url}/index.csp",
-				'Content-Type' => 'application/x-www-form-urlencoded',
-				'User-Agent' => @useragent,
-				'Connection' => 'keepalive'
-			}
-		end
-
-		def connect
-			@http = Net::HTTP.new(@address, @port)
-
-			if @ssl
-				@http.use_ssl = true
-				@http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-			end
-
-			@headers['Cookie'] = @http.get('/index.csp').response['set-cookie'].split(';').first
-			self.login
-		end
-
-		def login
-			self.request('/z_security_check', "z_username=#{@username}&z_password=#{@password}").code.to_i == 302
-		end
+  class Connection
+    attr_reader :http, :address, :port, :ssl, :username, :useragent, :headers
+    attr_writer :password
+
+    def initialize(options = {})
+      @ssl = options[:ssl] || false
+      @address = options[:address]
+      options[:port] ||= @ssl ? '8443' : '8080'
+      @port = options[:port]
+      @username = options[:username]
+      @password = options[:password]
+      options[:useragent] ||= "MMonit-Ruby/#{MMonit::VERSION}"
+      @useragent = options[:useragent]
+      @headers = {
+        'Host' => @address,
+        'Referer' => "#{@url}/index.csp",
+        'Content-Type' => 'application/x-www-form-urlencoded',
+        'User-Agent' => @useragent,
+        'Connection' => 'keepalive'
+      }
+    end
+
+    def connect
+      @http = Net::HTTP.new(@address, @port)
+
+      if @ssl
+        @http.use_ssl = true
+        @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      @headers['Cookie'] = @http.get('/index.csp').response['set-cookie'].split(';').first
+      self.login
+    end
+
+    def login
+      self.request('/z_security_check', "z_username=#{@username}&z_password=#{@password}").code.to_i == 302
+    end
 
     # TODO: filter arguments
-		def status_overview
-			JSON.parse(self.get('/status/hosts/list').body)['records']
-		end
+    def status_overview
+      JSON.parse(self.get('/status/hosts/list').body)['records']
+    end
+
+    # TODO: get by id
+    def status(id)
+    end
+
+    def status_summary
+      JSON.parse(self.get('/status/hosts/summary').body)
+    end
+
+    def hosts
+      JSON.parse(self.get('/admin/hosts/list').body)['records']
+    end
+
+    #def users
+      #JSON.parse(self.request('/json/admin/users/list').body)
+    #end
+
+    #def alerts
+      #JSON.parse(self.request('/json/admin/alerts/list').body)
+    #end
+
+    #def events
+      #JSON.parse(self.request('/json/events/list').body)['records']
+    #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 find_host_by_hostname(fqdn)
+      host = self.hosts.select{ |h| h['hostname'] == fqdn }
+      host.empty? ? nil : host.first
+    end
+
+    # another option:  /admin/hosts/json/get?id=####
+    def get_host_details(id)
+      JSON.parse(self.get("/admin/hosts/get?id=#{id}").body) rescue nil
+    end
+
+    # Now mmonit requires csrf_token for some actions
+    def get_csrf_token
+      JSON.parse(mmonit.get("/session/get?key=CSRFToken").body)["CSRFToken"]
+    end
+
+    def delete_host(id)
+      self.request("/admin/hosts/delete?id=#{id}","",{ "CSRFToken" => csrf_token})
+    end
 
-		# TODO: get by id
-		def status(id)
+    def request(path, body="", headers = {})
+      self.connect unless @http.is_a?(Net::HTTP)
+      @http.post(path, body, @headers.merge(headers))
     end
 
-		def status_summary
-			JSON.parse(self.get('/status/hosts/summary').body)
-		end
-
-		def hosts
-			JSON.parse(self.get('/admin/hosts/list').body)['records']
-		end
-
-		#def users
-			#JSON.parse(self.request('/json/admin/users/list').body)
-		#end
-
-		#def alerts
-			#JSON.parse(self.request('/json/admin/alerts/list').body)
-		#end
-
-		#def events
-			#JSON.parse(self.request('/json/events/list').body)['records']
-		#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 find_host_by_hostname(fqdn)
-			host = self.hosts.select{ |h| h['hostname'] == fqdn }
-			host.empty? ? nil : host.first
-		end
-
-		# another option:  /admin/hosts/json/get?id=####
-		def get_host_details(id)
-			JSON.parse(self.get("/admin/hosts/get?id=#{id}").body) rescue nil
-		end
-
-		def delete_host(id)
-			self.request("/admin/hosts/delete?id=#{id}")
-		end
-
-		def request(path, body="", headers = {})
-			self.connect unless @http.is_a?(Net::HTTP)
-			@http.post(path, body, @headers.merge(headers))
-		end
-
-		def get(path, headers = {})
-			self.connect unless @http.is_a?(Net::HTTP)
-			@http.get(path, @headers.merge(headers))
+    def get(path, headers = {})
+      self.connect unless @http.is_a?(Net::HTTP)
+      @http.get(path, @headers.merge(headers))
     end
-	end
+  end
 end

data/lib/mmonit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmonit-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - hSATAC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Ruby interface to M/Monit, support mmonit v3
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - README.md
 - lib/mmonit.rb
 - lib/mmonit/connection.rb
@@ -32,17 +32,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Ruby interface to M/Monit, support mmonit v3