Merging upstream version 1.32.0.

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

1 files changed, 52 insertions, 68 deletions

diff --git a/health/health.d/vernemq.conf b/health/health.d/vernemq.conf
index 737147f38..cfbe2a524 100644
--- a/health/health.d/vernemq.conf
+++ b/health/health.d/vernemq.conf
@@ -1,27 +1,11 @@
 
-# Availability
-
- template: vernemq_last_collected_secs
-       on: vernemq.node_uptime
-    class: Messaging
-component: VerneMQ
-     type: Latency
-     calc: $now - $last_collected_t
-    units: seconds ago
-    every: 10s
-     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
-
 # Socket errors
 
  template: vernemq_socket_errors
        on: vernemq.socket_errors
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: sum -1m unaligned absolute of socket_error
     units: errors
     every: 1m
@@ -34,9 +18,9 @@ component: VerneMQ
 
  template: vernemq_queue_message_drop
        on: vernemq.queue_undelivered_messages
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute of queue_message_drop
     units: dropped messages
     every: 1m
@@ -47,9 +31,9 @@ component: VerneMQ
 
  template: vernemq_queue_message_expired
        on: vernemq.queue_undelivered_messages
-    class: Messaging
+    class: Latency
+     type: Messaging
 component: VerneMQ
-     type: Latency
    lookup: average -1m unaligned absolute of queue_message_expired
     units: expired messages
     every: 1m
@@ -60,9 +44,9 @@ component: VerneMQ
 
  template: vernemq_queue_message_unhandled
        on: vernemq.queue_undelivered_messages
-    class: Messaging
+    class: Latency
+     type: Messaging
 component: VerneMQ
-     type: Latency
    lookup: average -1m unaligned absolute of queue_message_unhandled
     units: unhandled messages
     every: 1m
@@ -75,9 +59,9 @@ component: VerneMQ
 
  template: vernemq_average_scheduler_utilization
        on: vernemq.average_scheduler_utilization
-    class: Messaging
+    class: Utilization
+     type: Messaging
 component: VerneMQ
-     type: Utilization
    lookup: average -10m unaligned
     units: %
     every: 1m
@@ -91,9 +75,9 @@ component: VerneMQ
 
  template: vernemq_cluster_dropped
        on: vernemq.cluster_dropped
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: sum -1m unaligned
     units: KiB
     every: 1m
@@ -104,9 +88,9 @@ component: VerneMQ
 
  template: vernemq_netsplits
        on: vernemq.netsplits
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: sum -1m unaligned absolute of netsplit_detected
     units: netsplits
     every: 10s
@@ -119,9 +103,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_connack_sent_reason_unsuccessful
        on: vernemq.mqtt_connack_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -134,9 +118,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_disconnect_received_reason_not_normal
        on: vernemq.mqtt_disconnect_received_reason
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute match-names of !normal_disconnect,*
     units: packets
     every: 1m
@@ -147,9 +131,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_disconnect_sent_reason_not_normal
        on: vernemq.mqtt_disconnect_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !normal_disconnect,*
     units: packets
     every: 1m
@@ -162,9 +146,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_subscribe_error
        on: vernemq.mqtt_subscribe_error
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute
     units: failed ops
     every: 1m
@@ -175,9 +159,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_subscribe_auth_error
        on: vernemq.mqtt_subscribe_auth_error
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute
     units: attempts
     every: 1m
@@ -190,9 +174,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_unsubscribe_error
        on: vernemq.mqtt_unsubscribe_error
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute
     units: failed ops
     every: 1m
@@ -205,9 +189,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_publish_errors
        on: vernemq.mqtt_publish_errors
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute
     units: failed ops
     every: 1m
@@ -218,9 +202,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_publish_auth_errors
        on: vernemq.mqtt_publish_auth_errors
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute
     units: attempts
     every: 1m
@@ -233,9 +217,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_puback_received_reason_unsuccessful
        on: vernemq.mqtt_puback_received_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -246,9 +230,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_puback_sent_reason_unsuccessful
        on: vernemq.mqtt_puback_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -259,9 +243,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_puback_unexpected
        on: vernemq.mqtt_puback_invalid_error
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute
     units: messages
     every: 1m
@@ -274,9 +258,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubrec_received_reason_unsuccessful
        on: vernemq.mqtt_pubrec_received_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -287,9 +271,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubrec_sent_reason_unsuccessful
        on: vernemq.mqtt_pubrec_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -300,9 +284,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubrec_invalid_error
        on: vernemq.mqtt_pubrec_invalid_error
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute
     units: messages
     every: 1m
@@ -315,9 +299,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubrel_received_reason_unsuccessful
        on: vernemq.mqtt_pubrel_received_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -328,9 +312,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubrel_sent_reason_unsuccessful
        on: vernemq.mqtt_pubrel_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -343,9 +327,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubcomp_received_reason_unsuccessful
        on: vernemq.mqtt_pubcomp_received_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -356,9 +340,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubcomp_sent_reason_unsuccessful
        on: vernemq.mqtt_pubcomp_sent_reason
-    class: Messaging
+    class: Errors
+     type: Messaging
 component: VerneMQ
-     type: Errors
    lookup: average -1m unaligned absolute match-names of !success,*
     units: packets
     every: 1m
@@ -369,9 +353,9 @@ component: VerneMQ
 
  template: vernemq_mqtt_pubcomp_unexpected
        on: vernemq.mqtt_pubcomp_invalid_error
-    class: Messaging
+    class: Workload
+     type: Messaging
 component: VerneMQ
-     type: Workload
    lookup: average -1m unaligned absolute
     units: messages
     every: 1m