hq-log-monitor-server 0.7.0 → 0.8.0

data/features/support/steps.rb

@@ -37,7 +37,7 @@ end
 Given /^the time is (\d+)$/ do
 	|time_str|
 
-	Time.stub(:now).and_return { Time.at time_str.to_i }
+	set_time Time.at time_str.to_i
 
 end
 

data/features/support/time.rb

@@ -0,0 +1,21 @@
+# time manipulation which doesn't break background threads
+
+Before do
+
+	original_now = Time.method(:now)
+
+	@set_time = nil
+
+	Time.stub(:now) do
+		if @set_time
+			@set_time
+		else
+			original_now.call
+		end
+	end
+
+end
+
+def set_time new_time
+	@set_time = new_time
+end

data/lib/hq/log-monitor-server/do-checks.rb

@@ -3,103 +3,207 @@ module LogMonitorServer
 
 class Script
 
+	CHECK_FREQUENCY = 60
+
+	def background
+
+		@mutex = Mutex.new
+		@run_now_signal = ConditionVariable.new
+		@next_check_done_signal = nil
+		@current_check_done_signal = nil
+		@stop_checks_signal = nil
+
+		@next_check = Time.now
+
+		loop do
+
+			# wait till next invocation
+
+			@mutex.synchronize do
+
+				until @next_check_done_signal
+
+					if @next_check < Time.now
+						@next_check_done_signal = ConditionVariable.new
+						break
+					end
+
+					@run_now_signal.wait @mutex, 1
+
+					if @stop_checks_signal
+						@stop_checks_signal.broadcast
+						return
+					end
+
+				end
+
+				@current_check_done_signal = @next_check_done_signal
+
+			end
+
+			# perform the checks
+
+			begin
+				do_checks_real
+			rescue => e
+				$stderr.puts e, *e.backtrace
+				sleep 10
+			ensure
+
+				# notify waiting threads
+
+				@mutex.synchronize do
+
+					if @next_check_done_signal == @current_check_done_signal
+						@next_check_done_signal = nil
+					end
+
+					@current_check_done_signal.broadcast
+
+				end
+
+			end
+
+			@next_check = Time.now + CHECK_FREQUENCY
+
+		end
+
+	end
+
+	def stop_checks
+
+		@mutex.synchronize do
+
+			unless @stop_checks_signal
+				@stop_checks_signal = ConditionVariable.new
+			end
+
+			@run_now_signal.signal
+
+			@stop_checks_signal.wait @mutex
+
+		end
+
+	end
+
 	def do_checks
+
 		@mutex.synchronize do
 
-			File.open @icinga_elem["command-file"], "a" do
-				|command_io|
+			if @next_check_done_signal
 
-				summaries_by_service =
-					get_summaries_by_service
+				# next run already scheduled, just wait for it
 
-				@icinga_elem.find("service").each do
-					|service_elem|
+				@next_check_done_signal.wait @mutex
 
-					service_name = service_elem["name"]
+			else
 
-					critical_count = 0
-					warning_count = 0
-					unknown_count = 0
+				# create new next run and wait for it
 
-					summaries =
-						summaries_by_service[service_name]
+				@next_check_done_signal = ConditionVariable.new
 
-					if summaries
-						summaries["types"].each do
-							|type_name, type_info|
+				@run_now_signal.signal
 
-							case level_for_type service_name, type_name
-							when "critical"
-								critical_count += type_info["new"]
-							when "warning"
-								warning_count += type_info["new"]
-							else
-								unknown_count += type_info["new"]
-							end
+				@next_check_done_signal.wait @mutex
 
-						end
-					end
+			end
 
-					status_int =
-						if critical_count > 0
-							2
-						elsif warning_count > 0
-							1
-						elsif unknown_count > 0
-							3
-						else
-							0
-						end
+		end
+
+	end
+
+	def do_checks_real
 
-					status_str =
-						if critical_count > 0
-							"CRITICAL"
-						elsif warning_count > 0
-							"WARNING"
-						elsif unknown_count > 0
-							"UNKNOWN"
+		File.open @icinga_elem["command-file"], "a" do
+			|command_io|
+
+			summaries_by_service =
+				get_summaries_by_service
+
+			@icinga_elem.find("service").each do
+				|service_elem|
+
+				service_name = service_elem["name"]
+
+				critical_count = 0
+				warning_count = 0
+				unknown_count = 0
+
+				summaries =
+					summaries_by_service[service_name]
+
+				if summaries
+					summaries["types"].each do
+						|type_name, type_info|
+
+						case level_for_type service_name, type_name
+						when "critical"
+							critical_count += type_info["new"]
+						when "warning"
+							warning_count += type_info["new"]
 						else
-							"OK"
+							unknown_count += type_info["new"]
 						end
 
-					parts = []
+					end
+				end
 
+				status_int =
 					if critical_count > 0
-						parts << "%d critical" % critical_count
+						2
+					elsif warning_count > 0
+						1
+					elsif unknown_count > 0
+						3
+					else
+						0
 					end
 
