From 6cf8f2d5174a53f582e61d715edbb88d6e3367cc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 14 Jun 2023 21:20:33 +0200
Subject: Adding upstream version 1.40.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 health/health.d/net.conf | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'health/health.d/net.conf')

diff --git a/health/health.d/net.conf b/health/health.d/net.conf
index a0723f303..08a4eecb4 100644
--- a/health/health.d/net.conf
+++ b/health/health.d/net.conf
@@ -11,7 +11,6 @@
 component: Network
        os: *
     hosts: *
- families: *
      calc: ( $nic_speed_max > 0 ) ? ( $nic_speed_max) : ( nan )
     units: Mbit
     every: 10s
@@ -24,7 +23,6 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: *
    lookup: average -1m unaligned absolute of received
      calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed)) : ( nan )
     units: %
@@ -41,7 +39,6 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: *
    lookup: average -1m unaligned absolute of sent
      calc: ($interface_speed > 0) ? ($this * 100 / ($interface_speed)) : ( nan )
     units: %
@@ -68,7 +65,6 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: *
    lookup: sum -10m unaligned absolute of inbound
     units: packets
     every: 1m
@@ -81,7 +77,6 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: *
    lookup: sum -10m unaligned absolute of outbound
     units: packets
     every: 1m
@@ -94,7 +89,7 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: !wl* *
+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))
     units: %
@@ -111,7 +106,7 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: !wl* *
+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))
     units: %
@@ -128,7 +123,7 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: wl*
+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))
     units: %
@@ -145,7 +140,7 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: wl*
+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))
     units: %
@@ -165,7 +160,6 @@ component: Network
 component: Network
        os: freebsd
     hosts: *
- families: *
    lookup: sum -10m unaligned absolute of inbound
     units: errors
     every: 1m
@@ -181,7 +175,6 @@ component: Network
 component: Network
        os: freebsd
     hosts: *
- families: *
    lookup: sum -10m unaligned absolute of outbound
     units: errors
     every: 1m
@@ -205,7 +198,6 @@ component: Network
 component: Network
        os: linux
     hosts: *
- families: *
    lookup: sum -10m unaligned absolute
     units: errors
     every: 1m
@@ -230,7 +222,6 @@ component: Network
 component: Network
        os: linux freebsd
     hosts: *
- families: *
    lookup: average -1m unaligned of received
     units: packets
     every: 10s
@@ -243,7 +234,6 @@ component: Network
 component: Network
        os: linux freebsd
     hosts: *
- families: *
    lookup: average -10s unaligned of received
      calc: $this * 100 / (($1m_received_packets_rate < 1000)?(1000):($1m_received_packets_rate))
     every: 10s
-- 
cgit v1.2.3