hq-log-monitor-server 0.3.0 → 0.4.0

data/features/event-page.feature

@@ -16,7 +16,7 @@ Feature: View and manipulate a single event
       </log-monitor-server-config>
       """
 
-    And the time is 100
+    And the time is 10
 
     And I submit the following event:
       """
@@ -37,6 +37,9 @@ Feature: View and manipulate a single event
     When I visit /event/${event-id}
 
     Then I should see the event
+    And I should see a button "mark as seen"
+    And I should not see a button "mark as unseen"
+
     And the event status should be "unseen"
 
     And the summary new should be 1
@@ -46,12 +49,15 @@ Feature: View and manipulate a single event
 
 Scenario: Mark as seen
 
-    Given the time is 200
+    Given the time is 20
 
     When I visit /event/${event-id}
     And I click "mark as seen"
 
     Then I should see the event
+    And I should see a button "mark as unseen"
+    And I should not see a button "mark as seen"
+
     And the event status should be "seen"
 
     And the summary new should be 0
@@ -61,7 +67,34 @@ Scenario: Mark as seen
 
     And icinga should receive:
       """
-      [100] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
-      [100] PROCESS_SERVICE_CHECK_RESULT;host;service;1;WARNING 1 warning
-      [200] PROCESS_SERVICE_CHECK_RESULT;host;service;0;OK no new events
+      [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
+      """
+
+Scenario: Mark as unseen
+
+    Given the time is 20
+
+    When I visit /event/${event-id}
+    And I click "mark as seen"
+    And I click "mark as unseen"
+
+    Then I should see the event
+    And I should see a button "mark as seen"
+    And I should not see a button "mark as unseen"
+
+    And the event status should be "unseen"
+
+    And the summary new should be 1
+    And the summary total should be 1
+    And the summary new for type "warning" should be 1
+    And the summary total for type "warning" should be 1
+
+    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
       """

data/features/support/ui-steps.rb

@@ -48,3 +48,19 @@ Then /^I should see the event$/ do
 	find("#event #id td").text.should == @event_id.to_s
 
 end
+
+Then /^I should see a button "(.*?)"$/ do
+	|label|
+
+	find_button(label).should_not be_nil
+
+end
+
+Then /^I should not see a button "(.*?)"$/ do
+	|label|
+
+	expect {
+		find_button(label)
+	}.to raise_error Capybara::ElementNotFound
+
+end

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

@@ -16,6 +16,13 @@ class Script
 
 		end
 
+		if req.request_method == "POST" \
+			&& req.params["mark-as-unseen"]
+
+			mark_event_as_unseen context[:event_id]
+
+		end
+
 		# read from database
 
 		event =
@@ -77,6 +84,13 @@ class Script
 			]
 			html << "</tr>\n"
 
+			html << "<tr>\n"
+			html << "<th>Status</th>\n"
+			html << "<td>%s</td>\n" % [
+				esc_ht(event["status"].to_s),
+			]
+			html << "</tr>\n"
+
 			html << "<tr>\n"
 			html << "<th>Service</th>\n"
 			html << "<td>%s</td>\n" % [
@@ -108,7 +122,7 @@ class Script
 			html << "<tr>\n"
 			html << "<th>Line number</th>\n"
 			html << "<td>%s</td>\n" % [
-				esc_ht((event["location"]["line"] + 1).to_s),
+				esc_ht((event["location"]["line"].to_i + 1).to_s),
 			]
 			html << "</tr>\n"
 
@@ -149,13 +163,29 @@ class Script
 
 		html << "<form method=\"post\">\n"
 
-		html <<
-			"<p>" +
-			"<input " +
-				"type=\"submit\" " +
-				"name=\"mark-as-seen\" " +
-				"value=\"mark as seen\">" +
-			"</p>\n"
+		html << "<p>\n"
+
+		if event["status"] != "seen"
+
+			html <<
+				"<input " +
+					"type=\"submit\" " +
+					"name=\"mark-as-seen\" " +
+					"value=\"mark as seen\">\n"
+
+		end
+
+		if event["status"] != "unseen"
+
+			html <<
+				"<input " +
+					"type=\"submit\" " +
+					"name=\"mark-as-unseen\" " +
+					"value=\"mark as unseen\">\n"
+
+		end
+
+		html << "</p>\n"
 
 		html << "</form>\n"
 

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

@@ -37,6 +37,32 @@ class Script
 
 	end
 
+	def mark_event_as_unseen event_id
+
+		event = get_event event_id
+
+		return if event["status"] == "unseen"
+
+		event["status"] = "unseen"
+
+		@db["events"].save event
+
+		# update summary
+
+		@db["summaries"].update(
+			{ "_id" => event["source"] },
+			{ "$inc" => {
+				"combined.new" => 1,
+				"types.#{event["type"]}.new" => 1,
+			} }
+		)
+
+		# notify icinga checks
+
+		do_checks
+
+	end
+
 	def get_summaries_by_service
 
 		summaries_by_service = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !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