-					if warning_count > 0
-						parts << "%d warning" % warning_count
+				status_str =
+					if critical_count > 0
+						"CRITICAL"
+					elsif warning_count > 0
+						"WARNING"
+					elsif unknown_count > 0
+						"UNKNOWN"
+					else
+						"OK"
 					end
 
-					if unknown_count > 0
-						parts << "%d unknown" % unknown_count
-					end
+				parts = []
 
-					if parts.empty?
-						parts << "no new events"
-					end
+				if critical_count > 0
+					parts << "%d critical" % critical_count
+				end
 
+				if warning_count > 0
+					parts << "%d warning" % warning_count
+				end
 
-					command_io.print "[%s] %s\n" % [
-						Time.now.to_i,
-						[
-							"PROCESS_SERVICE_CHECK_RESULT",
-							service_elem["icinga-host"],
-							service_elem["icinga-service"],
-							status_int,
-							"%s %s" % [
-								status_str,
-								parts.join(", "),
-							]
-						].join(";"),
-					]
+				if unknown_count > 0
+					parts << "%d unknown" % unknown_count
+				end
 
+				if parts.empty?
+					parts << "no new events"
 				end
 
-			end
 
-			@next_check = Time.now + 60
+				command_io.print "[%s] %s\n" % [
+					Time.now.to_i,
+					[
+						"PROCESS_SERVICE_CHECK_RESULT",
+						service_elem["icinga-host"],
+						service_elem["icinga-service"],
+						status_int,
+						"%s %s" % [
+							status_str,
+							parts.join(", "),
+						]
+					].join(";"),
+				]
+
+			end
 
 		end
 

data/lib/hq/log-monitor-server/overview-page.rb

@@ -8,6 +8,11 @@ class Script
 		summaries_by_service =
 			get_summaries_by_service
 
+		summaries =
+			summaries_by_service
+				.values
+				.sort_by { |summary| summary["_id"]["service"] }
+
 		headers = {}
 		html = []
 
@@ -57,7 +62,7 @@ class Script
 			esc_ht(title),
 		]
 
-		if summaries_by_service.empty?
+		if summaries.empty?
 			html << "<p>No events have been logged</p>\n"
 		else
 
@@ -74,8 +79,8 @@ class Script
 			html << "</thead>\n"
 			html << "<tbody>\n"
 
