Adding upstream version 1.38.0.upstream/1.38.0

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

1 files changed, 14 insertions, 14 deletions

diff --git a/health/health.d/net.conf b/health/health.d/net.conf
index 9d5b3b8d3..a0723f303 100644
--- a/health/health.d/net.conf
+++ b/health/health.d/net.conf
@@ -15,7 +15,7 @@ component: Network
      calc: ( $nic_speed_max > 0 ) ? ( $nic_speed_max) : ( nan )
     units: Mbit
     every: 10s
-     info: network interface $family current speed
+     info: network interface ${label:device} current speed
 
  template: 1m_received_traffic_overflow
        on: net.net
@@ -31,7 +31,7 @@ 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 $family over the last minute
+     info: average inbound utilization for the network interface ${label:device} over the last minute
        to: sysadmin
 
  template: 1m_sent_traffic_overflow
@@ -48,7 +48,7 @@ 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 $family over the last minute
+     info: average outbound utilization for the network interface ${label:device} over the last minute
        to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -72,7 +72,7 @@ component: Network
    lookup: sum -10m unaligned absolute of inbound
     units: packets
     every: 1m
-     info: number of inbound dropped packets for the network interface $family in the last 10 minutes
+     info: number of inbound dropped packets for the network interface ${label:device} in the last 10 minutes
 
  template: outbound_packets_dropped
        on: net.drops
@@ -85,7 +85,7 @@ component: Network
    lookup: sum -10m unaligned absolute of outbound
     units: packets
     every: 1m
-     info: number of outbound dropped packets for the network interface $family in the last 10 minutes
+     info: number of outbound dropped packets for the network interface ${label:device} in the last 10 minutes
 
  template: inbound_packets_dropped_ratio
        on: net.packets
@@ -101,7 +101,7 @@ component: Network
     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 $family over the last 10 minutes
+     info: ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: sysadmin
 
  template: outbound_packets_dropped_ratio
@@ -118,7 +118,7 @@ component: Network
     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 $family over the last 10 minutes
+     info: ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: sysadmin
 
  template: wifi_inbound_packets_dropped_ratio
@@ -135,7 +135,7 @@ component: Network
     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 $family over the last 10 minutes
+     info: ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: sysadmin
 
  template: wifi_outbound_packets_dropped_ratio
@@ -152,7 +152,7 @@ component: Network
     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 $family over the last 10 minutes
+     info: ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
        to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -171,7 +171,7 @@ component: Network
     every: 1m
      warn: $this >= 5
     delay: down 1h multiplier 1.5 max 2h
-     info: number of inbound errors for the network interface $family in the last 10 minutes
+     info: number of inbound errors for the network interface ${label:device} in the last 10 minutes
        to: sysadmin
 
  template: interface_outbound_errors
@@ -187,7 +187,7 @@ component: Network
     every: 1m
      warn: $this >= 5
     delay: down 1h multiplier 1.5 max 2h
-     info: number of outbound errors for the network interface $family in the last 10 minutes
+     info: number of outbound errors for the network interface ${label:device} in the last 10 minutes
        to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -211,7 +211,7 @@ component: Network
     every: 1m
      warn: $this > 0
     delay: down 1h multiplier 1.5 max 2h
-     info: number of FIFO errors for the network interface $family in the last 10 minutes
+     info: number of FIFO errors for the network interface ${label:device} in the last 10 minutes
        to: sysadmin
 
 # -----------------------------------------------------------------------------
@@ -234,7 +234,7 @@ component: Network
    lookup: average -1m unaligned of received
     units: packets
     every: 10s
-     info: average number of packets received by the network interface $family 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
@@ -251,6 +251,6 @@ 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 $family over the last 10 seconds, \
+     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: sysadmin