Merging upstream version 1.31.0.

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

1 files changed, 57 insertions, 45 deletions

diff --git a/health/health.d/tcp_resets.conf b/health/health.d/tcp_resets.conf
index af2a75252..41355dad6 100644
--- a/health/health.d/tcp_resets.conf
+++ b/health/health.d/tcp_resets.conf
@@ -4,54 +4,66 @@
 # -----------------------------------------------------------------------------
 # tcp resets this host sends
 
-   alarm: 1m_ipv4_tcp_resets_sent
-      on: ipv4.tcphandshake
-      os: linux
-   hosts: *
-  lookup: average -1m at -10s unaligned absolute of OutRsts
-   units: tcp resets/s
-   every: 10s
-    info: average number of sent TCP RESETS over the last minute
+    alarm: 1m_ipv4_tcp_resets_sent
+       on: ipv4.tcphandshake
+    class: System
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+   lookup: average -1m at -10s unaligned absolute of OutRsts
+    units: tcp resets/s
+    every: 10s
+     info: average number of sent TCP RESETS over the last minute
 
-   alarm: 10s_ipv4_tcp_resets_sent
-      on: ipv4.tcphandshake
-      os: linux
-   hosts: *
-  lookup: average -10s unaligned absolute of OutRsts
-   units: tcp resets/s
-   every: 10s
-    warn: $this > ((($1m_ipv4_tcp_resets_sent < 5)?(5):($1m_ipv4_tcp_resets_sent)) * (($status >= $WARNING)  ? (1) : (20)))
-   delay: up 20s down 60m multiplier 1.2 max 2h
- options: no-clear-notification
-    info: average number of sent TCP RESETS over the last 10 seconds. \
-          This can indicate a port scan, \
-          or that a service running on this host has crashed. \
-          Netdata will not send a clear notification for this alarm.
-      to: sysadmin
+    alarm: 10s_ipv4_tcp_resets_sent
+       on: ipv4.tcphandshake
+    class: System
+component: Network
+     type: Errors
+       os: linux
+    hosts: *
+   lookup: average -10s unaligned absolute of OutRsts
+    units: tcp resets/s
+    every: 10s
+     warn: $this > ((($1m_ipv4_tcp_resets_sent < 5)?(5):($1m_ipv4_tcp_resets_sent)) * (($status >= $WARNING)  ? (1) : (20)))
+    delay: up 20s down 60m multiplier 1.2 max 2h
+  options: no-clear-notification
+     info: average number of sent TCP RESETS over the last 10 seconds. \
+           This can indicate a port scan, \
+           or that a service running on this host has crashed. \
+           Netdata will not send a clear notification for this alarm.
+       to: sysadmin
 
 # -----------------------------------------------------------------------------
 # tcp resets this host receives
 
-   alarm: 1m_ipv4_tcp_resets_received
-      on: ipv4.tcphandshake
-      os: linux freebsd
-   hosts: *
-  lookup: average -1m at -10s unaligned absolute of AttemptFails
-   units: tcp resets/s
-   every: 10s
-    info: average number of received TCP RESETS over the last minute
+    alarm: 1m_ipv4_tcp_resets_received
+       on: ipv4.tcphandshake
+    class: System
+component: Network
+     type: Errors
+       os: linux freebsd
+    hosts: *
+   lookup: average -1m at -10s unaligned absolute of AttemptFails
+    units: tcp resets/s
+    every: 10s
+     info: average number of received TCP RESETS over the last minute
 
-   alarm: 10s_ipv4_tcp_resets_received
-      on: ipv4.tcphandshake
-      os: linux freebsd
-   hosts: *
-  lookup: average -10s unaligned absolute of AttemptFails
-   units: tcp resets/s
-   every: 10s
-    warn: $this > ((($1m_ipv4_tcp_resets_received < 5)?(5):($1m_ipv4_tcp_resets_received)) * (($status >= $WARNING)  ? (1) : (10)))
-   delay: up 20s down 60m multiplier 1.2 max 2h
- options: no-clear-notification
-    info: average number of received TCP RESETS over the last 10 seconds. \
-          This can be an indication that a service this host needs has crashed. \
-          Netdata will not send a clear notification for this alarm.
-      to: sysadmin
+    alarm: 10s_ipv4_tcp_resets_received
+       on: ipv4.tcphandshake
+    class: System
+component: Network
+     type: Errors
+       os: linux freebsd
+    hosts: *
+   lookup: average -10s unaligned absolute of AttemptFails
+    units: tcp resets/s
+    every: 10s
+     warn: $this > ((($1m_ipv4_tcp_resets_received < 5)?(5):($1m_ipv4_tcp_resets_received)) * (($status >= $WARNING)  ? (1) : (10)))
+    delay: up 20s down 60m multiplier 1.2 max 2h
+  options: no-clear-notification
+     info: average number of received TCP RESETS over the last 10 seconds. \
+           This can be an indication that a service this host needs has crashed. \
+           Netdata will not send a clear notification for this alarm.
+       to: sysadmin