-			summaries_by_service.each do
-				|service, summary|
+			summaries.each do
+				|summary|
 
 				html << "<tr class=\"%s\">\n" % [
 					esc_ht([

data/lib/hq/log-monitor-server/script.rb

@@ -19,7 +19,6 @@ class Script
 
 	def initialize
 		@status = 0
-		@mutex = Mutex.new
 	end
 
 	def main
@@ -34,11 +33,12 @@ class Script
 	def start
 		setup
 		Thread.new { run }
-		Thread.new { background }
+		@background_thread = Thread.new { background }
 	end
 
 	def stop
 		@web_server.shutdown
+		stop_checks
 	end
 
 	def setup
@@ -52,22 +52,6 @@ class Script
 		@web_server.start
 	end
 
-	def background
-
-		@next_check = Time.now
-
-		loop do
-			sleep 1 while Time.now < @next_check
-			begin
-				do_checks
-			rescue => e
-				$stderr.puts e, *e.backtrace
-				sleep 10
-			end
-		end
-
-	end
-
 	def process_args
 
 		@opts, @args =

data/lib/hq/log-monitor-server/service-host-page.rb

@@ -31,15 +31,27 @@ class Script
 
 		# read from database
 
-		events =
+		all_events =
 			@db["events"]
 				.find({
 					"source.class" => source["class"],
 					"source.host" => source["host"],
 					"source.service" => source["service"],
 				})
+				.sort({
+					"timestamp" => -1,
+				})
 				.to_a
 
+		page_size = 100
+		page_num = req.GET["page"].to_i
+
+		page_start = page_num * page_size
+		page_end = page_start + page_size
+		page_count = (all_events.size + page_size - 1) / page_size
+
+		page_events = all_events[page_start...page_end] || []
+
 		title =
 			"%s %s \u2014 Log monitor" % [
 				context[:host],
@@ -103,13 +115,22 @@ class Script
 			esc_ht(title),
 		]
 
-		if events.empty?
+		if all_events.size > page_size || page_num > 0
+			pagination html, page_count, page_num
+		end
+
+		if all_events.empty?
 
 			html << "<p>No events have been logged for this service on this " +
 				"host</p>\n"
 
+		elsif page_events.empty?
+
+			html << "<p>No events on this page</p>\n"
+
 		else
 
+
 			html << "<table id=\"events\" class=\"table table-striped\">\n"
 			html << "<thead>\n"
 
@@ -127,7 +148,7 @@ class Script
 
 			unseen_count = 0
 
-			events.each do
+			page_events.each do
 				|event|
 
 				html << "<tr class=\"%s\">\n" % [
@@ -175,6 +196,10 @@ class Script
 			html << "</tbody>\n"
 			html << "</table>\n"
 
+			if all_events.size > page_size || page_num > 0
+				pagination html, page_count, page_num
+			end
+
 			html << "<form method=\"post\">\n"
 
 			html << "<p>\n"
@@ -212,6 +237,29 @@ class Script
 
 	end
 
+	def pagination html, page_count, page_num
+
+		html << "<div class=\"pagination\">\n"
+		html << "<ul>\n"
+
+		page_count.times do
+			|num|
+
+			if num == page_num
+				html << "<li class=\"active\">"
+			else
+				html << "<li>"
+			end
+
+			html << "<a href=\"?page=#{num}\">#{num+1}</a>\n"
+
+		end
+
+		html << "</ul>\n"
+		html << "</div>\n"
+
+	end
+
 end
 
 end

data/lib/hq/log-monitor-server/service-page.rb

@@ -12,6 +12,14 @@ class Script
 				})
 				.to_a
 
+		summaries.sort_by! {
+			|summary|
+			[
+				summary["_id"]["host"],
+				summary["_id"]["class"],
+			]
+		}
+
 		title =
 			"%s - Log monitor" % [
 				context[:service],

data/spec/hq/log-monitor-server/misc-spec.rb

@@ -33,88 +33,42 @@ describe Script do
 
 		before do
 			require "xml"
-		end
-
-		it "returns nil if the service does not exist" do
-			
-			subject.instance_variable_set \
-				"@icinga_elem",
-				XML::Document.string("<icinga/>")
-
-			ret = subject.level_for_type "service", "type"
-
-			ret.should == nil
-
-		end
-
-		it "returns nil if the type does not exist" do
-			
 			subject.instance_variable_set \
 				"@icinga_elem",
 				XML::Document.string("
 					<icinga>
-						<service name=\"service\"/>
+						<service name=\"service\">
+							<type name=\"type\" level=\"level\"/>
+							<type name=\"no-level\"/>
+							<type name=\"empty-level\" level=\"\"/>
+						</service>
 					</icinga>
 				")
+		end
 
-			ret = subject.level_for_type "service", "type"
-
+		it "returns nil if the service does not exist" do
+			ret = subject.level_for_type "blah", "type"
 			ret.should == nil
+		end
 
+		it "returns nil if the type does not exist" do
+			ret = subject.level_for_type "service", "blah"
+			ret.should == nil
 		end
 
 		it "returns nil if the type has no level" do
-			
-			subject.instance_variable_set \
-				"@icinga_elem",
-				XML::Document.string("
-					<icinga>
-						<service name=\"service\">
-							<type name=\"type\"/>
-						</service>
-					</icinga>
-				")
-
-			ret = subject.level_for_type "service", "type"
-
+			ret = subject.level_for_type "service", "no-level"
 			ret.should == nil
-
 		end
 
 		it "returns nil if the type has an empty level" do
-			
-			subject.instance_variable_set \
-				"@icinga_elem",
-				XML::Document.string("
-					<icinga>
-						<service name=\"service\">
-							<type name=\"type\" level=\"\"/>
-						</service>
-					</icinga>
-				")
-
-			ret = subject.level_for_type "service", "type"
-
+			ret = subject.level_for_type "service", "empty-level"
 			ret.should == nil
-
 		end
 
 		it "returns the appropriate level if all is well" do
-			
-			subject.instance_variable_set \
-				"@icinga_elem",
-				XML::Document.string("
-					<icinga>
-						<service name=\"service\">
-							<type name=\"type\" level=\"level\"/>
-						</service>
-					</icinga>
-				")
-
 			ret = subject.level_for_type "service", "type"
-
 			ret.should == "level"
-
 		end
 
 	end

metadata

@@ -1,195 +1,222 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-server
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
+  prerelease: 
 platform: ruby
 authors:
 - James Pharaoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: hq-tools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: HQ log monitor system, central component
@@ -214,32 +241,34 @@ files:
 - features/submit-event.feature
 - features/overview-page.feature
 - features/support/steps.rb
+- features/support/time.rb
 - features/support/env.rb
 - features/support/ui-steps.rb
 - spec/hq/log-monitor-server/misc-spec.rb
 - bin/hq-log-monitor-server
 homepage: https://github.com/jamespharaoh/hq-log-monitor-server
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: hq-log-monitor-server
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HQ log monitor server
 test_files:
 - features/event-page.feature
@@ -247,6 +276,7 @@ test_files:
 - features/submit-event.feature
 - features/overview-page.feature
 - features/support/steps.rb
+- features/support/time.rb
 - features/support/env.rb
 - features/support/ui-steps.rb
 - spec/hq/log-monitor-server/misc-spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6c802a656d6c2c2f5cee3eed1f4c866b812fc5ba
-  data.tar.gz: e234c43d9f6be7a9879c5192b7d0ab0a1b15e33f
-SHA512:
-  metadata.gz: a2db019440cc38fe7319b32cb4d357f6b35eed61f7fdbedcdd651c12110a36c49751bb9c3ec47116660f8d230e2569ec6a9aed44cb4438bdd54215a34b570e7e
-  data.tar.gz: 4f6b25e91c08a504f272615a4f34a6f03a3ad75532bd621a34fe9c728787bbefa55057e8a4abb963eecd62ab10730161729fae253c553e5ab2f880538038c34d