Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 30 deletions

diff --git a/health/health.d/httpcheck.conf b/health/health.d/httpcheck.conf
index d4d6376a..599c47ac 100644
--- a/health/health.d/httpcheck.conf
+++ b/health/health.d/httpcheck.conf
@@ -1,25 +1,11 @@
- template: httpcheck_last_collected_secs
- families: *
-       on: httpcheck.status
-    class: Other
-component: HTTP endpoint
-     type: Latency
-     calc: $now - $last_collected_t
-    every: 10s
-    units: seconds ago
-     warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
-     crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
-    delay: down 5m multiplier 1.5 max 1h
-     info: number of seconds since the last successful data collection
-       to: sysadmin
 
 # This is a fast-reacting no-notification alarm ideal for custom dashboards or badges
  template: httpcheck_web_service_up
  families: *
        on: httpcheck.status
-    class: Web Server
+    class: Utilization
+     type: Web Server
 component: HTTP endpoint
-     type: Utilization
    lookup: average -1m unaligned percentage of success
      calc: ($this < 75) ? (0) : ($this)
     every: 5s
@@ -30,9 +16,9 @@ component: HTTP endpoint
  template: httpcheck_web_service_bad_content
  families: *
        on: httpcheck.status
-    class: Web Server
+    class: Workload
+     type: Web Server
 component: HTTP endpoint
-     type: Workload
    lookup: average -5m unaligned percentage of bad_content
     every: 10s
     units: %
@@ -46,9 +32,9 @@ component: HTTP endpoint
  template: httpcheck_web_service_bad_status
  families: *
        on: httpcheck.status
-    class: Web Server
+    class: Workload
+     type: Web Server
 component: HTTP endpoint
-     type: Workload
    lookup: average -5m unaligned percentage of bad_status
     every: 10s
     units: %
@@ -62,9 +48,9 @@ component: HTTP endpoint
  template: httpcheck_web_service_timeouts
  families: *
        on: httpcheck.status
-    class: Web Server
+    class: Latency
+     type: Web Server
 component: HTTP endpoint
-     type: Latency
    lookup: average -5m unaligned percentage of timeout
     every: 10s
     units: %
@@ -73,9 +59,9 @@ component: HTTP endpoint
  template: httpcheck_no_web_service_connections
  families: *
        on: httpcheck.status
-    class: Other
+    class: Errors
+     type: Other
 component: HTTP endpoint
-     type: Errors
    lookup: average -5m unaligned percentage of no_connection
     every: 10s
     units: %
@@ -85,9 +71,9 @@ component: HTTP endpoint
  template: httpcheck_web_service_unreachable
  families: *
        on: httpcheck.status
-    class: Web Server
+    class: Errors
+     type: Web Server
 component: HTTP endpoint
-     type: Errors
      calc: ($httpcheck_no_web_service_connections >= $httpcheck_web_service_timeouts) ? ($httpcheck_no_web_service_connections) : ($httpcheck_web_service_timeouts)
     units: %
     every: 10s
@@ -101,9 +87,9 @@ component: HTTP endpoint
  template: httpcheck_1h_web_service_response_time
  families: *
        on: httpcheck.responsetime
-    class: Other
+    class: Latency
+     type: Other
 component: HTTP endpoint
-     type: Latency
    lookup: average -1h unaligned of time
     every: 30s
     units: ms
@@ -112,9 +98,9 @@ component: HTTP endpoint
  template: httpcheck_web_service_slow
  families: *
        on: httpcheck.responsetime
-    class: Web Server
+    class: Latency
+     type: Web Server
 component: HTTP endpoint
-     type: Latency
    lookup: average -3m unaligned of time
     units: ms
     every: 10s