Adding upstream version 1.30.0.upstream/1.30.0

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

1 files changed, 58 insertions, 39 deletions

diff --git a/health/health.d/net.conf b/health/health.d/net.conf
index 261290e51..33202421f 100644
--- a/health/health.d/net.conf
+++ b/health/health.d/net.conf
@@ -12,7 +12,7 @@
      calc: ( $nic_speed_max > 0 ) ? ( $nic_speed_max) : ( nan )
     units: Mbit
     every: 10s
-     info: The current speed of the physical network interface
+     info: network interface current speed
 
  template: 1m_received_traffic_overflow
        on: net.net
@@ -20,13 +20,12 @@
     hosts: *
  families: *
    lookup: average -1m unaligned absolute of received
-     calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed * 1000)) : ( nan )
+     calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed)) : ( nan )
     units: %
     every: 10s
-     warn: $this > (($status >= $WARNING)  ? (80) : (85))
-     crit: $this > (($status == $CRITICAL) ? (85) : (90))
-    delay: down 1m multiplier 1.5 max 1h
-     info: interface received bandwidth usage over net device speed max
+     warn: $this > (($status >= $WARNING)  ? (85) : (90))
+    delay: up 1m down 1m multiplier 1.5 max 1h
+     info: average inbound utilization for the network interface over the last minute
        to: sysadmin
 
  template: 1m_sent_traffic_overflow
@@ -35,13 +34,12 @@
     hosts: *
  families: *
    lookup: average -1m unaligned absolute of sent
-     calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed * 1000)) : ( nan )
+     calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed)) : ( nan )
     units: %
     every: 10s
-     warn: $this > (($status >= $WARNING)  ? (80) : (85))
-     crit: $this > (($status == $CRITICAL) ? (85) : (90))
-    delay: down 1m multiplier 1.5 max 1h
-     info: interface sent bandwidth usage over net device speed max
+     warn: $this > (($status >= $WARNING)  ? (85) : (90))
+    delay: up 1m down 1m multiplier 1.5 max 1h
+     info: average outbound utilization for the network interface over the last minute
        to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -58,56 +56,76 @@ template: inbound_packets_dropped
       on: net.drops
       os: linux
    hosts: *
-families: *
+families: !net* *
   lookup: sum -10m unaligned absolute of inbound
    units: packets
    every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: interface inbound dropped packets in the last 10 minutes
-      to: sysadmin
+    info: number of inbound dropped packets for the network interface in the last 10 minutes
 
 template: outbound_packets_dropped
       on: net.drops
       os: linux
    hosts: *
-families: *
+families: !net* *
   lookup: sum -10m unaligned absolute of outbound
    units: packets
    every: 1m
-    warn: $this >= 5
-   delay: down 1h multiplier 1.5 max 2h
-    info: interface outbound dropped packets in the last 10 minutes
-      to: sysadmin
+    info: number of outbound dropped packets for the network interface in the last 10 minutes
 
 template: inbound_packets_dropped_ratio
       on: net.packets
       os: linux
    hosts: *
-families: *
+families: !net* !wl* *
   lookup: sum -10m unaligned absolute of received
-    calc: (($inbound_packets_dropped != nan AND $this > 0) ? ($inbound_packets_dropped * 100 / $this) : (0))
+    calc: (($inbound_packets_dropped != nan AND $this > 1000) ? ($inbound_packets_dropped * 100 / $this) : (0))
    units: %
    every: 1m
-    warn: $this >= 0.1
-    crit: $this >= 2
-   delay: down 1h multiplier 1.5 max 2h
-    info: the ratio of inbound dropped packets vs the total number of received packets of the network interface, during the last 10 minutes
+    warn: $this >= 2
+   delay: up 1m down 1h multiplier 1.5 max 2h
+    info: ratio of inbound dropped packets for the network interface over the last 10 minutes
       to: sysadmin
 
 template: outbound_packets_dropped_ratio
       on: net.packets
       os: linux
    hosts: *
-families: *
+families: !net* !wl* *
   lookup: sum -10m unaligned absolute of sent
-    calc: (($outbound_packets_dropped != nan AND $this > 0) ? ($outbound_packets_dropped * 100 / $this) : (0))
+    calc: (($outbound_packets_dropped != nan AND $this > 1000) ? ($outbound_packets_dropped * 100 / $this) : (0))
    units: %
    every: 1m
-    warn: $this >= 0.1
-    crit: $this >= 2
-   delay: down 1h multiplier 1.5 max 2h
-    info: the ratio of outbound dropped packets vs the total number of sent packets of the network interface, during the last 10 minutes
+    warn: $this >= 2
+   delay: up 1m down 1h multiplier 1.5 max 2h
+    info: ratio of outbound dropped packets for the network interface over the last 10 minutes
+      to: sysadmin
+
+template: wifi_inbound_packets_dropped_ratio
+      on: net.packets
+      os: linux
+   hosts: *
+families: wl*
+  lookup: sum -10m unaligned absolute of received
+    calc: (($inbound_packets_dropped != nan AND $this > 1000) ? ($inbound_packets_dropped * 100 / $this) : (0))
+   units: %
+   every: 1m
+    warn: $this >= 10
+   delay: up 1m down 1h multiplier 1.5 max 2h
+    info: ratio of inbound dropped packets for the network interface over the last 10 minutes
+      to: sysadmin
+
+template: wifi_outbound_packets_dropped_ratio
+      on: net.packets
+      os: linux
+   hosts: *
+families: wl*
+  lookup: sum -10m unaligned absolute of sent
+    calc: (($outbound_packets_dropped != nan AND $this > 1000) ? ($outbound_packets_dropped * 100 / $this) : (0))
+   units: %
+   every: 1m
+    warn: $this >= 10
+   delay: up 1m down 1h multiplier 1.5 max 2h
+    info: ratio of outbound dropped packets for the network interface over the last 10 minutes
       to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -123,7 +141,7 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface inbound errors in the last 10 minutes
+    info: number of inbound errors for the network interface in the last 10 minutes
       to: sysadmin
 
 template: interface_outbound_errors
@@ -136,7 +154,7 @@ families: *
    every: 1m
     warn: $this >= 5
    delay: down 1h multiplier 1.5 max 2h
-    info: interface outbound errors in the last 10 minutes
+    info: number of outbound errors for the network interface in the last 10 minutes
       to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -157,7 +175,7 @@ families: *
    every: 1m
     warn: $this > 0
    delay: down 1h multiplier 1.5 max 2h
-    info: interface fifo errors in the last 10 minutes
+    info: number of FIFO errors for the network interface in the last 10 minutes
       to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -177,7 +195,7 @@ families: *
   lookup: average -1m unaligned of received
    units: packets
    every: 10s
-    info: the average number of packets received during the last minute
+    info: average number of packets received by the network interface over the last minute
 
 template: 10s_received_packets_storm
       on: net.packets
@@ -189,7 +207,8 @@ families: *
    every: 10s
    units: %
     warn: $this > (($status >= $WARNING)?(200):(5000))
-    crit: $this > (($status >= $WARNING)?(5000):(6000))
+    crit: $this > (($status == $CRITICAL)?(5000):(6000))
  options: no-clear-notification
-    info: the % of the rate of received packets in the last 10 seconds, compared to the rate of the last minute (clear notification for this alarm will not be sent)
+    info: ratio of average number of received packets for the network interface over the last 10 seconds, \
+          compared to the rate over the last minute
       to: sysadmin