From 517a443636daa1e8085cb4e5325524a54e8a8fd7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 17 Oct 2023 11:30:23 +0200
Subject: Merging upstream version 1.43.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/freebsd.plugin/metadata.yaml | 42 ++++-----------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

(limited to 'collectors/freebsd.plugin/metadata.yaml')

diff --git a/collectors/freebsd.plugin/metadata.yaml b/collectors/freebsd.plugin/metadata.yaml
index fca8982f7..d68fc3137 100644
--- a/collectors/freebsd.plugin/metadata.yaml
+++ b/collectors/freebsd.plugin/metadata.yaml
@@ -2893,36 +2893,16 @@ modules:
         metric: net.net
         info: network interface ${label:device} current speed
         os: "*"
-      - name: 1m_received_traffic_overflow
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.net
-        info: average inbound utilization for the network interface ${label:device} over the last minute
-        os: "linux"
-      - name: 1m_sent_traffic_overflow
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.net
-        info: average outbound utilization for the network interface ${label:device} over the last minute
-        os: "linux"
       - name: inbound_packets_dropped_ratio
         link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.packets
+        metric: net.drops
         info: ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
-        os: "linux"
+        os: "*"
       - name: outbound_packets_dropped_ratio
         link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.packets
-        info: ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
-        os: "linux"
-      - name: wifi_inbound_packets_dropped_ratio
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.packets
-        info: ratio of inbound dropped packets for the network interface ${label:device} over the last 10 minutes
-        os: "linux"
-      - name: wifi_outbound_packets_dropped_ratio
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.packets
+        metric: net.drops
         info: ratio of outbound dropped packets for the network interface ${label:device} over the last 10 minutes
-        os: "linux"
+        os: "*"
       - name: 1m_received_packets_rate
         link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
         metric: net.packets
@@ -2931,9 +2911,7 @@ modules:
       - name: 10s_received_packets_storm
         link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
         metric: net.packets
-        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
+        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
         os: "linux freebsd"
       - name: interface_inbound_errors
         link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
@@ -2945,16 +2923,6 @@ modules:
         metric: net.errors
         info: number of outbound errors for the network interface ${label:device} in the last 10 minutes
         os: "freebsd"
-      - name: inbound_packets_dropped
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.drops
-        info: number of inbound dropped packets for the network interface ${label:device} in the last 10 minutes
-        os: "linux"
-      - name: outbound_packets_dropped
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.drops
-        info: number of outbound dropped packets for the network interface ${label:device} in the last 10 minutes
-        os: "linux"
     metrics:
       folding:
         title: Metrics
-- 
cgit v1.2.3