Merging upstream version 1.31.0.

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

1 files changed, 25 insertions, 19 deletions

diff --git a/health/health.d/whoisquery.conf b/health/health.d/whoisquery.conf
index 36ae02fa2..c6d3a9de0 100644
--- a/health/health.d/whoisquery.conf
+++ b/health/health.d/whoisquery.conf
@@ -1,24 +1,30 @@
 
 # make sure whoisquery is running
 
-template: whoisquery_last_collected_secs
-      on: whoisquery.time_until_expiration
-    calc: $now - $last_collected_t
-   units: seconds ago
-   every: 60s
-    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: webmaster
+ template: whoisquery_last_collected_secs
+       on: whoisquery.time_until_expiration
+    class: Other
+component: WHOIS
+     type: Latency
+     calc: $now - $last_collected_t
+    units: seconds ago
+    every: 60s
+     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: webmaster
 
 
-template: whoisquery_days_until_expiration
-      on: whoisquery.time_until_expiration
-   calc:  $expiry
-   units: seconds
-   every: 60s
-    warn: $this < $days_until_expiration_warning*24*60*60
-    crit: $this < $days_until_expiration_critical*24*60*60
-    info: time until the domain name registration expires
-      to: webmaster
+ template: whoisquery_days_until_expiration
+       on: whoisquery.time_until_expiration
+    class: Other
+component: WHOIS
+     type: Utilization
+     calc: $expiry
+    units: seconds
+    every: 60s
+     warn: $this < $days_until_expiration_warning*24*60*60
+     crit: $this < $days_until_expiration_critical*24*60*60
+     info: time until the domain name registration expires
+       to: webmaster