hq-log-monitor-server 0.6.0 → 0.7.0

checksums.yaml

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

data/features/event-page.feature

@@ -68,7 +68,6 @@ Scenario: Mark as seen
 
     And icinga should receive:
       """
-      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
       [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       """
@@ -94,8 +93,52 @@ Scenario: Mark as unseen
 
     And icinga should receive:
       """
-      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
       [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       [20] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
       """
+
+  Scenario: Delete unseen
+
+    Given the time is 20
+
+    When I visit /event/${event-id}
+    And I click "delete"
+
+    Then I should be sent to /service-host/service/class/host
+
+    And the event should be deleted
+
+    And the summary new should be 0
+    And the summary total should be 0
+    And the summary new for type "warning" should be 0
+    And the summary total for type "warning" should be 0
+
+    And icinga should receive:
+      """
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
+      [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
+      """
+
+  Scenario: Delete seen
+
+    Given the time is 20
+
+    When I visit /event/${event-id}
+    And I click "mark as seen"
+    And I click "delete"
+
+    Then I should be sent to /service-host/service/class/host
+
+    And the event should be deleted
+
+    And the summary new should be 0
+    And the summary total should be 0
+    And the summary new for type "warning" should be 0
+    And the summary total for type "warning" should be 0
+
+    And icinga should receive:
+      """
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
+      [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
+      """

data/features/overview-page.feature

@@ -41,7 +41,7 @@ Feature: Log monitor server overview
 
     Then I should see 1 summary
     And the 1st summary should be:
-      | name     | value                 |
-      | service  | service               |
-      | alerts   | 2                     |
-      | detail   | 1 warning, 1 critical |
+      | name     | value                     |
+      | service  | service                   |
+      | new      | 2 (1 warning, 1 critical) |
+      | total    | 2 (1 warning, 1 critical) |

data/features/service-host-page.feature

@@ -49,6 +49,7 @@ Feature: View and manipulate all events for a service/host combo
 
     Then I should see 2 events
     And I should see a button "mark all as seen"
+    And I should see a button "delete all"
 
     And the summary new should be 2
     And the summary total should be 2
@@ -57,7 +58,6 @@ Feature: View and manipulate all events for a service/host combo
 
     And icinga should receive:
       """
-      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 2 warning
       """
@@ -71,6 +71,7 @@ Feature: View and manipulate all events for a service/host combo
 
     Then I should see 2 events
     And I should not see a button "mark all as unseen"
+    And I should see a button "delete all"
 
     And the summary new should be 0
     And the summary total should be 2
@@ -79,10 +80,54 @@ Feature: View and manipulate all events for a service/host combo
 
     And icinga should receive:
       """
-      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
       [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 2 warning
       [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
       """
 
+  Scenario: Delete all unseen
 
+    Given the time is 20
+
+    When I visit /service-host/service/class/host
+    And I click "delete all"
+
+    Then I should not see any events
+    And I should not see a button "mark all as seen"
+    And I should not see a button "delete all"
+
+    And the summary new should be 0
+    And the summary total should be 0
+    And the summary new for type "warning" should be 0
+    And the summary total for type "warning" should be 0
+
+    And icinga should receive:
+      """
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 2 warning
+      [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
+      """
+
+  Scenario: Delete all seen
+
+    Given the time is 20
+
+    When I visit /service-host/service/class/host
+    And I click "mark all as seen"
+    And I click "delete all"
+
+    Then I should not see any events
+    And I should not see a button "mark all as unseen"
+    And I should not see a button "delete all"
+
+    And the summary new should be 0
+    And the summary total should be 0
+    And the summary new for type "warning" should be 0
+    And the summary total for type "warning" should be 0
+
+    And icinga should receive:
+      """
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
+      [10] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 2 warning
+      [20] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
+      """

data/features/support/steps.rb

@@ -129,6 +129,14 @@ Then /^the event status should be "(.*?)"$/ do
 
 end
 
+Then /^the event should be deleted$/ do
+
+	event = get_event @event_id
+
+	event.should be_nil
+
+end
+
 Then /^the summary new should be (\d+)$/ do
 	|count_str|
 

