Merging upstream version 1.32.0.

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

1 files changed, 6 insertions, 20 deletions

diff --git a/health/health.d/portcheck.conf b/health/health.d/portcheck.conf
index b977dbb31..8cbd7729c 100644
--- a/health/health.d/portcheck.conf
+++ b/health/health.d/portcheck.conf
@@ -1,25 +1,11 @@
- template: portcheck_last_collected_secs
- families: *
-       on: portcheck.status
-    class: Other
-component: TCP 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: portcheck_service_reachable
  families: *
        on: portcheck.status
-    class: Other
+    class: Workload
+     type: Other
 component: TCP endpoint
-     type: Workload
    lookup: average -1m unaligned percentage of success
      calc: ($this < 75) ? (0) : ($this)
     every: 5s
@@ -30,9 +16,9 @@ component: TCP endpoint
  template: portcheck_connection_timeouts
  families: *
        on: portcheck.status
-    class: Other
+    class: Errors
+     type: Other
 component: TCP endpoint
-     type: Errors
    lookup: average -5m unaligned percentage of timeout
     every: 10s
     units: %
@@ -45,9 +31,9 @@ component: TCP endpoint
  template: portcheck_connection_fails
  families: *
        on: portcheck.status
-    class: Other
+    class: Errors
+     type: Other
 component: TCP endpoint
-     type: Errors
    lookup: average -5m unaligned percentage of no_connection,failed
     every: 10s
     units: %