hq-log-monitor-server 0.5.1 → 0.6.0

data/features/service-host-page.feature

@@ -0,0 +1,88 @@
+Feature: View and manipulate all events for a service/host combo
+
+  Background:
+
+    Given the log monitor server config:
+      """
+      <log-monitor-server-config>
+        <server port="${port}"/>
+        <db host="${db-host}" port="${db-port}" name="${db-name}"/>
+        <icinga command-file="${command-file}">
+          <service name="service" icinga-host="host" icinga-service="service">
+            <type name="warning" level="warning"/>
+            <type name="critical" level="critical"/>
+          </service>
+        </icinga>
+        <assets bootstrap=""/>
+      </log-monitor-server-config>
+      """
+
+    And the time is 10
+
+    And I submit the following events:
+      """
+      {
+        type: warning,
+        source: { class: class, host: host, service: service },
+        location: { file: logfile, line: 0 },
+        lines: {
+          before: [],
+          matching: WARNING blah,
+          after: [],
+        }
+      },
+      {
+        type: warning,
+        source: { class: class, host: host, service: service },
+        location: { file: logfile, line: 0 },
+        lines: {
+          before: [],
+          matching: WARNING blah,
+          after: [],
+        }
+      },
+      """
+
+  Scenario: View the events
+
+    When I visit /service-host/service/class/host
+
+    Then I should see 2 events
+    And I should see a button "mark all as seen"
+
+    And the summary new should be 2
+    And the summary total should be 2
+    And the summary new for type "warning" should be 2
+    And the summary total for type "warning" should be 2
+
+    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
+      """
+
+  Scenario: Mark all as seen
+
+    Given the time is 20
+
+    When I visit /service-host/service/class/host
+    And I click "mark all as seen"
+
+    Then I should see 2 events
+    And I should not see a button "mark all as unseen"
+
+    And the summary new should be 0
+    And the summary total should be 2
+    And the summary new for type "warning" should be 0
+    And the summary total for type "warning" should be 2
+
+    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
+      """
+
+

data/features/support/ui-steps.rb

@@ -49,6 +49,13 @@ Then /^I should see the event$/ do
 
 end
 
+Then /^I should see (\d+) events$/ do
+	|count_str|
+
+	all("#events tbody tr").count.should == count_str.to_i
+
+end
+
 Then /^I should see a button "(.*?)"$/ do
 	|label|
 

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

@@ -37,6 +37,67 @@ class Script
 
 	end
 
+	def mark_all_as_seen source
+
+		# get types
+
+		query = {
+			"source.service" => source["service"],
+			"source.class" => source["class"],
+			"source.host" => source["host"],
+			"status" => "unseen",
+		}
+
+		types =
+			@db["events"].distinct "type", query
+
+		types.each do
+			|type|
+
+			# update events
+
+			query = {
+				"source.service" => source["service"],
+				"source.class" => source["class"],
+				"source.host" => source["host"],
+				"status" => "unseen",
+				"type" => type,
+			}
+
+			update = {
+				"$set" => {
+					"status" => "seen",
+				},
+			}
+
+			@db["events"].update query, update, :multi => true
+
+			event_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" => -event_count,
+						"types.#{type}.new" => -event_count,
+					}
+				}
+			)
+
+		end
+
+		# notify icinga checks
+
+		do_checks
+
+	end
+
 	def mark_event_as_unseen event_id
 
 		event = get_event event_id

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

@@ -13,7 +13,7 @@ class Script
 
 		headers["content-type"] = "text/html; charset=utf-8"
 
-		html << "<! DOCTYPE html>\n"
+		html << "<!DOCTYPE html>\n"
 		html << "<html>\n"
 		html << "<head>\n"
 

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

@@ -155,8 +155,8 @@ class Script
 		when /^\/service\/([^\/]+)$/
 			service_page env, :service => $1
 
-		when /^\/service\/([^\/]+)\/host\/([^\/]+)$/
-			service_host_page env, :service => $1, :host => $2
+		when /^\/service-host\/([^\/]+)\/([^\/]+)\/([^\/]+)$/
+			service_host_page env, :service => $1, :class => $2, :host => $3
 
 		when /^\/event\/([^\/]+)$/
 			event_page env, :event_id => $1

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

@@ -5,11 +5,31 @@ class Script
 
 	def service_host_page env, context
 
+		req = Rack::Request.new env
+
+		source = {
+			"class" => context[:class],
+			"host" => context[:host],
+			"service" => context[:service],
+		}
+
+		# process form stuff
+
+		if req.request_method == "POST" \
+			&& req.params["mark-all-as-seen"]
+
+			mark_all_as_seen source
+
+		end
+
+		# read from database
+
 		events =
 			@db["events"]
 				.find({
-					"source.service" => context[:service],
-					"source.host" => context[:host],
+					"source.class" => source["class"],
+					"source.host" => source["host"],
+					"source.service" => source["service"],
 				})
 				.to_a
 
@@ -96,6 +116,8 @@ class Script
 			html << "</thead>\n"
 			html << "<tbody>\n"
 
+			unseen_count = 0
+
 			events.each do
 				|event|
 
@@ -131,11 +153,32 @@ class Script
 
 				html << "</tr>\n"
 
+				unseen_count += 1 \
+					if event["status"] == "unseen"
+
 			end
 
 			html << "</tbody>\n"
 			html << "</table>\n"
 
+			html << "<form method=\"post\">\n"
+
+			html << "<p>\n"
+
+			if unseen_count > 0
+
+				html <<
+					"<input " +
+						"type=\"submit\" " +
+						"name=\"mark-all-as-seen\" " +
+						"value=\"mark all as seen\">\n"
+
+			end
+
+			html << "</p>\n"
+
+			html << "</form>\n"
+
 		end
 
 		html << "</div>\n"

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

@@ -112,8 +112,9 @@ class Script
 
 				html << "<td class=\"view\">%s</td>\n" % [
 					"<a href=\"%s\">view</a>" % [
-						"/service/%s/host/%s" % [
+						"/service-host/%s/%s/%s" % [
 							esc_ue(summary["_id"]["service"]),
+							esc_ue(summary["_id"]["class"]),
 							esc_ue(summary["_id"]["host"]),
 						],
 					],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-server
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -236,6 +236,7 @@ files:
 - lib/hq/log-monitor-server/event-page.rb
 - lib/hq/log-monitor-server/logic.rb
 - features/event-page.feature
+- features/service-host-page.feature
 - features/submit-event.feature
 - features/overview-page.feature
 - features/support/steps.rb
@@ -268,6 +269,7 @@ specification_version: 3
 summary: HQ log monitor server
 test_files:
 - features/event-page.feature
+- features/service-host-page.feature
 - features/submit-event.feature
 - features/overview-page.feature
 - features/support/steps.rb