data/features/support/ui-steps.rb

@@ -17,6 +17,13 @@ When /^I click "(.*?)"$/ do
 
 end
 
+Then /^I should be sent to (\/.*)$/ do
+	|expected_url|
+
+	current_path.should == expected_url
+
+end
+
 Then /^I should see no summaries$/ do
 	page.should have_content "No events have been logged"
 end
@@ -56,6 +63,11 @@ Then /^I should see (\d+) events$/ do
 
 end
 
+Then /^I should not see any events$/ do
+	all("#events")
+	# TODO
+end
+
 Then /^I should see a button "(.*?)"$/ do
 	|label|
 

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

@@ -28,20 +28,15 @@ class Script
 						summaries["types"].each do
 							|type_name, type_info|
 
-							type_elem =
-								service_elem.find_first("
-									type [@name = #{esc_xp type_name}]
-								")
-
-							if ! type_elem
-								unknown_count += type_info["new"]
-							elsif type_elem["level"] == "critical"
+							case level_for_type service_name, type_name
+							when "critical"
 								critical_count += type_info["new"]
-							elsif type_elem["level"] == "warning"
+							when "warning"
 								warning_count += type_info["new"]
 							else
 								unknown_count += type_info["new"]
 							end
+
 						end
 					end
 

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

@@ -23,6 +23,25 @@ class Script
 
 		end
 
+		if req.request_method == "POST" \
+			&& req.params["delete"]
+
+			event =
+				delete_event context[:event_id]
+
+			resp =
+				Rack::Response.new
+
+			resp.redirect "/service-host/%s/%s/%s" % [
+				event["source"]["service"],
+				event["source"]["class"],
+				event["source"]["host"],
+			]
+
+			return resp
+
+		end
+
 		# read from database
 
 		event =
@@ -80,8 +99,9 @@ class Script
 			]),
 		]
 		html << "<li><a href=\"%s\">Host</a></li>\n" % [
-			esc_ht("/service/%s/host/%s" % [
+			esc_ht("/service-host/%s/%s/%s" % [
 				event["source"]["service"],
+				event["source"]["class"],
 				event["source"]["host"],
 			])
 		]
@@ -234,6 +254,12 @@ class Script
 
 		end
 
+		html <<
+			"<input " +
+				"type=\"submit\" " +
+				"name=\"delete\" " +
+				"value=\"delete\">\n"
+
 		html << "</p>\n"
 
 		html << "</form>\n"

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

@@ -124,6 +124,136 @@ class Script
 
 	end
 
+	def delete_event event_id
+
+		# fetch it
+
+		event = get_event event_id
+
+		return nil unless event
+
+		# delete it
+
+		@db["events"].remove({
+			"_id" => event["_id"],
+		})
+
+		event_count =
+			@db.get_last_error["n"]
+
+		return event unless event_count > 0
+
+		# update summary
+
+		case event["status"]
+
+		when "unseen"
+
+			@db["summaries"].update(
+				{ "_id" => event["source"] },
+				{ "$inc" => {
+					"combined.new" => -1,
+					"combined.total" => -1,
+					"types.#{event["type"]}.new" => -1,
+					"types.#{event["type"]}.total" => -1,
+				} }
+			)
+
+		when "seen"
+
+			@db["summaries"].update(
+				{ "_id" => event["source"] },
+				{ "$inc" => {
+					"combined.total" => -1,
+					"types.#{event["type"]}.total" => -1,
+				} }
+			)
+
+		else
+
+			raise "Error 3084789190"
+
+		end
+
+		# notify icinga checks
+
+		do_checks
+
+		# and return
+
+		return event
+
+	end
+
+	def delete_all source
+
+		# get types
+
+		query = {
+			"source.service" => source["service"],
+			"source.class" => source["class"],
+			"source.host" => source["host"],
+		}
+
+		types =
+			@db["events"].distinct "type", query
+
+		types.each do
+			|type|
+
+			# delete events
+
+			query = {
+				"source.service" => source["service"],
+				"source.class" => source["class"],
+				"source.host" => source["host"],
+				"status" => "unseen",
+				"type" => type,
+			}
+
+			@db["events"].remove query
+
+			unseen_count =
+				@db.get_last_error["n"]
+
+			query = {
+				"source.service" => source["service"],
+				"source.class" => source["class"],
+				"source.host" => source["host"],
+				"status" => "seen",
+				"type" => type,
+			}
+
+			@db["events"].remove query
+
+			seen_count =
+				@db.get_last_error["n"]
+
+			# update summaries
+
+			@db["summaries"].update(
+				{
+					"_id.service" => source["service"],
+					"_id.class" => source["class"],
+					"_id.host" => source["host"],
+				}, {
+					"$inc" => {
+						"combined.new" => - unseen_count,
+						"combined.total" => - unseen_count - seen_count,
+						"types.#{type}.new" => - unseen_count,
+						"types.#{type}.total" => - unseen_count - seen_count,
+					}
+				}
+			)
+
+		end
+
+		# notify icinga checks
+
+		do_checks
+
+	end
+
 	def get_summaries_by_service
 
 		summaries_by_service = {}
@@ -136,7 +266,9 @@ class Script
 
 			summary_by_service =
 				summaries_by_service[service] ||= {
-					"service" => service,
+					"_id" => {
+						"service" => service,
+					},
 					"combined" => { "new" => 0, "total" => 0 },
 					"types" => {},
 				}

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

@@ -0,0 +1,135 @@
+require "hq/tools/escape"
+
+module HQ
+module LogMonitorServer
+
+class Script
+
+	include Tools::Escape
+
+	def status_breakdown summary, status
+
+		if summary["combined"][status] == 0
+
+			return "0"
+
+		else
+
+			return "%s (%s)" % [
+
+				summary["combined"][status].to_s,
+
+				summary["types"]
+					.select {
+						|type, counts|
+						counts[status] > 0
+					}
+					.map {
+						|type, counts|
+						"%s %s" % [ counts[status], type ]
+					}
+					.join(", ")
+
+			]
+
+		end
+
+	end
+
+	def level_for_type service_name, type_name
+
+		service_elem =
+			@icinga_elem.find_first("
+				service [@name = #{esc_xp service_name}]
+			")
+
+		return nil unless service_elem
+
+		type_elem =
+			service_elem.find_first("
+				type [@name = #{esc_xp type_name}]
+			")
+
+		return nil unless type_elem
+
+		level = type_elem["level"]
+
+		return level == "" ? nil : level
+
+
+	end
+
+	def class_for_level level
+
+		case level
+
+			when "critical"
+				return "error"
+
+			when "warning"
+				return "warning"
+
+		end
+
+	end
+
+	def class_for_type service, type
+
+		level = level_for_type service, type
+
+		return class_for_level level
+
+	end
+
+	def class_for_event event
+
+		return nil \
+			unless event["status"] == "unseen"
+
+		return class_for_type \
+			event["source"]["service"],
+			event["type"]
+
+	end
+
+	def level_for_summary summary
+
+		critical = false
+		warning = false
+
+		summary["types"].each do
+			|type_name, type_info|
+
+			next unless type_info["new"] > 0
+
+			case level_for_type summary["_id"]["service"], type_name
+
+			when "critical"
+				critical = true
+
+			when "warning"
+				warning = true
+
+			end
+
+		end
+
+		return "critical" if critical
+		return "warning" if warning
+
+		return nil
+
+	end
+
+	def class_for_summary summary
+
+		level = level_for_summary summary
+
+		return class_for_level level
+
+	end
+
+end
+
+end
+end

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

@@ -66,8 +66,8 @@ class Script
 
 			html << "<tr>\n"
 			html << "<th>Service</th>\n"
-			html << "<th>Alerts</th>\n"
-			html << "<th>Details</th>\n"
+			html << "<th>New</th>\n"
+			html << "<th>Total</th>\n"
 			html << "<th>View</th>\n"
 			html << "</tr>\n"
 
@@ -77,29 +77,29 @@ class Script
 			summaries_by_service.each do
 				|service, summary|
 
-				html << "<tr class=\"summary\">\n"
+				html << "<tr class=\"%s\">\n" % [
+					esc_ht([
+						"summary",
+						class_for_summary(summary),
+					].compact.join(" "))
+				]
 
 				html << "<td class=\"service\">%s</td>\n" % [
-					esc_ht(summary["service"]),
+					esc_ht(summary["_id"]["service"]),
 				]
 
-				html << "<td class=\"alerts\">%s</td>\n" % [
-					esc_ht(summary["combined"]["new"].to_s),
+				html << "<td class=\"new\">%s</td>\n" % [
+					esc_ht(status_breakdown(summary, "new")),
 				]
 
-				html << "<td class=\"detail\">%s</td>\n" % [
-					esc_ht(
-						summary["types"].map {
-							|type, counts|
-							"%s %s" % [ counts["new"], type ]
-						}.join ", "
-					),
+				html << "<td class=\"total\">%s</td>\n" % [
+					esc_ht(status_breakdown(summary, "total")),
 				]
 
 				html << "<td class=\"view\">%s</td>\n" % [
 					"<a href=\"%s\">view</a>" % [
 						"/service/%s" % [
-							esc_ue(summary["service"]),
+							esc_ue(summary["_id"]["service"]),
 						],
 					],
 				]

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

@@ -210,6 +210,7 @@ end
 require "hq/log-monitor-server/do-checks"
 require "hq/log-monitor-server/event-page"
 require "hq/log-monitor-server/logic"
+require "hq/log-monitor-server/misc"
 require "hq/log-monitor-server/overview-page"
 require "hq/log-monitor-server/service-host-page"
 require "hq/log-monitor-server/service-page"

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

@@ -22,6 +22,13 @@ class Script
 
 		end
 
+		if req.request_method == "POST" \
+			&& req.params["delete-all"]
+
+			delete_all source
+
+		end
+
 		# read from database
 
 		events =
@@ -97,8 +104,10 @@ class Script
 		]
 
 		if events.empty?
+
 			html << "<p>No events have been logged for this service on this " +
 				"host</p>\n"
+
 		else
 
 			html << "<table id=\"events\" class=\"table table-striped\">\n"
@@ -121,7 +130,12 @@ class Script
 			events.each do
 				|event|
 
-				html << "<tr class=\"event\">\n"
+				html << "<tr class=\"%s\">\n" % [
+					[
+						"event",
+						class_for_event(event),
+					].compact.join(" "),
+				]
 
 				html << "<td class=\"timestamp\">%s</td>\n" % [
 					esc_ht(event["timestamp"].to_s),
@@ -175,6 +189,12 @@ class Script
 
 			end
 
+			html <<
+				"<input " +
+					"type=\"submit\" " +
+					"name=\"delete-all\" " +
+					"value=\"delete all\">\n"
+
 			html << "</p>\n"
 
 			html << "</form>\n"

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

@@ -76,8 +76,8 @@ class Script
 			html << "<tr>\n"
 			html << "<th>Host</th>\n"
 			html << "<th>Class</th>\n"
-			html << "<th>Alerts</th>\n"
-			html << "<th>Details</th>\n"
+			html << "<th>New</th>\n"
+			html << "<th>Total</th>\n"
 			html << "<th>View</th>\n"
 			html << "</tr>\n"
 
@@ -87,7 +87,12 @@ class Script
 			summaries.each do
 				|summary|
 
-				html << "<tr class=\"summary\">\n"
+				html << "<tr class=\"%s\">\n" % [
+					esc_ht([
+						"summary",
+						class_for_summary(summary),
+					].compact.join(" "))
+				]
 
 				html << "<td class=\"host\">%s</td>\n" % [
 					esc_ht(summary["_id"]["host"]),
@@ -97,17 +102,12 @@ class Script
 					esc_ht(summary["_id"]["class"]),
 				]
 
-				html << "<td class=\"alerts\">%s</td>\n" % [
-					esc_ht(summary["combined"]["new"].to_s),
+				html << "<td class=\"new\">%s</td>\n" % [
+					esc_ht(status_breakdown(summary, "new")),
 				]
 
-				html << "<td class=\"detail\">%s</td>\n" % [
-					esc_ht(
-						summary["types"].map {
-							|type, counts|
-							"%s %s" % [ counts["new"], type ]
-						}.join ", "
-					),
+				html << "<td class=\"total\">%s</td>\n" % [
+					esc_ht(status_breakdown(summary, "total")),
 				]
 
 				html << "<td class=\"view\">%s</td>\n" % [

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

@@ -0,0 +1,198 @@
+require "hq/log-monitor-server/misc"
+
+module HQ
+module LogMonitorServer
+
+describe Script do
+
+	context "#status_breakdown" do
+
+		it "shows 0 if the combined amount is 0" do
+			summary = {
+				"combined" => { "new" => 0 },
+			}
+			ret = subject.status_breakdown summary, "new"
+			ret.should == "0"
+		end
+
+		it "shows a breakdown if the combined amount is greater than 0" do
+			summary = {
+				"combined" => { "new" => 3 },
+				"types" => {
+					"type1" => { "new" => 1 },
+					"type2" => { "new" => 2 },
+				},
+			}
+			ret = subject.status_breakdown summary, "new"
+			ret.should == "3 (1 type1, 2 type2)"
+		end
+
+	end
+
+	context "#level_for_type" 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\"/>
+					</icinga>
+				")
+
+			ret = subject.level_for_type "service", "type"
+
+			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.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.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
+
+	context "#level_for_summary" do
+
+		before do
+
+			subject.instance_variable_set \
+				"@icinga_elem",
+				XML::Document.string("
+					<icinga>
+						<service name=\"service\">
+							<type name=\"critical\" level=\"critical\"/>
+							<type name=\"warning\" level=\"warning\"/>
+						</service>
+					</icinga>
+				")
+
+		end
+
+		it "returns critical if any are critical" do
+
+			summary = {
+				"_id" => {
+					"service" => "service",
+				},
+				"types" => {
+					"critical" => { "new" => 1 },
+					"warning" => { "new" => 1 },
+					"other" => { "new" => 1 },
+				},
+			}
+
+			ret = subject.level_for_summary summary
+
+			ret.should == "critical"
+
+		end
+
+		it "returns warning if any are warning but none are critical" do
+
+			summary = {
+				"_id" => {
+					"service" => "service",
+				},
+				"types" => {
+					"warning" => { "new" => 1 },
+					"other" => { "new" => 1 },
+				},
+			}
+
+			ret = subject.level_for_summary summary
+
+			ret.should == "warning"
+
+		end
+
+		it "returns nil if there none are warning or critical" do
+
+			summary = {
+				"_id" => {
+					"service" => "service",
+				},
+				"types" => {
+					"other" => { "new" => 1 },
+				},
+			}
+
+			ret = subject.level_for_summary summary
+
+			ret.should be_nil
+
+		end
+
+	end
+
+end
+
+end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-server
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - James Pharaoh
@@ -14,209 +13,183 @@ 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
@@ -231,6 +204,7 @@ files:
 - lib/hq/log-monitor-server/do-checks.rb
 - lib/hq/log-monitor-server/submit-log-event.rb
 - lib/hq/log-monitor-server/script.rb
+- lib/hq/log-monitor-server/misc.rb
 - lib/hq/log-monitor-server/service-host-page.rb
 - lib/hq/log-monitor-server/service-page.rb
 - lib/hq/log-monitor-server/event-page.rb
@@ -242,30 +216,30 @@ files:
 - features/support/steps.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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HQ log monitor server
 test_files:
 - features/event-page.feature
@@ -275,3 +249,4 @@ test_files:
 - features/support/steps.rb
 - features/support/env.rb
 - features/support/ui-steps.rb
+- spec/hq/log-monitor-server/misc-spec.rb