hq-check-site 0.2.0 → 0.3.0

data/features/config-edge-cases.feature

@@ -17,5 +17,5 @@ Feature: Function correctly in edge cases based on config file
     Given one server which responds in 0 seconds
     When check-site is run with config "no-path"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0s;2;4"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0

data/features/headers-auth.feature

@@ -27,16 +27,16 @@ Feature: Authenticate via custom HTTP headers
       </check-site-script>
       """
 
-  Scenario: Form based login success
+  Scenario: HTTP auth success
     Given one server which requires header based login
     When check-site is run with config "headers-auth"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0
 
-  Scenario: Form based login failure
+  Scenario: HTTP auth failure
     Given one server which requires header based login
     When check-site is run with config "default"
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 1 hosts found, 1 errors (500), 0.0s time"
+    And the message should be "Site CRITICAL: 1 hosts found, 1 errors (500), 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 2

data/features/http-auth.feature

@@ -17,12 +17,12 @@ Feature: Supply credentials via HTTP authentication
     Given one server which requires username "USER" and password "PASS"
     When check-site is run with config "http-auth"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0
 
   Scenario: Username and password are incorrect
     Given one server which requires username "USER" and password "SECRET"
     When check-site is run with config "http-auth"
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 1 hosts found, 1 errors (401), 0.0s time"
+    And the message should be "Site CRITICAL: 1 hosts found, 1 errors (401), 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 2

data/features/login-form.feature

@@ -24,5 +24,5 @@ Feature: Log in via an HTML form
     Given one server which requires form based login with "USER" and "PASS"
     When check-site is run with config "form-auth"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0

data/features/response-match.feature

@@ -17,7 +17,7 @@ Feature: Check for regex in HTTP response
     Given one server which responds with "-yes-"
     When check-site is run with config "regex"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0
 
   Scenario: Body does not contain regex
@@ -25,5 +25,5 @@ Feature: Check for regex in HTTP response
     And one server which responds with "-no-"
     When check-site is run with config "regex"
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 2 hosts found, 1 mismatches, 0.0s time"
+    And the message should be "Site CRITICAL: 2 hosts found, 1 mismatches, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 2

data/features/response-report.feature

@@ -21,7 +21,7 @@ Feature: Check for regex in HTTP response
     When check-site is run with config "report"
 
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 2 hosts found, 1 errors (500), 0.0s time"
+    And the message should be "Site CRITICAL: 2 hosts found, 1 errors (500), 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 2
 
   Scenario: One server to report
@@ -34,5 +34,5 @@ Feature: Check for regex in HTTP response
     When check-site is run with config "report"
 
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 4 hosts found, 3 errors (500), 0.0s time, response 'def'"
+    And the message should be "Site CRITICAL: 4 hosts found, 3 errors (500), 0.0s time, response 'def' | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 2

data/features/timeout.feature

@@ -28,7 +28,7 @@ Feature: Handle timeout correctly
     Given one server which responds in 0 seconds
     When check-site is run with config "default"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 0.0s time"
+    And the message should be "Site OK: 1 hosts found, 0.0s time | time=0.0s;2.0;4.0;0.0;10.0"
     And the status should be 0
 
   Scenario: Timeout expires

data/features/timings.feature

@@ -17,7 +17,7 @@ Feature: Return ok/warning/critical based on response time
     Given one server which responds in 1 second
     When check-site is run with config "default"
     Then all servers should receive page requests
-    And the message should be "Site OK: 1 hosts found, 1.0s time"
+    And the message should be "Site OK: 1 hosts found, 1.0s time | time=1.0s;2.0;4.0;0.0;10.0"
     And the status should be 0
 
   Scenario: Site responds in warning time
@@ -25,7 +25,7 @@ Feature: Return ok/warning/critical based on response time
     And one server which responds in 3 seconds
     When check-site is run with config "default"
     Then all servers should receive page requests
-    And the message should be "Site WARNING: 2 hosts found, 3.0s time (warning is 2.0)"
+    And the message should be "Site WARNING: 2 hosts found, 3.0s time (warning is 2.0) | time=3.0s;2.0;4.0;0.0;10.0"
     And the status should be 1
 
   Scenario: Site responds in critical time
@@ -34,5 +34,5 @@ Feature: Return ok/warning/critical based on response time
     And one server which responds in 5 seconds
     When check-site is run with config "default"
     Then all servers should receive page requests
-    And the message should be "Site CRITICAL: 3 hosts found, 5.0s time (critical is 4.0)"
+    And the message should be "Site CRITICAL: 3 hosts found, 5.0s time (critical is 4.0) | time=5.0s;2.0;4.0;0.0;10.0"
     And the status should be 2

data/lib/hq/check-site/script.rb

@@ -140,6 +140,19 @@ class Script < Tools::CheckScript
 
 		end
 
+		if @worst
+
+			performance \
+				"time",
+				@worst,
+				:units => "s",
+				:warning => @warning_time,
+				:critical => @critical_time,
+				:minimum => 0.0,
+				:maximum => @timeout_time
+
+		end
+
 	end
 
 	def check_address address

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-check-site
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hq-tools
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement