Adding upstream version 1.43.0.upstream/1.43.0

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

1 files changed, 48 insertions, 36 deletions

diff --git a/health/health.d/net.conf b/health/health.d/net.conf
index 095d488da..ea4954187 100644
--- a/health/health.d/net.conf
+++ b/health/health.d/net.conf
@@ -14,7 +14,7 @@ component: Network
      calc: ( $nic_speed_max > 0 ) ? ( $nic_speed_max) : ( nan )
     units: Mbit
     every: 10s
-     info: network interface ${label:device} current speed
+     info: Network interface ${label:device} current speed
 
  template: 1m_received_traffic_overflow
        on: net.net
@@ -29,7 +29,8 @@ component: Network
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (85) : (90))
     delay: up 1m down 1m multiplier 1.5 max 1h
-     info: average inbound utilization for the network interface ${label:device} over the last minute
+  summary: System network interface ${label:device} inbound utilization
+     info: Average inbound utilization for the network interface ${label:device} over the last minute
        to: silent
 
  template: 1m_sent_traffic_overflow
@@ -45,7 +46,8 @@ component: Network
     every: 10s
      warn: $this > (($status >= $WARNING)  ? (85) : (90))
     delay: up 1m down 1m multiplier 1.5 max 1h
-     info: average outbound utilization for the network interface ${label:device} over the last minute
+  summary: System network interface ${label:device} outbound utilization
+     info: Average outbound utilization for the network interface ${label:device} over the last minute
        to: silent
 
 # -----------------------------------------------------------------------------
@@ -58,66 +60,70 @@ component: Network
 # it is possible to have expected packet drops on an interface for some network configurations
 # look at the Monitoring Network Interfaces section in the proc.plugin documentation for more information
 
- template: inbound_packets_dropped
-       on: net.drops
-    class: Errors
+ template: net_interface_inbound_packets
+       on: net.packets
+    class: Workload
      type: System
 component: Network
-       os: linux
+       os: *
     hosts: *
-   lookup: sum -10m unaligned absolute of inbound
+   lookup: sum -10m unaligned absolute of received
     units: packets
     every: 1m
-     info: number of inbound dropped packets for the network interface ${label:device} in the last 10 minutes
+  summary: Network interface ${label:device} received packets
+     info: Received packets for the network interface ${label:device} in the last 10 minutes
 
- template: outbound_packets_dropped
-       on: net.drops
-    class: Errors
+ template: net_interface_outbound_packets
+       on: net.packets
+    class: Workload
      type: System
 component: Network
-       os: linux
+       os: *
     hosts: *
-   lookup: sum -10m unaligned absolute of outbound
+   lookup: sum -10m unaligned absolute of sent
     units: packets
     every: 1m
-     info: number of outbound dropped packets for the network interface ${label:device} in the last 10 minutes
+  summary: Network interface ${label:device} sent packets
+     info: Sent packets for the network interface ${label:device} in the last 10 minutes
 
  template: inbound_packets_dropped_ratio
-       on: net.packets
+       on: net.drops
     class: Errors
      type: System
 component: Network
-       os: linux
+       os: *
     hosts: *
 chart labels: device=!wl* *
-   lookup: sum -10m unaligned absolute of received
-     calc: (($inbound_packets_dropped != nan AND $this > 10000) ? ($inbound_packets_dropped * 100 / $this) : (0))
+   lookup: sum -10m unaligned absolute of inbound
+     calc: (($net_interface_inbound_packets > 10000) ? ($this * 100 / $net_interface_inbound_packets) : (0))
     units: %
     every: 1m
      warn: $this >= 2
     delay: up 1m down 1h multiplier 1.5 max 2h
-     info: ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
+  summary: System network interface ${label:device} inbound drops
+     info: Ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: silent
 
  template: outbound_packets_dropped_ratio
-       on: net.packets
+       on: net.drops
     class: Errors
      type: System
 component: Network
-       os: linux
+       os: *
     hosts: *
 chart labels: device=!wl* *
-   lookup: sum -10m unaligned absolute of sent
-     calc: (($outbound_packets_dropped != nan AND $this > 1000) ? ($outbound_packets_dropped * 100 / $this) : (0))
+   lookup: sum -10m unaligned absolute of outbound
+     calc: (($net_interface_outbound_packets > 1000) ? ($this * 100 / $net_interface_outbound_packets) : (0))
     units: %
     every: 1m
      warn: $this >= 2
     delay: up 1m down 1h multiplier 1.5 max 2h
-     info: ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
+  summary: System network interface ${label:device} outbound drops
+     info: Ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: silent
 
  template: wifi_inbound_packets_dropped_ratio
-       on: net.packets
+       on: net.drops
     class: Errors
      type: System
 component: Network
@@ -125,16 +131,17 @@ component: Network
     hosts: *
 chart labels: device=wl*
    lookup: sum -10m unaligned absolute of received
-     calc: (($inbound_packets_dropped != nan AND $this > 10000) ? ($inbound_packets_dropped * 100 / $this) : (0))
+     calc: (($net_interface_inbound_packets > 10000) ? ($this * 100 / $net_interface_inbound_packets) : (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 ${label:device} over the last 10 minutes
+  summary: System network interface ${label:device} inbound drops ratio
+     info: Ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: silent
 
  template: wifi_outbound_packets_dropped_ratio
-       on: net.packets
+       on: net.drops
     class: Errors
      type: System
 component: Network
@@ -142,12 +149,13 @@ component: Network
     hosts: *
 chart labels: device=wl*
    lookup: sum -10m unaligned absolute of sent
-     calc: (($outbound_packets_dropped != nan AND $this > 1000) ? ($outbound_packets_dropped * 100 / $this) : (0))
+     calc: (($net_interface_outbound_packets > 1000) ? ($this * 100 / $net_interface_outbound_packets) : (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 ${label:device} over the last 10 minutes
+  summary: System network interface ${label:device} outbound drops ratio
+     info: Ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: silent
 
 # -----------------------------------------------------------------------------
@@ -165,7 +173,8 @@ component: Network
     every: 1m
      warn: $this >= 5
     delay: down 1h multiplier 1.5 max 2h
-     info: number of inbound errors for the network interface ${label:device} in the last 10 minutes
+  summary: System network interface ${label:device} inbound errors
+     info: Number of inbound errors for the network interface ${label:device} in the last 10 minutes
        to: silent
 
  template: interface_outbound_errors
@@ -180,7 +189,8 @@ component: Network
     every: 1m
      warn: $this >= 5
     delay: down 1h multiplier 1.5 max 2h
-     info: number of outbound errors for the network interface ${label:device} in the last 10 minutes
+  summary: System network interface ${label:device} outbound errors
+     info: Number of outbound errors for the network interface ${label:device} in the last 10 minutes
        to: silent
 
 # -----------------------------------------------------------------------------
@@ -203,7 +213,8 @@ component: Network
     every: 1m
      warn: $this > 0
     delay: down 1h multiplier 1.5 max 2h
-     info: number of FIFO errors for the network interface ${label:device} in the last 10 minutes
+  summary: System network interface ${label:device} FIFO errors
+     info: Number of FIFO errors for the network interface ${label:device} in the last 10 minutes
        to: silent
 
 # -----------------------------------------------------------------------------
@@ -225,7 +236,7 @@ component: Network
    lookup: average -1m unaligned of received
     units: packets
     every: 10s
-     info: average number of packets received by the network interface ${label:device} over the last minute
+     info: Average number of packets received by the network interface ${label:device} over the last minute
 
  template: 10s_received_packets_storm
        on: net.packets
@@ -241,6 +252,7 @@ component: Network
      warn: $this > (($status >= $WARNING)?(200):(5000))
      crit: $this > (($status == $CRITICAL)?(5000):(6000))
   options: no-clear-notification
-     info: ratio of average number of received packets for the network interface ${label:device} over the last 10 seconds, \
+  summary: System network interface ${label:device} inbound packet storm
+     info: Ratio of average number of received packets for the network interface ${label:device} over the last 10 seconds, \
            compared to the rate over the last minute
        to: silent