Merging upstream version 1.46.3.

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

9 files changed, 0 insertions, 3414 deletions

diff --git a/collectors/macos.plugin/Makefile.am b/collectors/macos.plugin/Makefile.am
deleted file mode 100644
index 161784b8..00000000
--- a/collectors/macos.plugin/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-AUTOMAKE_OPTIONS = subdir-objects
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-
-dist_noinst_DATA = \
-    README.md \
-    $(NULL)
diff --git a/collectors/macos.plugin/README.md b/collectors/macos.plugin/README.md
deleted file mode 120000
index 2ea6842e..00000000
--- a/collectors/macos.plugin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-integrations/macos.md
\ No newline at end of file
diff --git a/collectors/macos.plugin/integrations/macos.md b/collectors/macos.plugin/integrations/macos.md
deleted file mode 100644
index 5128a5a7..00000000
--- a/collectors/macos.plugin/integrations/macos.md
+++ /dev/null
@@ -1,286 +0,0 @@
-<!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/macos.plugin/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/macos.plugin/metadata.yaml"
-sidebar_label: "macOS"
-learn_status: "Published"
-learn_rel_path: "Data Collection/macOS Systems"
-most_popular: False
-message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
-endmeta-->
-
-# macOS
-
-
-<img src="https://netdata.cloud/img/macos.svg" width="150"/>
-
-
-Plugin: macos.plugin
-Module: mach_smi
-
-<img src="https://img.shields.io/badge/maintained%20by-Netdata-%2300ab44" />
-
-## Overview
-
-Monitor macOS metrics for efficient operating system performance.
-
-The plugin uses three different methods to collect data:
-  - The function `sysctlbyname` is called to collect network, swap, loadavg, and boot time.
-  - The functtion `host_statistic` is called to collect CPU and Virtual memory data;
-  - The function `IOServiceGetMatchingServices` to collect storage information.
-
-
-This collector is only supported on the following platforms:
-
-- macOS
-
-This collector only supports collecting metrics from a single instance of this integration.
-
-
-### Default Behavior
-
-#### Auto-Detection
-
-This integration doesn't support auto-detection.
-
-#### Limits
-
-The default configuration for this integration does not impose any limits on data collection.
-
-#### Performance Impact
-
-The default configuration for this integration is not expected to impose a significant performance impact on the system.
-
-
-## Metrics
-
-Metrics grouped by *scope*.
-
-The scope defines the instance that the metric belongs to. An instance is uniquely identified by a set of labels.
-
-
-
-### Per macOS instance
-
-These metrics refer to hardware and network monitoring.
-
-
-This scope has no labels.
-
-Metrics:
-
-| Metric | Dimensions | Unit |
-|:------|:----------|:----|
-| system.cpu | user, nice, system, idle | percentage |
-| system.ram | active, wired, throttled, compressor, inactive, purgeable, speculative, free | MiB |
-| mem.swapio | io, out | KiB/s |
-| mem.pgfaults | memory, cow, pagein, pageout, compress, decompress, zero_fill, reactivate, purge | faults/s |
-| system.load | load1, load5, load15 | load |
-| mem.swap | free, used | MiB |
-| system.ipv4 | received, sent | kilobits/s |
-| ipv4.tcppackets | received, sent | packets/s |
-| ipv4.tcperrors | InErrs, InCsumErrors, RetransSegs | packets/s |
-| ipv4.tcphandshake | EstabResets, ActiveOpens, PassiveOpens, AttemptFails | events/s |
-| ipv4.tcpconnaborts | baddata, userclosed, nomemory, timeout | connections/s |
-| ipv4.tcpofo | inqueue | packets/s |
-| ipv4.tcpsyncookies | received, sent, failed | packets/s |
-| ipv4.ecnpkts | CEP, NoECTP | packets/s |
-| ipv4.udppackets | received, sent | packets/s |
-| ipv4.udperrors | RcvbufErrors, InErrors, NoPorts, InCsumErrors, IgnoredMulti | events/s |
-| ipv4.icmp | received, sent | packets/s |
-| ipv4.icmp_errors | InErrors, OutErrors, InCsumErrors | packets/s |
-| ipv4.icmpmsg | InEchoReps, OutEchoReps, InEchos, OutEchos | packets/s |
-| ipv4.packets | received, sent, forwarded, delivered | packets/s |
-| ipv4.fragsout | ok, failed, created | packets/s |
-| ipv4.fragsin | ok, failed, all | packets/s |
-| ipv4.errors | InDiscards, OutDiscards, InHdrErrors, OutNoRoutes, InAddrErrors, InUnknownProtos | packets/s |
-| ipv6.packets | received, sent, forwarded, delivers | packets/s |
-| ipv6.fragsout | ok, failed, all | packets/s |
-| ipv6.fragsin | ok, failed, timeout, all | packets/s |
-| ipv6.errors | InDiscards, OutDiscards, InHdrErrors, InAddrErrors, InTruncatedPkts, InNoRoutes, OutNoRoutes | packets/s |
-| ipv6.icmp | received, sent | messages/s |
-| ipv6.icmpredir | received, sent | redirects/s |
-| ipv6.icmperrors | InErrors, OutErrors, InCsumErrors, InDestUnreachs, InPktTooBigs, InTimeExcds, InParmProblems, OutDestUnreachs, OutTimeExcds, OutParmProblems | errors/s |
-| ipv6.icmpechos | InEchos, OutEchos, InEchoReplies, OutEchoReplies | messages/s |
-| ipv6.icmprouter | InSolicits, OutSolicits, InAdvertisements, OutAdvertisements | messages/s |
-| ipv6.icmpneighbor | InSolicits, OutSolicits, InAdvertisements, OutAdvertisements | messages/s |
-| ipv6.icmptypes | InType1, InType128, InType129, InType136, OutType1, OutType128, OutType129, OutType133, OutType135, OutType143 | messages/s |
-| system.uptime | uptime | seconds |
-| system.io | in, out | KiB/s |
-
-### Per disk
-
-
-
-This scope has no labels.
-
-Metrics:
-
-| Metric | Dimensions | Unit |
-|:------|:----------|:----|
-| disk.io | read, writes | KiB/s |
-| disk.ops | read, writes | operations/s |
-| disk.util | utilization | % of time working |
-| disk.iotime | reads, writes | milliseconds/s |
-| disk.await | reads, writes | milliseconds/operation |
-| disk.avgsz | reads, writes | KiB/operation |
-| disk.svctm | svctm | milliseconds/operation |
-
-### Per mount point
-
-
-
-This scope has no labels.
-
-Metrics:
-
-| Metric | Dimensions | Unit |
-|:------|:----------|:----|
-| disk.space | avail, used, reserved_for_root | GiB |
-| disk.inodes | avail, used, reserved_for_root | inodes |
-
-### Per network device
-
-
-
-This scope has no labels.
-
-Metrics:
-
-| Metric | Dimensions | Unit |
-|:------|:----------|:----|
-| net.net | received, sent | kilobits/s |
-| net.packets | received, sent, multicast_received, multicast_sent | packets/s |
-| net.errors | inbound, outbound | errors/s |
-| net.drops | inbound | drops/s |
-| net.events | frames, collisions, carrier | events/s |
-
-
-
-## Alerts
-
-
-The following alerts are available:
-
-| Alert name  | On metric | Description |
-|:------------|:----------|:------------|
-| [ interface_speed ](https://github.com/netdata/netdata/blob/master/health/health.d/net.conf) | net.net | network interface ${label:device} current speed |
-
-
-## Setup
-
-### Prerequisites
-
-No action required.
-
-### Configuration
-
-#### File
-
-The configuration file name for this integration is `netdata.conf`.
-
-The file format is a modified INI syntax. The general structure is:
-
-```ini
-[section1]
-    option1 = some value
-    option2 = some other value
-
-[section2]
-    option3 = some third value
-```
-You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
-
-```bash
-cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
-sudo ./edit-config netdata.conf
-```
-#### Options
-
-There are three sections in the file which you can configure:
-
-- `[plugin:macos:sysctl]` - Enable or disable monitoring for network, swap, loadavg, and boot time.
-- `[plugin:macos:mach_smi]` - Enable or disable monitoring for CPU and Virtual memory.
-- `[plugin:macos:iokit]` - Enable or disable monitoring for storage device.
-
-
-<details><summary>Config options</summary>
-
-| Name | Description | Default | Required |
-|:----|:-----------|:-------|:--------:|
-| enable load average | Enable or disable monitoring of load average metrics (load1, load5, load15). | yes | no |
-| system swap | Enable or disable monitoring of system swap metrics (free, used). | yes | no |
-| bandwidth | Enable or disable monitoring of network bandwidth metrics (received, sent). | yes | no |
-| ipv4 TCP packets | Enable or disable monitoring of IPv4 TCP total packets metrics (received, sent). | yes | no |
-| ipv4 TCP errors | Enable or disable monitoring of IPv4 TCP packets metrics (Input Errors, Checksum, Retransmission segments). | yes | no |
-| ipv4 TCP handshake issues | Enable or disable monitoring of IPv4 TCP handshake metrics (Established Resets, Active Opens, Passive Opens, Attempt Fails). | yes | no |
-| ECN packets | Enable or disable monitoring of ECN statistics metrics (InCEPkts, InNoECTPkts). | auto | no |
-| TCP SYN cookies | Enable or disable monitoring of TCP SYN cookies metrics (received, sent, failed). | auto | no |
-| TCP out-of-order queue | Enable or disable monitoring of TCP out-of-order queue metrics (inqueue). | auto | no |
-| TCP connection aborts | Enable or disable monitoring of TCP connection aborts metrics (Bad Data, User closed, No memory, Timeout). | auto | no |
-| ipv4 UDP packets | Enable or disable monitoring of ipv4 UDP packets metrics (sent, received.). | yes | no |
-| ipv4 UDP errors | Enable or disable monitoring of ipv4 UDP errors metrics (Recieved Buffer error, Input Errors, No Ports, IN Checksum Errors, Ignore Multi). | yes | no |
-| ipv4 icmp packets | Enable or disable monitoring of IPv4 ICMP packets metrics (sent, received, in error, OUT error, IN Checksum error). | yes | no |
-| ipv4 icmp messages | Enable or disable monitoring of ipv4 ICMP messages metrics (I/O messages, I/O Errors, In Checksum). | yes | no |
-| ipv4 packets | Enable or disable monitoring of ipv4 packets metrics (received, sent, forwarded, delivered). | yes | no |
-| ipv4 fragments sent | Enable or disable monitoring of IPv4 fragments sent metrics (ok, fails, creates). | yes | no |
-| ipv4 fragments assembly | Enable or disable monitoring of IPv4 fragments assembly metrics (ok, failed, all). | yes | no |
-| ipv4 errors | Enable or disable monitoring of IPv4 errors metrics (I/O discard, I/O HDR errors, In Addr errors, In Unknown protos, OUT No Routes). | yes | no |
-| ipv6 packets | Enable or disable monitoring of IPv6 packets metrics (received, sent, forwarded, delivered). | auto | no |
-| ipv6 fragments sent | Enable or disable monitoring of IPv6 fragments sent metrics (ok, failed, all). | auto | no |
-| ipv6 fragments assembly | Enable or disable monitoring of IPv6 fragments assembly metrics (ok, failed, timeout, all). | auto | no |
-| ipv6 errors | Enable or disable monitoring of IPv6 errors metrics (I/O Discards, In Hdr Errors, In Addr Errors, In Truncaedd Packets, I/O No Routes). | auto | no |
-| icmp | Enable or disable monitoring of ICMP metrics (sent, received). | auto | no |
-| icmp redirects | Enable or disable monitoring of ICMP redirects metrics (received, sent). | auto | no |
-| icmp errors | Enable or disable monitoring of ICMP metrics (I/O Errors, In Checksums, In Destination Unreachable, In Packet too big, In Time Exceeds, In Parm Problem, Out Dest Unreachable, Out Timee Exceeds, Out Parm Problems.). | auto | no |
-| icmp echos | Enable or disable monitoring of ICMP echos metrics (I/O Echos, I/O Echo Reply). | auto | no |
-| icmp router | Enable or disable monitoring of ICMP router metrics (I/O Solicits, I/O Advertisements). | auto | no |
-| icmp neighbor | Enable or disable monitoring of ICMP neighbor metrics (I/O Solicits, I/O Advertisements). | auto | no |
-| icmp types | Enable or disable monitoring of ICMP types metrics (I/O Type1, I/O Type128, I/O Type129, Out Type133, Out Type135, In Type136, Out Type145). | auto | no |
-| space usage for all disks | Enable or disable monitoring of space usage for all disks metrics (available, used, reserved for root). | yes | no |
-| inodes usage for all disks | Enable or disable monitoring of inodes usage for all disks metrics (available, used, reserved for root). | yes | no |
-| bandwidth | Enable or disable monitoring of bandwidth metrics (received, sent). | yes | no |
-| system uptime | Enable or disable monitoring of system uptime metrics (uptime). | yes | no |
-| cpu utilization | Enable or disable monitoring of CPU utilization metrics (user, nice, system, idel). | yes | no |
-| system ram | Enable or disable monitoring of system RAM metrics (Active, Wired, throttled, compressor, inactive, purgeable, speculative, free). | yes | no |
-| swap i/o | Enable or disable monitoring of SWAP I/O metrics (I/O Swap). | yes | no |
-| memory page faults | Enable or disable monitoring of memory page faults metrics (memory, cow, I/O page, compress, decompress, zero fill, reactivate, purge). | yes | no |
-| disk i/o | Enable or disable monitoring of disk I/O metrics (In, Out). | yes | no |
-
-</details>
-
-#### Examples
-
-##### Disable swap monitoring.
-
-A basic example that discards swap monitoring
-
-<details><summary>Config</summary>
-
-```yaml
-[plugin:macos:sysctl]
-  system swap = no
-[plugin:macos:mach_smi]
-  swap i/o = no
-
-```
-</details>
-
-##### Disable complete Machine SMI section.
-
-A basic example that discards swap monitoring
-
-<details><summary>Config</summary>
-
-```yaml
-[plugin:macos:mach_smi]
-  cpu utilization = no
-  system ram = no
-  swap i/o = no
-  memory page faults = no
-  disk i/o = no
-
-```
-</details>
-
-
diff --git a/collectors/macos.plugin/macos_fw.c b/collectors/macos.plugin/macos_fw.c
deleted file mode 100644
index 75ef386b..00000000
--- a/collectors/macos.plugin/macos_fw.c
+++ /dev/null
@@ -1,648 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "plugin_macos.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/storage/IOBlockStorageDriver.h>
-#include <IOKit/IOBSD.h>
-// NEEDED BY do_space, do_inodes
-#include <sys/mount.h>
-// NEEDED BY: struct ifaddrs, getifaddrs()
-#include <net/if.h>
-#include <ifaddrs.h>
-
-// NEEDED BY: do_bandwidth
-#define IFA_DATA(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s)
-
-#define MAXDRIVENAME 31
-
-#define KILO_FACTOR 1024
-#define MEGA_FACTOR 1048576     // 1024 * 1024
-#define GIGA_FACTOR 1073741824  // 1024 * 1024 * 1024
-
-int do_macos_iokit(int update_every, usec_t dt) {
-    (void)dt;
-
-    static int do_io = -1, do_space = -1, do_inodes = -1, do_bandwidth = -1;
-
-    if (unlikely(do_io == -1)) {
-        do_io                   = config_get_boolean("plugin:macos:iokit", "disk i/o", 1);
-        do_space                = config_get_boolean("plugin:macos:sysctl", "space usage for all disks", 1);
-        do_inodes               = config_get_boolean("plugin:macos:sysctl", "inodes usage for all disks", 1);
-        do_bandwidth            = config_get_boolean("plugin:macos:sysctl", "bandwidth", 1);
-    }
-
-    RRDSET *st;
-
-    mach_port_t         main_port;
-    io_registry_entry_t drive, drive_media;
-    io_iterator_t       drive_list;
-    CFDictionaryRef     properties, statistics;
-    CFStringRef         name;
-    CFNumberRef         number;
-    kern_return_t       status;
-    collected_number    total_disk_reads = 0;
-    collected_number    total_disk_writes = 0;
-    struct diskstat {
-        char name[MAXDRIVENAME];
-        collected_number bytes_read;
-        collected_number bytes_write;
-        collected_number reads;
-        collected_number writes;
-        collected_number time_read;
-        collected_number time_write;
-        collected_number latency_read;
-        collected_number latency_write;
-    } diskstat;
-    struct cur_diskstat {
-        collected_number duration_read_ns;
-        collected_number duration_write_ns;
-        collected_number busy_time_ns;
-    } cur_diskstat;
-    struct prev_diskstat {
-        collected_number bytes_read;
-        collected_number bytes_write;
-        collected_number operations_read;
-        collected_number operations_write;
-        collected_number duration_read_ns;
-        collected_number duration_write_ns;
-        collected_number busy_time_ns;
-    } prev_diskstat;
-
-    // NEEDED BY: do_space, do_inodes
-    struct statfs *mntbuf;
-    int mntsize, i;
-    char title[4096 + 1];
-
-    // NEEDED BY: do_bandwidth
-    struct ifaddrs *ifa, *ifap;
-
-#if !defined(MAC_OS_VERSION_12_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0)
-#define IOMainPort IOMasterPort
-#endif
-
-    /* Get ports and services for drive statistics. */
-    if (unlikely(IOMainPort(bootstrap_port, &main_port))) {
-        collector_error("MACOS: IOMasterPort() failed");
-        do_io = 0;
-        collector_error("DISABLED: system.io");
-    /* Get the list of all drive objects. */
-    } else if (unlikely(IOServiceGetMatchingServices(main_port, IOServiceMatching("IOBlockStorageDriver"), &drive_list))) {
-        collector_error("MACOS: IOServiceGetMatchingServices() failed");
-        do_io = 0;
-        collector_error("DISABLED: system.io");
-    } else {
-        while ((drive = IOIteratorNext(drive_list)) != 0) {
-            properties = 0;
-            statistics = 0;
-            number = 0;
-            bzero(&diskstat, sizeof(diskstat));
-
-            /* Get drive media object. */
-            status = IORegistryEntryGetChildEntry(drive, kIOServicePlane, &drive_media);
-            if (unlikely(status != KERN_SUCCESS)) {
-                IOObjectRelease(drive);
-                continue;
-            }
-
-            /* Get drive media properties. */
-            if (likely(!IORegistryEntryCreateCFProperties(drive_media, (CFMutableDictionaryRef *)&properties, kCFAllocatorDefault, 0))) {
-                /* Get disk name. */
-                if (likely(name = (CFStringRef)CFDictionaryGetValue(properties, CFSTR(kIOBSDNameKey)))) {
-                    CFStringGetCString(name, diskstat.name, MAXDRIVENAME, kCFStringEncodingUTF8);
-                }
-            }
-
-            /* Release. */
-            CFRelease(properties);
-            IOObjectRelease(drive_media);
-
-            if(unlikely(!*diskstat.name)) {
-                IOObjectRelease(drive);
-                continue;
-            }
-
-            /* Obtain the properties for this drive object. */
-            if (unlikely(IORegistryEntryCreateCFProperties(drive, (CFMutableDictionaryRef *)&properties, kCFAllocatorDefault, 0))) {
-                IOObjectRelease(drive);
-                collector_error("MACOS: IORegistryEntryCreateCFProperties() failed");
-                do_io = 0;
-                collector_error("DISABLED: system.io");
-                break;
-            } else if (likely(properties)) {
-                /* Obtain the statistics from the drive properties. */
-                if (likely(statistics = (CFDictionaryRef)CFDictionaryGetValue(properties, CFSTR(kIOBlockStorageDriverStatisticsKey)))) {
-
-                    // --------------------------------------------------------------------
-
-                    /* Get bytes read. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsBytesReadKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.bytes_read);
-                        total_disk_reads += diskstat.bytes_read;
-                    }
-
-                    /* Get bytes written. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsBytesWrittenKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.bytes_write);
-                        total_disk_writes += diskstat.bytes_write;
-                    }
-
-                    st = rrdset_find_active_bytype_localhost("disk", diskstat.name);
-                    if (unlikely(!st)) {
-                        st = rrdset_create_localhost(
-                                "disk"
-                                , diskstat.name
-                                , NULL
-                                , diskstat.name
-                                , "disk.io"
-                                , "Disk I/O Bandwidth"
-                                , "KiB/s"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2000
-                                , update_every
-                                , RRDSET_TYPE_AREA
-                        );
-
-                        rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
-                        rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
-                    }
-
-                    prev_diskstat.bytes_read = rrddim_set(st, "reads", diskstat.bytes_read);
-                    prev_diskstat.bytes_write = rrddim_set(st, "writes", diskstat.bytes_write);
-                    rrdset_done(st);
-
-                    /* Get number of reads. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsReadsKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.reads);
-                    }
-
-                    /* Get number of writes. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsWritesKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.writes);
-                    }
-
-                    st = rrdset_find_active_bytype_localhost("disk_ops", diskstat.name);
-                    if (unlikely(!st)) {
-                        st = rrdset_create_localhost(
-                                "disk_ops"
-                                , diskstat.name
-                                , NULL
-                                , diskstat.name
-                                , "disk.ops"
-                                , "Disk Completed I/O Operations"
-                                , "operations/s"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2001
-                                , update_every
-                                , RRDSET_TYPE_LINE
-                        );
-                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                        rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                        rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    }
-
-                    prev_diskstat.operations_read = rrddim_set(st, "reads", diskstat.reads);
-                    prev_diskstat.operations_write = rrddim_set(st, "writes", diskstat.writes);
-                    rrdset_done(st);
-
-                    /* Get reads time. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalReadTimeKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.time_read);
-                    }
-
-                    /* Get writes time. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalWriteTimeKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.time_write);
-                    }
-
-                    st = rrdset_find_active_bytype_localhost("disk_util", diskstat.name);
-                    if (unlikely(!st)) {
-                        st = rrdset_create_localhost(
-                                "disk_util"
-                                , diskstat.name
-                                , NULL
-                                , diskstat.name
-                                , "disk.util"
-                                , "Disk Utilization Time"
-                                , "% of time working"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2004
-                                , update_every
-                                , RRDSET_TYPE_AREA
-                        );
-                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                        rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
-                    }
-
-                    cur_diskstat.busy_time_ns = (diskstat.time_read + diskstat.time_write);
-                    prev_diskstat.busy_time_ns = rrddim_set(st, "utilization", cur_diskstat.busy_time_ns);
-                    rrdset_done(st);
-
-                    /* Get reads latency. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsLatentReadTimeKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.latency_read);
-                    }
-
-                    /* Get writes latency. */
-                    if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsLatentWriteTimeKey)))) {
-                        CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.latency_write);
-                    }
-
-                    st = rrdset_find_active_bytype_localhost("disk_iotime", diskstat.name);
-                    if (unlikely(!st)) {
-                        st = rrdset_create_localhost(
-                                "disk_iotime"
-                                , diskstat.name
-                                , NULL
-                                , diskstat.name
-                                , "disk.iotime"
-                                , "Disk Total I/O Time"
-                                , "milliseconds/s"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2022
-                                , update_every
-                                , RRDSET_TYPE_LINE
-                        );
-                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                        rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
-                        rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_INCREMENTAL);
-                    }
-
-                    cur_diskstat.duration_read_ns = diskstat.time_read + diskstat.latency_read;
-                    cur_diskstat.duration_write_ns = diskstat.time_write + diskstat.latency_write;
-                    prev_diskstat.duration_read_ns = rrddim_set(st, "reads", cur_diskstat.duration_read_ns);
-                    prev_diskstat.duration_write_ns = rrddim_set(st, "writes", cur_diskstat.duration_write_ns);
-                    rrdset_done(st);
-
-                    // calculate differential charts
-                    // only if this is not the first time we run
-
-                    if (likely(dt)) {
-                        st = rrdset_find_active_bytype_localhost("disk_await", diskstat.name);
-                        if (unlikely(!st)) {
-                            st = rrdset_create_localhost(
-                                    "disk_await"
-                                    , diskstat.name
-                                    , NULL
-                                    , diskstat.name
-                                    , "disk.await"
-                                    , "Average Completed I/O Operation Time"
-                                    , "milliseconds/operation"
-                                    , "macos.plugin"
-                                    , "iokit"
-                                    , 2005
-                                    , update_every
-                                    , RRDSET_TYPE_LINE
-                            );
-                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                            rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
-                            rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_ABSOLUTE);
-                        }
-
-                        rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
-                            (cur_diskstat.duration_read_ns - prev_diskstat.duration_read_ns) / (diskstat.reads - prev_diskstat.operations_read) : 0);
-                        rrddim_set(st, "writes", (diskstat.writes - prev_diskstat.operations_write) ?
-                            (cur_diskstat.duration_write_ns - prev_diskstat.duration_write_ns) / (diskstat.writes - prev_diskstat.operations_write) : 0);
-                        rrdset_done(st);
-
-                        st = rrdset_find_active_bytype_localhost("disk_avgsz", diskstat.name);
-                        if (unlikely(!st)) {
-                            st = rrdset_create_localhost(
-                                    "disk_avgsz"
-                                    , diskstat.name
-                                    , NULL
-                                    , diskstat.name
-                                    , "disk.avgsz"
-                                    , "Average Completed I/O Operation Bandwidth"
-                                    , "KiB/operation"
-                                    , "macos.plugin"
-                                    , "iokit"
-                                    , 2006
-                                    , update_every
-                                    , RRDSET_TYPE_AREA
-                            );
-                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                            rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
-                            rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
-                        }
-
-                        rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
-                            (diskstat.bytes_read - prev_diskstat.bytes_read) / (diskstat.reads - prev_diskstat.operations_read) : 0);
-                        rrddim_set(st, "writes", (diskstat.writes - prev_diskstat.operations_write) ?
-                            (diskstat.bytes_write - prev_diskstat.bytes_write) / (diskstat.writes - prev_diskstat.operations_write) : 0);
-                        rrdset_done(st);
-
-                        st = rrdset_find_active_bytype_localhost("disk_svctm", diskstat.name);
-                        if (unlikely(!st)) {
-                            st = rrdset_create_localhost(
-                                    "disk_svctm"
-                                    , diskstat.name
-                                    , NULL
-                                    , diskstat.name
-                                    , "disk.svctm"
-                                    , "Average Service Time"
-                                    , "milliseconds/operation"
-                                    , "macos.plugin"
-                                    , "iokit"
-                                    , 2007
-                                    , update_every
-                                    , RRDSET_TYPE_LINE
-                            );
-                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                            rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
-                        }
-
-                        rrddim_set(st, "svctm", ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) ?
-                            (cur_diskstat.busy_time_ns - prev_diskstat.busy_time_ns) / ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) : 0);
-                        rrdset_done(st);
-                    }
-                }
-
-                /* Release. */
-                CFRelease(properties);
-            }
-
-            /* Release. */
-            IOObjectRelease(drive);
-        }
-        IOIteratorReset(drive_list);
-
-        /* Release. */
-        IOObjectRelease(drive_list);
-    }
-
-    if (likely(do_io)) {
-        st = rrdset_find_active_bytype_localhost("system", "io");
-        if (unlikely(!st)) {
-            st = rrdset_create_localhost(
-                    "system"
-                    , "io"
-                    , NULL
-                    , "disk"
-                    , NULL
-                    , "Disk I/O"
-                    , "KiB/s"
-                    , "macos.plugin"
-                    , "iokit"
-                    , 150
-                    , update_every
-                    , RRDSET_TYPE_AREA
-            );
-            rrddim_add(st, "in",  NULL,  1, 1024, RRD_ALGORITHM_INCREMENTAL);
-            rrddim_add(st, "out", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
-        }
-
-        rrddim_set(st, "in", total_disk_reads);
-        rrddim_set(st, "out", total_disk_writes);
-        rrdset_done(st);
-    }
-
-    // Can be merged with FreeBSD plugin
-
-    if (likely(do_space || do_inodes)) {
-        // there is no mount info in sysctl MIBs
-        if (unlikely(!(mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)))) {
-            collector_error("MACOS: getmntinfo() failed");
-            do_space = 0;
-            collector_error("DISABLED: disk_space.X");
-            do_inodes = 0;
-            collector_error("DISABLED: disk_inodes.X");
-        } else {
-            for (i = 0; i < mntsize; i++) {
-                if (mntbuf[i].f_flags == MNT_RDONLY ||
-                        mntbuf[i].f_blocks == 0 ||
-                        // taken from gnulib/mountlist.c and shortened to FreeBSD related fstypes
-                        strcmp(mntbuf[i].f_fstypename, "autofs") == 0 ||
-                        strcmp(mntbuf[i].f_fstypename, "procfs") == 0 ||
-                        strcmp(mntbuf[i].f_fstypename, "subfs") == 0 ||
-                        strcmp(mntbuf[i].f_fstypename, "devfs") == 0 ||
-                        strcmp(mntbuf[i].f_fstypename, "none") == 0)
-                    continue;
-
-                // --------------------------------------------------------------------------
-
-                if (likely(do_space)) {
-                    st = rrdset_find_active_bytype_localhost("disk_space", mntbuf[i].f_mntonname);
-                    if (unlikely(!st)) {
-                        snprintfz(title, sizeof(title) - 1, "Disk Space Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
-                        st = rrdset_create_localhost(
-                                "disk_space"
-                                , mntbuf[i].f_mntonname
-                                , NULL
-                                , mntbuf[i].f_mntonname
-                                , "disk.space"
-                                , title
-                                , "GiB"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2023
-                                , update_every
-                                , RRDSET_TYPE_STACKED
-                        );
-
-                        rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-                        rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-                        rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-                    }
-
-                    rrddim_set(st, "avail", (collected_number) mntbuf[i].f_bavail);
-                    rrddim_set(st, "used", (collected_number) (mntbuf[i].f_blocks - mntbuf[i].f_bfree));
-                    rrddim_set(st, "reserved_for_root", (collected_number) (mntbuf[i].f_bfree - mntbuf[i].f_bavail));
-                    rrdset_done(st);
-                }
-
-                // --------------------------------------------------------------------------
-
-                if (likely(do_inodes)) {
-                    st = rrdset_find_active_bytype_localhost("disk_inodes", mntbuf[i].f_mntonname);
-                    if (unlikely(!st)) {
-                        snprintfz(title, sizeof(title) - 1, "Disk Files (inodes) Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
-                        st = rrdset_create_localhost(
-                                "disk_inodes"
-                                , mntbuf[i].f_mntonname
-                                , NULL
-                                , mntbuf[i].f_mntonname
-                                , "disk.inodes"
-                                , title
-                                , "inodes"
-                                , "macos.plugin"
-                                , "iokit"
-                                , 2024
-                                , update_every
-                                , RRDSET_TYPE_STACKED
-                        );
-
-                        rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
-                        rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
-                        rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRD_ALGORITHM_ABSOLUTE);
-                    }
-
-                    rrddim_set(st, "avail", (collected_number) mntbuf[i].f_ffree);
-                    rrddim_set(st, "used", (collected_number) (mntbuf[i].f_files - mntbuf[i].f_ffree));
-                    rrdset_done(st);
-                }
-            }
-        }
-    }
-
-    // Can be merged with FreeBSD plugin
-
-    if (likely(do_bandwidth)) {
-        if (unlikely(getifaddrs(&ifap))) {
-            collector_error("MACOS: getifaddrs()");
-            do_bandwidth = 0;
-            collector_error("DISABLED: system.ipv4");
-        } else {
-            for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-                if (ifa->ifa_addr->sa_family != AF_LINK)
-                        continue;
-
-                st = rrdset_find_active_bytype_localhost("net", ifa->ifa_name);
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "net"
-                            , ifa->ifa_name
-                            , NULL
-                            , ifa->ifa_name
-                            , "net.net"
-                            , "Bandwidth"
-                            , "kilobits/s"
-                            , "macos.plugin"
-                            , "iokit"
-                            , 7000
-                            , update_every
-                            , RRDSET_TYPE_AREA
-                    );
-
-                    rrddim_add(st, "received", NULL,  8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "sent",     NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "received", IFA_DATA(ibytes));
-                rrddim_set(st, "sent", IFA_DATA(obytes));
-                rrdset_done(st);
-
-                st = rrdset_find_active_bytype_localhost("net_packets", ifa->ifa_name);
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "net_packets"
-                            , ifa->ifa_name
-                            , NULL
-                            , ifa->ifa_name
-                            , "net.packets"
-                            , "Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "iokit"
-                            , 7001
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "multicast_received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "multicast_sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "received", IFA_DATA(ipackets));
-                rrddim_set(st, "sent", IFA_DATA(opackets));
-                rrddim_set(st, "multicast_received", IFA_DATA(imcasts));
-                rrddim_set(st, "multicast_sent", IFA_DATA(omcasts));
-                rrdset_done(st);
-
-                st = rrdset_find_active_bytype_localhost("net_errors", ifa->ifa_name);
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "net_errors"
-                            , ifa->ifa_name
-                            , NULL
-                            , ifa->ifa_name
-                            , "net.errors"
-                            , "Interface Errors"
-                            , "errors/s"
-                            , "macos.plugin"
-                            , "iokit"
-                            , 7002
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "inbound", IFA_DATA(ierrors));
-                rrddim_set(st, "outbound", IFA_DATA(oerrors));
-                rrdset_done(st);
-
-                st = rrdset_find_active_bytype_localhost("net_drops", ifa->ifa_name);
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "net_drops"
-                            , ifa->ifa_name
-                            , NULL
-                            , ifa->ifa_name
-                            , "net.drops"
-                            , "Interface Drops"
-                            , "drops/s"
-                            , "macos.plugin"
-                            , "iokit"
-                            , 7003
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "inbound", IFA_DATA(iqdrops));
-                rrdset_done(st);
-
-                st = rrdset_find_active_bytype_localhost("net_events", ifa->ifa_name);
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "net_events"
-                            , ifa->ifa_name
-                            , NULL
-                            , ifa->ifa_name
-                            , "net.events"
-                            , "Network Interface Events"
-                            , "events/s"
-                            , "macos.plugin"
-                            , "iokit"
-                            , 7006
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "carrier", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "collisions", IFA_DATA(collisions));
-                rrdset_done(st);
-            }
-
-            freeifaddrs(ifap);
-        }
-    }
-
-    return 0;
-}
diff --git a/collectors/macos.plugin/macos_mach_smi.c b/collectors/macos.plugin/macos_mach_smi.c
deleted file mode 100644
index 30c95718..00000000
--- a/collectors/macos.plugin/macos_mach_smi.c
+++ /dev/null
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "plugin_macos.h"
-
-#include <mach/mach.h>
-
-int do_macos_mach_smi(int update_every, usec_t dt) {
-    (void)dt;
-
-    static int do_cpu = -1, do_ram = - 1, do_swapio = -1, do_pgfaults = -1;
-
-    if (unlikely(do_cpu == -1)) {
-        do_cpu                  = config_get_boolean("plugin:macos:mach_smi", "cpu utilization", 1);
-        do_ram                  = config_get_boolean("plugin:macos:mach_smi", "system ram", 1);
-        do_swapio               = config_get_boolean("plugin:macos:mach_smi", "swap i/o", 1);
-        do_pgfaults             = config_get_boolean("plugin:macos:mach_smi", "memory page faults", 1);
-    }
-
-    RRDSET *st;
-
-	kern_return_t kr;
-	mach_msg_type_number_t count;
-    host_t host;
-    vm_size_t system_pagesize;
-
-
-    // NEEDED BY: do_cpu
-    natural_t cp_time[CPU_STATE_MAX];
-
-    // NEEDED BY: do_ram, do_swapio, do_pgfaults
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
-    vm_statistics64_data_t vm_statistics;
-#else
-    vm_statistics_data_t vm_statistics;
-#endif
-
-    host = mach_host_self();
-    kr = host_page_size(host, &system_pagesize);
-    if (unlikely(kr != KERN_SUCCESS))
-        return -1;
-
-    if (likely(do_cpu)) {
-        if (unlikely(HOST_CPU_LOAD_INFO_COUNT != 4)) {
-            collector_error("MACOS: There are %d CPU states (4 was expected)", HOST_CPU_LOAD_INFO_COUNT);
-            do_cpu = 0;
-            collector_error("DISABLED: system.cpu");
-        } else {
-            count = HOST_CPU_LOAD_INFO_COUNT;
-            kr = host_statistics(host, HOST_CPU_LOAD_INFO, (host_info_t)cp_time, &count);
-            if (unlikely(kr != KERN_SUCCESS)) {
-                collector_error("MACOS: host_statistics() failed: %s", mach_error_string(kr));
-                do_cpu = 0;
-                collector_error("DISABLED: system.cpu");
-            } else {
-
-                st = rrdset_find_active_bytype_localhost("system", "cpu");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "system"
-                            , "cpu"
-                            , NULL
-                            , "cpu"
-                            , "system.cpu"
-                            , "Total CPU utilization"
-                            , "percentage"
-                            , "macos.plugin"
-                            , "mach_smi"
-                            , 100
-                            , update_every
-                            , RRDSET_TYPE_STACKED
-                    );
-
-                    rrddim_add(st, "user", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
-                    rrddim_add(st, "nice", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
-                    rrddim_add(st, "system", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
-                    rrddim_add(st, "idle", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
-                    rrddim_hide(st, "idle");
-                }
-
-                rrddim_set(st, "user", cp_time[CPU_STATE_USER]);
-                rrddim_set(st, "nice", cp_time[CPU_STATE_NICE]);
-                rrddim_set(st, "system", cp_time[CPU_STATE_SYSTEM]);
-                rrddim_set(st, "idle", cp_time[CPU_STATE_IDLE]);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    if (likely(do_ram || do_swapio || do_pgfaults)) {
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
-        count = sizeof(vm_statistics64_data_t);
-        kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_statistics, &count);
-#else
-        count = sizeof(vm_statistics_data_t);
-        kr = host_statistics(host, HOST_VM_INFO, (host_info_t)&vm_statistics, &count);
-#endif
-        if (unlikely(kr != KERN_SUCCESS)) {
-            collector_error("MACOS: host_statistics64() failed: %s", mach_error_string(kr));
-            do_ram = 0;
-            collector_error("DISABLED: system.ram");
-            do_swapio = 0;
-            collector_error("DISABLED: mem.swapio");
-            do_pgfaults = 0;
-            collector_error("DISABLED: mem.pgfaults");
-        } else {
-            if (likely(do_ram)) {
-                st = rrdset_find_active_localhost("system.ram");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "system"
-                            , "ram"
-                            , NULL
-                            , "ram"
-                            , NULL
-                            , "System RAM"
-                            , "MiB"
-                            , "macos.plugin"
-                            , "mach_smi"
-                            , 200
-                            , update_every
-                            , RRDSET_TYPE_STACKED
-                    );
-
-                    rrddim_add(st, "active",    NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "wired",     NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                    rrddim_add(st, "throttled", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "compressor", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-#endif
-                    rrddim_add(st, "inactive",  NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "purgeable", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "speculative", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "free",      NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                }
-
-                rrddim_set(st, "active",    vm_statistics.active_count);
-                rrddim_set(st, "wired",     vm_statistics.wire_count);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                rrddim_set(st, "throttled", vm_statistics.throttled_count);
-                rrddim_set(st, "compressor", vm_statistics.compressor_page_count);
-#endif
-                rrddim_set(st, "inactive",  vm_statistics.inactive_count);
-                rrddim_set(st, "purgeable", vm_statistics.purgeable_count);
-                rrddim_set(st, "speculative", vm_statistics.speculative_count);
-                rrddim_set(st, "free",      (vm_statistics.free_count - vm_statistics.speculative_count));
-                rrdset_done(st);
-            }
-
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-            if (likely(do_swapio)) {
-                st = rrdset_find_active_localhost("mem.swapio");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "mem"
-                            , "swapio"
-                            , NULL
-                            , "swap"
-                            , NULL
-                            , "Swap I/O"
-                            , "KiB/s"
-                            , "macos.plugin"
-                            , "mach_smi"
-                            , 250
-                            , update_every
-                            , RRDSET_TYPE_AREA
-                    );
-
-                    rrddim_add(st, "in",  NULL, system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "in", vm_statistics.swapins);
-                rrddim_set(st, "out", vm_statistics.swapouts);
-                rrdset_done(st);
-            }
-#endif
-
-            if (likely(do_pgfaults)) {
-                st = rrdset_find_active_localhost("mem.pgfaults");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "mem"
-                            , "pgfaults"
-                            , NULL
-                            , "system"
-                            , NULL
-                            , "Memory Page Faults"
-                            , "faults/s"
-                            , "macos.plugin"
-                            , "mach_smi"
-                            , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "memory",    NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "cow",       NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "pagein",    NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "pageout",   NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                    rrddim_add(st, "compress",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "decompress", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-#endif
-                    rrddim_add(st, "zero_fill", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "reactivate", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "purge",     NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "memory", vm_statistics.faults);
-                rrddim_set(st, "cow", vm_statistics.cow_faults);
-                rrddim_set(st, "pagein", vm_statistics.pageins);
-                rrddim_set(st, "pageout", vm_statistics.pageouts);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                rrddim_set(st, "compress", vm_statistics.compressions);
-                rrddim_set(st, "decompress", vm_statistics.decompressions);
-#endif
-                rrddim_set(st, "zero_fill", vm_statistics.zero_fill_count);
-                rrddim_set(st, "reactivate", vm_statistics.reactivations);
-                rrddim_set(st, "purge", vm_statistics.purges);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    return 0;
-}
diff --git a/collectors/macos.plugin/macos_sysctl.c b/collectors/macos.plugin/macos_sysctl.c
deleted file mode 100644
index 520d2f93..00000000
--- a/collectors/macos.plugin/macos_sysctl.c
+++ /dev/null
@@ -1,1424 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "plugin_macos.h"
-
-#include <Availability.h>
-// NEEDED BY: do_bandwidth
-#include <net/route.h>
-// NEEDED BY do_tcp...
-#include <sys/socketvar.h>
-#include <netinet/tcp_var.h>
-#include <netinet/tcp_fsm.h>
-// NEEDED BY do_udp..., do_ip...
-#include <netinet/ip_var.h>
-// NEEDED BY do_udp...
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-// NEEDED BY do_icmp...
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
-// NEEDED BY do_icmp6...
-#include <netinet/icmp6.h>
-// NEEDED BY do_uptime
-#include <time.h>
-
-// MacOS calculates load averages once every 5 seconds
-#define MIN_LOADAVG_UPDATE_EVERY 5
-
-int do_macos_sysctl(int update_every, usec_t dt) {
-    static int do_loadavg = -1, do_swap = -1, do_bandwidth = -1,
-               do_tcp_packets = -1, do_tcp_errors = -1, do_tcp_handshake = -1, do_ecn = -1,
-               do_tcpext_syscookies = -1, do_tcpext_ofo = -1, do_tcpext_connaborts = -1,
-               do_udp_packets = -1, do_udp_errors = -1, do_icmp_packets = -1, do_icmpmsg = -1,
-               do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1,
-               do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1,
-               do_icmp6 = -1, do_icmp6_redir = -1, do_icmp6_errors = -1, do_icmp6_echos = -1,
-               do_icmp6_router = -1, do_icmp6_neighbor = -1, do_icmp6_types = -1, do_uptime = -1;
-
-
-    if (unlikely(do_loadavg == -1)) {
-        do_loadavg              = config_get_boolean("plugin:macos:sysctl", "enable load average", 1);
-        do_swap                 = config_get_boolean("plugin:macos:sysctl", "system swap", 1);
-        do_bandwidth            = config_get_boolean("plugin:macos:sysctl", "bandwidth", 1);
-        do_tcp_packets          = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP packets", 1);
-        do_tcp_errors           = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP errors", 1);
-        do_tcp_handshake        = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP handshake issues", 1);
-        do_ecn                  = config_get_boolean_ondemand("plugin:macos:sysctl", "ECN packets", CONFIG_BOOLEAN_AUTO);
-        do_tcpext_syscookies    = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
-        do_tcpext_ofo           = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
-        do_tcpext_connaborts    = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
-        do_udp_packets          = config_get_boolean("plugin:macos:sysctl", "ipv4 UDP packets", 1);
-        do_udp_errors           = config_get_boolean("plugin:macos:sysctl", "ipv4 UDP errors", 1);
-        do_icmp_packets         = config_get_boolean("plugin:macos:sysctl", "ipv4 ICMP packets", 1);
-        do_icmpmsg              = config_get_boolean("plugin:macos:sysctl", "ipv4 ICMP messages", 1);
-        do_ip_packets           = config_get_boolean("plugin:macos:sysctl", "ipv4 packets", 1);
-        do_ip_fragsout          = config_get_boolean("plugin:macos:sysctl", "ipv4 fragments sent", 1);
-        do_ip_fragsin           = config_get_boolean("plugin:macos:sysctl", "ipv4 fragments assembly", 1);
-        do_ip_errors            = config_get_boolean("plugin:macos:sysctl", "ipv4 errors", 1);
-        do_ip6_packets          = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 packets", CONFIG_BOOLEAN_AUTO);
-        do_ip6_fragsout         = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
-        do_ip6_fragsin          = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments assembly", CONFIG_BOOLEAN_AUTO);
-        do_ip6_errors           = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 errors", CONFIG_BOOLEAN_AUTO);
-        do_icmp6                = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_redir          = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp redirects", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_errors         = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp errors", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_echos          = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp echos", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_router         = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp router", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_neighbor       = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp neighbor", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_types          = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp types", CONFIG_BOOLEAN_AUTO);
-        do_uptime               = config_get_boolean("plugin:macos:sysctl", "system uptime", 1);
-    }
-
-    RRDSET *st = NULL;
-
-    int i;
-    size_t size;
-
-    // NEEDED BY: do_loadavg
-    static usec_t next_loadavg_dt = 0;
-    struct loadavg sysload;
-
-    // NEEDED BY: do_swap
-    struct xsw_usage swap_usage;
-
-    // NEEDED BY: do_bandwidth
-    int mib[6];
-    static char *ifstatdata = NULL;
-    char *lim, *next;
-    struct if_msghdr *ifm;
-    struct iftot {
-        u_long  ift_ibytes;
-        u_long  ift_obytes;
-    } iftot = {0, 0};
-
-    // NEEDED BY: do_tcp...
-    struct tcpstat tcpstat;
-
-    // NEEDED BY: do_udp...
-    struct udpstat udpstat;
-
-    // NEEDED BY: do_icmp...
-    struct icmpstat icmpstat;
-    struct icmp_total {
-        u_long  msgs_in;
-        u_long  msgs_out;
-    } icmp_total = {0, 0};
-
-    // NEEDED BY: do_ip...
-    struct ipstat ipstat;
-
-    // NEEDED BY: do_ip6...
-    /*
-     * Dirty workaround for /usr/include/netinet6/ip6_var.h absence.
-     * Struct ip6stat was copied from bsd/netinet6/ip6_var.h from xnu sources.
-     * Do the same for previously missing scope6_var.h on OS X < 10.11.
-     */
-#define	IP6S_SRCRULE_COUNT 16
-
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100)
-#ifndef _NETINET6_SCOPE6_VAR_H_
-#define _NETINET6_SCOPE6_VAR_H_
-#include <sys/appleapiopts.h>
-
-#define	SCOPE6_ID_MAX	16
-#endif
-#else
-#include <netinet6/scope6_var.h>
-#endif
-
-    struct	ip6stat {
-        u_quad_t ip6s_total;		/* total packets received */
-        u_quad_t ip6s_tooshort;		/* packet too short */
-        u_quad_t ip6s_toosmall;		/* not enough data */
-        u_quad_t ip6s_fragments;	/* fragments received */
-        u_quad_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
-        u_quad_t ip6s_fragtimeout;	/* fragments timed out */
-        u_quad_t ip6s_fragoverflow;	/* fragments that exceeded limit */
-        u_quad_t ip6s_forward;		/* packets forwarded */
-        u_quad_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
-        u_quad_t ip6s_redirectsent;	/* packets forwarded on same net */
-        u_quad_t ip6s_delivered;	/* datagrams delivered to upper level */
-        u_quad_t ip6s_localout;		/* total ip packets generated here */
-        u_quad_t ip6s_odropped;		/* lost packets due to nobufs, etc. */
-        u_quad_t ip6s_reassembled;	/* total packets reassembled ok */
-        u_quad_t ip6s_atmfrag_rcvd;	/* atomic fragments received */
-        u_quad_t ip6s_fragmented;	/* datagrams successfully fragmented */
-        u_quad_t ip6s_ofragments;	/* output fragments created */
-        u_quad_t ip6s_cantfrag;		/* don't fragment flag was set, etc. */
-        u_quad_t ip6s_badoptions;	/* error in option processing */
-        u_quad_t ip6s_noroute;		/* packets discarded due to no route */
-        u_quad_t ip6s_badvers;		/* ip6 version != 6 */
-        u_quad_t ip6s_rawout;		/* total raw ip packets generated */
-        u_quad_t ip6s_badscope;		/* scope error */
-        u_quad_t ip6s_notmember;	/* don't join this multicast group */
-        u_quad_t ip6s_nxthist[256];	/* next header history */
-        u_quad_t ip6s_m1;		/* one mbuf */
-        u_quad_t ip6s_m2m[32];		/* two or more mbuf */
-        u_quad_t ip6s_mext1;		/* one ext mbuf */
-        u_quad_t ip6s_mext2m;		/* two or more ext mbuf */
-        u_quad_t ip6s_exthdrtoolong;	/* ext hdr are not continuous */
-        u_quad_t ip6s_nogif;		/* no match gif found */
-        u_quad_t ip6s_toomanyhdr;	/* discarded due to too many headers */
-
-        /*
-         * statistics for improvement of the source address selection
-         * algorithm:
-         */
-        /* number of times that address selection fails */
-        u_quad_t ip6s_sources_none;
-        /* number of times that an address on the outgoing I/F is chosen */
-        u_quad_t ip6s_sources_sameif[SCOPE6_ID_MAX];
-        /* number of times that an address on a non-outgoing I/F is chosen */
-        u_quad_t ip6s_sources_otherif[SCOPE6_ID_MAX];
-        /*
-         * number of times that an address that has the same scope
-         * from the destination is chosen.
-         */
-        u_quad_t ip6s_sources_samescope[SCOPE6_ID_MAX];
-        /*
-         * number of times that an address that has a different scope
-         * from the destination is chosen.
-         */
-        u_quad_t ip6s_sources_otherscope[SCOPE6_ID_MAX];
-        /* number of times that a deprecated address is chosen */
-        u_quad_t ip6s_sources_deprecated[SCOPE6_ID_MAX];
-
-        u_quad_t ip6s_forward_cachehit;
-        u_quad_t ip6s_forward_cachemiss;
-
-        /* number of times that each rule of source selection is applied. */
-        u_quad_t ip6s_sources_rule[IP6S_SRCRULE_COUNT];
-
-        /* number of times we ignored address on expensive secondary interfaces */
-        u_quad_t ip6s_sources_skip_expensive_secondary_if;
-
-        /* pkt dropped, no mbufs for control data */
-        u_quad_t ip6s_pktdropcntrl;
-
-        /* total packets trimmed/adjusted  */
-        u_quad_t ip6s_adj;
-        /* hwcksum info discarded during adjustment */
-        u_quad_t ip6s_adj_hwcsum_clr;
-
-        /* duplicate address detection collisions */
-        u_quad_t ip6s_dad_collide;
-
-        /* DAD NS looped back */
-        u_quad_t ip6s_dad_loopcount;
-    } ip6stat;
-
-    // NEEDED BY: do_icmp6...
-    struct icmp6stat icmp6stat;
-    struct icmp6_total {
-        u_long  msgs_in;
-        u_long  msgs_out;
-    } icmp6_total = {0, 0};
-
-    // NEEDED BY: do_uptime
-    struct timespec boot_time, cur_time;
-
-    if (next_loadavg_dt <= dt) {
-        if (likely(do_loadavg)) {
-            if (unlikely(GETSYSCTL_BY_NAME("vm.loadavg", sysload))) {
-                do_loadavg = 0;
-                collector_error("DISABLED: system.load");
-            } else {
-
-                st = rrdset_find_active_bytype_localhost("system", "load");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "system"
-                            , "load"
-                            , NULL
-                            , "load"
-                            , NULL
-                            , "System Load Average"
-                            , "load"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 100
-                            , (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrddim_add(st, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
-                    rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
-                }
-
-                rrddim_set(st, "load1", (collected_number) ((double)sysload.ldavg[0] / sysload.fscale * 1000));
-                rrddim_set(st, "load5", (collected_number) ((double)sysload.ldavg[1] / sysload.fscale * 1000));
-                rrddim_set(st, "load15", (collected_number) ((double)sysload.ldavg[2] / sysload.fscale * 1000));
-                rrdset_done(st);
-            }
-        }
-
-        next_loadavg_dt = st->update_every * USEC_PER_SEC;
-    }
-    else next_loadavg_dt -= dt;
-
-    if (likely(do_swap)) {
-        if (unlikely(GETSYSCTL_BY_NAME("vm.swapusage", swap_usage))) {
-            do_swap = 0;
-            collector_error("DISABLED: mem.swap");
-        } else {
-            st = rrdset_find_active_localhost("mem.swap");
-            if (unlikely(!st)) {
-                st = rrdset_create_localhost(
-                        "mem"
-                        , "swap"
-                        , NULL
-                        , "swap"
-                        , NULL
-                        , "System Swap"
-                        , "MiB"
-                        , "macos.plugin"
-                        , "sysctl"
-                        , 201
-                        , update_every
-                        , RRDSET_TYPE_STACKED
-                );
-                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                rrddim_add(st, "free",    NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
-                rrddim_add(st, "used",    NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
-            }
-
-            rrddim_set(st, "free", swap_usage.xsu_avail);
-            rrddim_set(st, "used", swap_usage.xsu_used);
-            rrdset_done(st);
-        }
-    }
-
-    if (likely(do_bandwidth)) {
-        mib[0] = CTL_NET;
-        mib[1] = PF_ROUTE;
-        mib[2] = 0;
-        mib[3] = AF_INET;
-        mib[4] = NET_RT_IFLIST2;
-        mib[5] = 0;
-        if (unlikely(sysctl(mib, 6, NULL, &size, NULL, 0))) {
-            collector_error("MACOS: sysctl(%s...) failed: %s", "net interfaces", strerror(errno));
-            do_bandwidth = 0;
-            collector_error("DISABLED: system.ipv4");
-        } else {
-            ifstatdata = reallocz(ifstatdata, size);
-            if (unlikely(sysctl(mib, 6, ifstatdata, &size, NULL, 0) < 0)) {
-                collector_error("MACOS: sysctl(%s...) failed: %s", "net interfaces", strerror(errno));
-                do_bandwidth = 0;
-                collector_error("DISABLED: system.ipv4");
-            } else {
-                lim = ifstatdata + size;
-                iftot.ift_ibytes = iftot.ift_obytes = 0;
-                for (next = ifstatdata; next < lim; ) {
-                    ifm = (struct if_msghdr *)next;
-                    next += ifm->ifm_msglen;
-
-                    if (ifm->ifm_type == RTM_IFINFO2) {
-                        struct if_msghdr2 *if2m = (struct if_msghdr2 *)ifm;
-
-                        iftot.ift_ibytes += if2m->ifm_data.ifi_ibytes;
-                        iftot.ift_obytes += if2m->ifm_data.ifi_obytes;
-                    }
-                }
-                st = rrdset_find_active_localhost("system.ipv4");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "system"
-                            , "ipv4"
-                            , NULL
-                            , "network"
-                            , NULL
-                            , "IPv4 Bandwidth"
-                            , "kilobits/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 500
-                            , update_every
-                            , RRDSET_TYPE_AREA
-                    );
-
-                    rrddim_add(st, "InOctets",  "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutOctets", "sent",    -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InOctets", iftot.ift_ibytes);
-                rrddim_set(st, "OutOctets", iftot.ift_obytes);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    // see http://net-snmp.sourceforge.net/docs/mibs/tcp.html
-    if (likely(do_tcp_packets || do_tcp_errors || do_tcp_handshake || do_tcpext_connaborts || do_tcpext_ofo || do_tcpext_syscookies || do_ecn)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet.tcp.stats", tcpstat))){
-            do_tcp_packets = 0;
-            collector_error("DISABLED: ipv4.tcppackets");
-            do_tcp_errors = 0;
-            collector_error("DISABLED: ipv4.tcperrors");
-            do_tcp_handshake = 0;
-            collector_error("DISABLED: ipv4.tcphandshake");
-            do_tcpext_connaborts = 0;
-            collector_error("DISABLED: ipv4.tcpconnaborts");
-            do_tcpext_ofo = 0;
-            collector_error("DISABLED: ipv4.tcpofo");
-            do_tcpext_syscookies = 0;
-            collector_error("DISABLED: ipv4.tcpsyncookies");
-            do_ecn = 0;
-            collector_error("DISABLED: ipv4.ecnpkts");
-        } else {
-            if (likely(do_tcp_packets)) {
-                st = rrdset_find_active_localhost("ipv4.tcppackets");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcppackets"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "IPv4 TCP Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2600
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InSegs", tcpstat.tcps_rcvtotal);
-                rrddim_set(st, "OutSegs", tcpstat.tcps_sndtotal);
-                rrdset_done(st);
-            }
-
-            if (likely(do_tcp_errors)) {
-                st = rrdset_find_active_localhost("ipv4.tcperrors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcperrors"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "IPv4 TCP Errors"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2700
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "RetransSegs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InErrs", tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvshort);
-                rrddim_set(st, "InCsumErrors", tcpstat.tcps_rcvbadsum);
-                rrddim_set(st, "RetransSegs", tcpstat.tcps_sndrexmitpack);
-                rrdset_done(st);
-            }
-
-            if (likely(do_tcp_handshake)) {
-                st = rrdset_find_active_localhost("ipv4.tcphandshake");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcphandshake"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "IPv4 TCP Handshake Issues"
-                            , "events/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2900
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "AttemptFails", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "EstabResets", tcpstat.tcps_drops);
-                rrddim_set(st, "ActiveOpens", tcpstat.tcps_connattempt);
-                rrddim_set(st, "PassiveOpens", tcpstat.tcps_accepts);
-                rrddim_set(st, "AttemptFails", tcpstat.tcps_conndrops);
-                rrdset_done(st);
-            }
-
-            if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO &&
-                                                               (tcpstat.tcps_rcvpackafterwin ||
-                                                                tcpstat.tcps_rcvafterclose ||
-                                                                tcpstat.tcps_rcvmemdrop ||
-                                                                tcpstat.tcps_persistdrop ||
-                                                                netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv4.tcpconnaborts");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcpconnaborts"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "TCP Connection Aborts"
-                            , "connections/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3010
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "TCPAbortOnData",    "baddata",     1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "TCPAbortOnClose",   "userclosed",  1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "TCPAbortOnMemory",  "nomemory",    1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "TCPAbortOnTimeout", "timeout",     1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "TCPAbortOnData",    tcpstat.tcps_rcvpackafterwin);
-                rrddim_set(st, "TCPAbortOnClose",   tcpstat.tcps_rcvafterclose);
-                rrddim_set(st, "TCPAbortOnMemory",  tcpstat.tcps_rcvmemdrop);
-                rrddim_set(st, "TCPAbortOnTimeout", tcpstat.tcps_persistdrop);
-                rrdset_done(st);
-            }
-
-            if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO &&
-                                                        (tcpstat.tcps_rcvoopack ||
-                                                         netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_tcpext_ofo = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv4.tcpofo");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcpofo"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "TCP Out-Of-Order Queue"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3050
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "TCPOFOQueue", "inqueue",  1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "TCPOFOQueue",   tcpstat.tcps_rcvoopack);
-                rrdset_done(st);
-            }
-
-            if (do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO &&
-                                                               (tcpstat.tcps_sc_sendcookie ||
-                                                                tcpstat.tcps_sc_recvcookie ||
-                                                                tcpstat.tcps_sc_zonefail ||
-                                                                netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_tcpext_syscookies = CONFIG_BOOLEAN_YES;
-
-                st = rrdset_find_active_localhost("ipv4.tcpsyncookies");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "tcpsyncookies"
-                            , NULL
-                            , "tcp"
-                            , NULL
-                            , "TCP SYN Cookies"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3100
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "SyncookiesRecv",   "received",  1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "SyncookiesSent",   "sent",     -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "SyncookiesFailed", "failed",   -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "SyncookiesRecv",   tcpstat.tcps_sc_recvcookie);
-                rrddim_set(st, "SyncookiesSent",   tcpstat.tcps_sc_sendcookie);
-                rrddim_set(st, "SyncookiesFailed", tcpstat.tcps_sc_zonefail);
-                rrdset_done(st);
-            }
-
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
-            if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO &&
-                                                 (tcpstat.tcps_ecn_recv_ce ||
-                                                  tcpstat.tcps_ecn_not_supported ||
-                                                  netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_ecn = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv4.ecnpkts");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "ecnpkts"
-                            , NULL
-                            , "ecn"
-                            , NULL
-                            , "IPv4 ECN Statistics"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 8700
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InCEPkts", tcpstat.tcps_ecn_recv_ce);
-                rrddim_set(st, "InNoECTPkts", tcpstat.tcps_ecn_not_supported);
-                rrdset_done(st);
-            }
-#endif
-
-        }
-    }
-
-    // see http://net-snmp.sourceforge.net/docs/mibs/udp.html
-    if (likely(do_udp_packets || do_udp_errors)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet.udp.stats", udpstat))) {
-            do_udp_packets = 0;
-            collector_error("DISABLED: ipv4.udppackets");
-            do_udp_errors = 0;
-            collector_error("DISABLED: ipv4.udperrors");
-        } else {
-            if (likely(do_udp_packets)) {
-                st = rrdset_find_active_localhost("ipv4.udppackets");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "udppackets"
-                            , NULL
-                            , "udp"
-                            , NULL
-                            , "IPv4 UDP Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2601
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InDatagrams", udpstat.udps_ipackets);
-                rrddim_set(st, "OutDatagrams", udpstat.udps_opackets);
-                rrdset_done(st);
-            }
-
-            if (likely(do_udp_errors)) {
-                st = rrdset_find_active_localhost("ipv4.udperrors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "udperrors"
-                            , NULL
-                            , "udp"
-                            , NULL
-                            , "IPv4 UDP Errors"
-                            , "events/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2701
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "NoPorts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                    rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-#endif
-                }
-
-                rrddim_set(st, "InErrors", udpstat.udps_hdrops + udpstat.udps_badlen);
-                rrddim_set(st, "NoPorts", udpstat.udps_noport);
-                rrddim_set(st, "RcvbufErrors", udpstat.udps_fullsock);
-#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-                rrddim_set(st, "InCsumErrors", udpstat.udps_badsum + udpstat.udps_nosum);
-                rrddim_set(st, "IgnoredMulti", udpstat.udps_filtermcast);
-#else
-                rrddim_set(st, "InCsumErrors", udpstat.udps_badsum);
-#endif
-                rrdset_done(st);
-            }
-        }
-    }
-
-    if (likely(do_icmp_packets || do_icmpmsg)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet.icmp.stats", icmpstat))) {
-            do_icmp_packets = 0;
-            collector_error("DISABLED: ipv4.icmp");
-            collector_error("DISABLED: ipv4.icmp_errors");
-            do_icmpmsg = 0;
-            collector_error("DISABLED: ipv4.icmpmsg");
-        } else {
-            for (i = 0; i <= ICMP_MAXTYPE; i++) {
-                icmp_total.msgs_in += icmpstat.icps_inhist[i];
-                icmp_total.msgs_out += icmpstat.icps_outhist[i];
-            }
-            icmp_total.msgs_in += icmpstat.icps_badcode + icmpstat.icps_badlen + icmpstat.icps_checksum + icmpstat.icps_tooshort;
-
-            // --------------------------------------------------------------------
-
-            if (likely(do_icmp_packets)) {
-                st = rrdset_find_active_localhost("ipv4.icmp");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "icmp"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv4 ICMP Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2602
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InMsgs", icmp_total.msgs_in);
-                rrddim_set(st, "OutMsgs", icmp_total.msgs_out);
-                rrdset_done(st);
-
-                st = rrdset_find_active_localhost("ipv4.icmp_errors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "icmp_errors"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv4 ICMP Errors"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2603
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InErrors", icmpstat.icps_badcode + icmpstat.icps_badlen + icmpstat.icps_checksum + icmpstat.icps_tooshort);
-                rrddim_set(st, "OutErrors", icmpstat.icps_error);
-                rrddim_set(st, "InCsumErrors", icmpstat.icps_checksum);
-                rrdset_done(st);
-            }
-
-            if (likely(do_icmpmsg)) {
-                st = rrdset_find_active_localhost("ipv4.icmpmsg");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "icmpmsg"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv4 ICMP Messages"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 2604
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InEchoReps", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InEchoReps", icmpstat.icps_inhist[ICMP_ECHOREPLY]);
-                rrddim_set(st, "OutEchoReps", icmpstat.icps_outhist[ICMP_ECHOREPLY]);
-                rrddim_set(st, "InEchos", icmpstat.icps_inhist[ICMP_ECHO]);
-                rrddim_set(st, "OutEchos", icmpstat.icps_outhist[ICMP_ECHO]);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    // see also http://net-snmp.sourceforge.net/docs/mibs/ip.html
-    if (likely(do_ip_packets || do_ip_fragsout || do_ip_fragsin || do_ip_errors)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet.ip.stats", ipstat))) {
-            do_ip_packets = 0;
-            collector_error("DISABLED: ipv4.packets");
-            do_ip_fragsout = 0;
-            collector_error("DISABLED: ipv4.fragsout");
-            do_ip_fragsin = 0;
-            collector_error("DISABLED: ipv4.fragsin");
-            do_ip_errors = 0;
-            collector_error("DISABLED: ipv4.errors");
-        } else {
-            if (likely(do_ip_packets)) {
-                st = rrdset_find_active_localhost("ipv4.packets");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "packets"
-                            , NULL
-                            , "packets"
-                            , NULL
-                            , "IPv4 Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3000
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InDelivers", "delivered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "OutRequests", ipstat.ips_localout);
-                rrddim_set(st, "InReceives", ipstat.ips_total);
-                rrddim_set(st, "ForwDatagrams", ipstat.ips_forward);
-                rrddim_set(st, "InDelivers", ipstat.ips_delivered);
-                rrdset_done(st);
-            }
-
-            if (likely(do_ip_fragsout)) {
-                st = rrdset_find_active_localhost("ipv4.fragsout");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "fragsout"
-                            , NULL
-                            , "fragments"
-                            , NULL
-                            , "IPv4 Fragments Sent"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3010
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "FragOKs", ipstat.ips_fragmented);
-                rrddim_set(st, "FragFails", ipstat.ips_cantfrag);
-                rrddim_set(st, "FragCreates", ipstat.ips_ofragments);
-                rrdset_done(st);
-            }
-
-            if (likely(do_ip_fragsin)) {
-                st = rrdset_find_active_localhost("ipv4.fragsin");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "fragsin"
-                            , NULL
-                            , "fragments"
-                            , NULL
-                            , "IPv4 Fragments Reassembly"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3011
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "ReasmOKs", ipstat.ips_fragments);
-                rrddim_set(st, "ReasmFails", ipstat.ips_fragdropped);
-                rrddim_set(st, "ReasmReqds", ipstat.ips_reassembled);
-                rrdset_done(st);
-            }
-
-            if (likely(do_ip_errors)) {
-                st = rrdset_find_active_localhost("ipv4.errors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv4"
-                            , "errors"
-                            , NULL
-                            , "errors"
-                            , NULL
-                            , "IPv4 Errors"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3002
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-
-                    rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-
-                    rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InDiscards", ipstat.ips_badsum + ipstat.ips_tooshort + ipstat.ips_toosmall + ipstat.ips_toolong);
-                rrddim_set(st, "OutDiscards", ipstat.ips_odropped);
-                rrddim_set(st, "InHdrErrors", ipstat.ips_badhlen + ipstat.ips_badlen + ipstat.ips_badoptions + ipstat.ips_badvers);
-                rrddim_set(st, "InAddrErrors", ipstat.ips_badaddr);
-                rrddim_set(st, "InUnknownProtos", ipstat.ips_noproto);
-                rrddim_set(st, "OutNoRoutes", ipstat.ips_noroute);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    if (likely(do_ip6_packets || do_ip6_fragsout || do_ip6_fragsin || do_ip6_errors)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet6.ip6.stats", ip6stat))) {
-            do_ip6_packets = 0;
-            collector_error("DISABLED: ipv6.packets");
-            do_ip6_fragsout = 0;
-            collector_error("DISABLED: ipv6.fragsout");
-            do_ip6_fragsin = 0;
-            collector_error("DISABLED: ipv6.fragsin");
-            do_ip6_errors = 0;
-            collector_error("DISABLED: ipv6.errors");
-        } else {
-            if (do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
-                                                         (ip6stat.ip6s_localout ||
-                                                          ip6stat.ip6s_total ||
-                                                          ip6stat.ip6s_forward ||
-                                                          ip6stat.ip6s_delivered ||
-                                                          netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_ip6_packets = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.packets");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "packets"
-                            , NULL
-                            , "packets"
-                            , NULL
-                            , "IPv6 Packets"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3000
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "forwarded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "delivers", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "sent", ip6stat.ip6s_localout);
-                rrddim_set(st, "received", ip6stat.ip6s_total);
-                rrddim_set(st, "forwarded", ip6stat.ip6s_forward);
-                rrddim_set(st, "delivers", ip6stat.ip6s_delivered);
-                rrdset_done(st);
-            }
-
-            if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
-                                                          (ip6stat.ip6s_fragmented ||
-                                                           ip6stat.ip6s_cantfrag ||
-                                                           ip6stat.ip6s_ofragments ||
-                                                           netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_ip6_fragsout = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.fragsout");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "fragsout"
-                            , NULL
-                            , "fragments"
-                            , NULL
-                            , "IPv6 Fragments Sent"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3010
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "ok", ip6stat.ip6s_fragmented);
-                rrddim_set(st, "failed", ip6stat.ip6s_cantfrag);
-                rrddim_set(st, "all", ip6stat.ip6s_ofragments);
-                rrdset_done(st);
-            }
-
-            if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
-                                                         (ip6stat.ip6s_reassembled ||
-                                                          ip6stat.ip6s_fragdropped ||
-                                                          ip6stat.ip6s_fragtimeout ||
-                                                          ip6stat.ip6s_fragments ||
-                                                          netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_ip6_fragsin = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.fragsin");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "fragsin"
-                            , NULL
-                            , "fragments"
-                            , NULL
-                            , "IPv6 Fragments Reassembly"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3011
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "timeout", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "ok", ip6stat.ip6s_reassembled);
-                rrddim_set(st, "failed", ip6stat.ip6s_fragdropped);
-                rrddim_set(st, "timeout", ip6stat.ip6s_fragtimeout);
-                rrddim_set(st, "all", ip6stat.ip6s_fragments);
-                rrdset_done(st);
-            }
-
-            if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO &&
-                                                        (ip6stat.ip6s_toosmall ||
-                                                         ip6stat.ip6s_odropped ||
-                                                         ip6stat.ip6s_badoptions ||
-                                                         ip6stat.ip6s_badvers ||
-                                                         ip6stat.ip6s_exthdrtoolong ||
-                                                         ip6stat.ip6s_sources_none ||
-                                                         ip6stat.ip6s_tooshort ||
-                                                         ip6stat.ip6s_cantforward ||
-                                                         ip6stat.ip6s_noroute ||
-                                                         netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_ip6_errors = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.errors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "errors"
-                            , NULL
-                            , "errors"
-                            , NULL
-                            , "IPv6 Errors"
-                            , "packets/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 3002
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
-                    rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-
-                    rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-
-                    rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InDiscards", ip6stat.ip6s_toosmall);
-                rrddim_set(st, "OutDiscards", ip6stat.ip6s_odropped);
-
-                rrddim_set(st, "InHdrErrors",
-                           ip6stat.ip6s_badoptions + ip6stat.ip6s_badvers + ip6stat.ip6s_exthdrtoolong);
-                rrddim_set(st, "InAddrErrors", ip6stat.ip6s_sources_none);
-                rrddim_set(st, "InTruncatedPkts", ip6stat.ip6s_tooshort);
-                rrddim_set(st, "InNoRoutes", ip6stat.ip6s_cantforward);
-
-                rrddim_set(st, "OutNoRoutes", ip6stat.ip6s_noroute);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    if (likely(do_icmp6 || do_icmp6_redir || do_icmp6_errors || do_icmp6_echos || do_icmp6_router || do_icmp6_neighbor || do_icmp6_types)) {
-        if (unlikely(GETSYSCTL_BY_NAME("net.inet6.icmp6.stats", icmp6stat))) {
-            do_icmp6 = 0;
-            collector_error("DISABLED: ipv6.icmp");
-        } else {
-            for (i = 0; i <= ICMP6_MAXTYPE; i++) {
-                icmp6_total.msgs_in += icmp6stat.icp6s_inhist[i];
-                icmp6_total.msgs_out += icmp6stat.icp6s_outhist[i];
-            }
-            icmp6_total.msgs_in += icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort;
-            if (do_icmp6 == CONFIG_BOOLEAN_YES || (do_icmp6 == CONFIG_BOOLEAN_AUTO &&
-                                                   (icmp6_total.msgs_in ||
-                                                    icmp6_total.msgs_out ||
-                                                    netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6 = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmp");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmp"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 ICMP Messages"
-                            , "messages/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10000
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "sent", icmp6_total.msgs_in);
-                rrddim_set(st, "received", icmp6_total.msgs_out);
-                rrdset_done(st);
-            }
-
-            if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO &&
-                                                         (icmp6stat.icp6s_inhist[ND_REDIRECT] ||
-                                                          icmp6stat.icp6s_outhist[ND_REDIRECT] ||
-                                                          netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_redir = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmpredir");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmpredir"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 ICMP Redirects"
-                            , "redirects/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10050
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "sent", icmp6stat.icp6s_inhist[ND_REDIRECT]);
-                rrddim_set(st, "received", icmp6stat.icp6s_outhist[ND_REDIRECT]);
-                rrdset_done(st);
-            }
-
-            if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO &&
-                                                          (icmp6stat.icp6s_badcode ||
-                                                           icmp6stat.icp6s_badlen ||
-                                                           icmp6stat.icp6s_checksum ||
-                                                           icmp6stat.icp6s_tooshort ||
-                                                           icmp6stat.icp6s_error ||
-                                                           icmp6stat.icp6s_inhist[ICMP6_DST_UNREACH] ||
-                                                           icmp6stat.icp6s_inhist[ICMP6_TIME_EXCEEDED] ||
-                                                           icmp6stat.icp6s_inhist[ICMP6_PARAM_PROB] ||
-                                                           icmp6stat.icp6s_outhist[ICMP6_DST_UNREACH] ||
-                                                           icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
-                                                           icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB] ||
-                                                           netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_errors = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmperrors");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmperrors"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 ICMP Errors"
-                            , "errors/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10100
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-
-                    rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InParmProblems", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InErrors", icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort);
-                rrddim_set(st, "OutErrors", icmp6stat.icp6s_error);
-                rrddim_set(st, "InCsumErrors", icmp6stat.icp6s_checksum);
-                rrddim_set(st, "InDestUnreachs", icmp6stat.icp6s_inhist[ICMP6_DST_UNREACH]);
-                rrddim_set(st, "InPktTooBigs", icmp6stat.icp6s_badlen);
-                rrddim_set(st, "InTimeExcds", icmp6stat.icp6s_inhist[ICMP6_TIME_EXCEEDED]);
-                rrddim_set(st, "InParmProblems", icmp6stat.icp6s_inhist[ICMP6_PARAM_PROB]);
-                rrddim_set(st, "OutDestUnreachs", icmp6stat.icp6s_outhist[ICMP6_DST_UNREACH]);
-                rrddim_set(st, "OutTimeExcds", icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED]);
-                rrddim_set(st, "OutParmProblems", icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB]);
-                rrdset_done(st);
-            }
-
-            if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO &&
-                                                         (icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
-                                                          icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
-                                                          icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
-                                                          icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY] ||
-                                                          netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_echos = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmpechos");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmpechos"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 ICMP Echo"
-                            , "messages/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10200
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InEchos", icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST]);
-                rrddim_set(st, "OutEchos", icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST]);
-                rrddim_set(st, "InEchoReplies", icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY]);
-                rrddim_set(st, "OutEchoReplies", icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY]);
-                rrdset_done(st);
-            }
-
-            if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO &&
-                                                          (icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
-                                                           icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
-                                                           icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
-                                                           icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT] ||
-                                                           netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_router = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmprouter");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmprouter"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 Router Messages"
-                            , "messages/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10400
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InSolicits", icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT]);
-                rrddim_set(st, "OutSolicits", icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT]);
-                rrddim_set(st, "InAdvertisements", icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT]);
-                rrddim_set(st, "OutAdvertisements", icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT]);
-                rrdset_done(st);
-            }
-
-            if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO &&
-                                                            (icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
-                                                             icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
-                                                             icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
-                                                             icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT] ||
-                                                             netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmpneighbor");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmpneighbor"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 Neighbor Messages"
-                            , "messages/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10500
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InSolicits", icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT]);
-                rrddim_set(st, "OutSolicits", icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]);
-                rrddim_set(st, "InAdvertisements", icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT]);
-                rrddim_set(st, "OutAdvertisements", icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]);
-            }
-
-            if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO &&
-                                                         (icmp6stat.icp6s_inhist[1] ||
-                                                          icmp6stat.icp6s_inhist[128] ||
-                                                          icmp6stat.icp6s_inhist[129] ||
-                                                          icmp6stat.icp6s_inhist[136] ||
-                                                          icmp6stat.icp6s_outhist[1] ||
-                                                          icmp6stat.icp6s_outhist[128] ||
-                                                          icmp6stat.icp6s_outhist[129] ||
-                                                          icmp6stat.icp6s_outhist[133] ||
-                                                          icmp6stat.icp6s_outhist[135] ||
-                                                          icmp6stat.icp6s_outhist[136] ||
-                                                          netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-                do_icmp6_types = CONFIG_BOOLEAN_YES;
-                st = rrdset_find_active_localhost("ipv6.icmptypes");
-                if (unlikely(!st)) {
-                    st = rrdset_create_localhost(
-                            "ipv6"
-                            , "icmptypes"
-                            , NULL
-                            , "icmp"
-                            , NULL
-                            , "IPv6 ICMP Types"
-                            , "messages/s"
-                            , "macos.plugin"
-                            , "sysctl"
-                            , 10700
-                            , update_every
-                            , RRDSET_TYPE_LINE
-                    );
-
-                    rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InType129", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "InType136", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType1", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType128", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType129", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType133", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType135", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                    rrddim_add(st, "OutType143", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-                }
-
-                rrddim_set(st, "InType1", icmp6stat.icp6s_inhist[1]);
-                rrddim_set(st, "InType128", icmp6stat.icp6s_inhist[128]);
-                rrddim_set(st, "InType129", icmp6stat.icp6s_inhist[129]);
-                rrddim_set(st, "InType136", icmp6stat.icp6s_inhist[136]);
-                rrddim_set(st, "OutType1", icmp6stat.icp6s_outhist[1]);
-                rrddim_set(st, "OutType128", icmp6stat.icp6s_outhist[128]);
-                rrddim_set(st, "OutType129", icmp6stat.icp6s_outhist[129]);
-                rrddim_set(st, "OutType133", icmp6stat.icp6s_outhist[133]);
-                rrddim_set(st, "OutType135", icmp6stat.icp6s_outhist[135]);
-                rrddim_set(st, "OutType143", icmp6stat.icp6s_outhist[143]);
-                rrdset_done(st);
-            }
-        }
-    }
-
-    if (likely(do_uptime)) {
-        if (unlikely(GETSYSCTL_BY_NAME("kern.boottime", boot_time))) {
-            do_uptime = 0;
-            collector_error("DISABLED: system.uptime");
-        } else {
-            clock_gettime(CLOCK_REALTIME, &cur_time);
-            st = rrdset_find_active_localhost("system.uptime");
-
-            if(unlikely(!st)) {
-                st = rrdset_create_localhost(
-                        "system"
-                        , "uptime"
-                        , NULL
-                        , "uptime"
-                        , NULL
-                        , "System Uptime"
-                        , "seconds"
-                        , "macos.plugin"
-                        , "sysctl"
-                        , 1000
-                        , update_every
-                        , RRDSET_TYPE_LINE
-                );
-                rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
-            }
-
-            rrddim_set(st, "uptime", cur_time.tv_sec - boot_time.tv_sec);
-            rrdset_done(st);
-        }
-    }
-
-    return 0;
-}
diff --git a/collectors/macos.plugin/metadata.yaml b/collectors/macos.plugin/metadata.yaml
deleted file mode 100644
index cc159ad1..00000000
--- a/collectors/macos.plugin/metadata.yaml
+++ /dev/null
@@ -1,727 +0,0 @@
-plugin_name: macos.plugin
-modules:
-  - meta:
-      plugin_name: macos.plugin
-      module_name: mach_smi
-      monitored_instance:
-        name: macOS
-        link: "https://www.apple.com/macos"
-        categories:
-          - data-collection.macos-systems
-        icon_filename: "macos.svg"
-      related_resources:
-        integrations:
-          list: []
-      info_provided_to_referring_integrations:
-        description: ""
-      keywords:
-        - macos
-        - apple
-        - darwin
-      most_popular: false
-    overview:
-      data_collection:
-        metrics_description: "Monitor macOS metrics for efficient operating system performance."
-        method_description: |
-          The plugin uses three different methods to collect data:
-            - The function `sysctlbyname` is called to collect network, swap, loadavg, and boot time.
-            - The functtion `host_statistic` is called to collect CPU and Virtual memory data;
-            - The function `IOServiceGetMatchingServices` to collect storage information.
-      supported_platforms:
-        include:
-          - macOS
-        exclude: []
-      multi_instance: false
-      additional_permissions:
-        description: ""
-      default_behavior:
-        auto_detection:
-          description: ""
-        limits:
-          description: ""
-        performance_impact:
-          description: ""
-    setup:
-      prerequisites:
-        list: []
-      configuration:
-        file:
-          name: "netdata.conf"
-          description: "The netdata main configuration file."
-        options:
-          description: |
-            There are three sections in the file which you can configure:
-
-            - `[plugin:macos:sysctl]` - Enable or disable monitoring for network, swap, loadavg, and boot time.
-            - `[plugin:macos:mach_smi]` - Enable or disable monitoring for CPU and Virtual memory.
-            - `[plugin:macos:iokit]` - Enable or disable monitoring for storage device.
-          folding:
-            title: "Config options"
-            enabled: true
-          list:
-            - name: enable load average
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of load average metrics (load1, load5, load15).
-              default_value: yes
-              required: false
-            - name: system swap
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of system swap metrics (free, used).
-              default_value: yes
-              required: false
-            - name: bandwidth
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of network bandwidth metrics (received, sent).
-              default_value: yes
-              required: false
-            - name: ipv4 TCP packets
-              description: Enable or disable monitoring of IPv4 TCP total packets metrics (received, sent).
-              section_name: plugin:macos:sysctl
-              default_value: yes
-              required: false
-            - name: ipv4 TCP errors
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 TCP packets metrics (Input Errors, Checksum, Retransmission segments).
-              default_value: yes
-              required: false
-            - name: ipv4 TCP handshake issues
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 TCP handshake metrics (Established Resets, Active Opens, Passive Opens, Attempt Fails).
-              default_value: yes
-              required: false
-            - name: ECN packets
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ECN statistics metrics (InCEPkts, InNoECTPkts).
-              default_value: auto
-              required: false
-            - name: TCP SYN cookies
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of TCP SYN cookies metrics (received, sent, failed).
-              default_value: auto
-              required: false
-            - name: TCP out-of-order queue
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of TCP out-of-order queue metrics (inqueue).
-              default_value: auto
-              required: false
-            - name: TCP connection aborts
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of TCP connection aborts metrics (Bad Data, User closed, No memory, Timeout).
-              default_value: auto
-              required: false
-            - name: ipv4 UDP packets
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ipv4 UDP packets metrics (sent, received.).
-              default_value: yes
-              required: false
-            - name: ipv4 UDP errors
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ipv4 UDP errors metrics (Recieved Buffer error, Input Errors, No Ports, IN Checksum Errors, Ignore Multi).
-              default_value: yes
-              required: false
-            - name: ipv4 icmp packets
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 ICMP packets metrics (sent, received, in error, OUT error, IN Checksum error).
-              default_value: yes
-              required: false
-            - name: ipv4 icmp messages
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ipv4 ICMP messages metrics (I/O messages, I/O Errors, In Checksum).
-              default_value: yes
-              required: false
-            - name: ipv4 packets
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ipv4 packets metrics (received, sent, forwarded, delivered).
-              default_value: yes
-              required: false
-            - name: ipv4 fragments sent
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 fragments sent metrics (ok, fails, creates).
-              default_value: yes
-              required: false
-            - name: ipv4 fragments assembly
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 fragments assembly metrics (ok, failed, all).
-              default_value: yes
-              required: false
-            - name: ipv4 errors
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv4 errors metrics (I/O discard, I/O HDR errors, In Addr errors, In Unknown protos, OUT No Routes).
-              default_value: yes
-              required: false
-            - name: ipv6 packets
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv6 packets metrics (received, sent, forwarded, delivered).
-              default_value: auto
-              required: false
-            - name: ipv6 fragments sent
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv6 fragments sent metrics (ok, failed, all).
-              default_value: auto
-              required: false
-            - name: ipv6 fragments assembly
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv6 fragments assembly metrics (ok, failed, timeout, all).
-              default_value: auto
-              required: false
-            - name: ipv6 errors
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of IPv6 errors metrics (I/O Discards, In Hdr Errors, In Addr Errors, In Truncaedd Packets, I/O No Routes).
-              default_value: auto
-              required: false
-            - name: icmp
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP metrics (sent, received).
-              default_value: auto
-              required: false
-            - name: icmp redirects
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP redirects metrics (received, sent).
-              default_value: auto
-              required: false
-            - name: icmp errors
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP metrics (I/O Errors, In Checksums, In Destination Unreachable, In Packet too big, In Time Exceeds, In Parm Problem, Out Dest Unreachable, Out Timee Exceeds, Out Parm Problems.).
-              default_value: auto
-              required: false
-            - name: icmp echos
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP echos metrics (I/O Echos, I/O Echo Reply).
-              default_value: auto
-              required: false
-            - name: icmp router
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP router metrics (I/O Solicits, I/O Advertisements).
-              default_value: auto
-              required: false
-            - name: icmp neighbor
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP neighbor metrics (I/O Solicits, I/O Advertisements).
-              default_value: auto
-              required: false
-            - name: icmp types
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of ICMP types metrics (I/O Type1, I/O Type128, I/O Type129, Out Type133, Out Type135, In Type136, Out Type145).
-              default_value: auto
-              required: false
-            - name: space usage for all disks
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of space usage for all disks metrics (available, used, reserved for root).
-              default_value: yes
-              required: false
-            - name: inodes usage for all disks
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of inodes usage for all disks metrics (available, used, reserved for root).
-              default_value: yes
-              required: false
-            - name: bandwidth
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of bandwidth metrics (received, sent).
-              default_value: yes
-              required: false
-            - name: system uptime
-              section_name: plugin:macos:sysctl
-              description: Enable or disable monitoring of system uptime metrics (uptime).
-              default_value: yes
-              required: false
-            - name: cpu utilization
-              section_name: plugin:macos:mach_smi
-              description: Enable or disable monitoring of CPU utilization metrics (user, nice, system, idel).
-              default_value: yes
-              required: false
-            - name: system ram
-              section_name: plugin:macos:mach_smi
-              description: Enable or disable monitoring of system RAM metrics (Active, Wired, throttled, compressor, inactive, purgeable, speculative, free).
-              default_value: yes
-              required: false
-            - name: swap i/o
-              section_name: plugin:macos:mach_smi
-              description: Enable or disable monitoring of SWAP I/O metrics (I/O Swap).
-              default_value: yes
-              required: false
-            - name: memory page faults
-              section_name: plugin:macos:mach_smi
-              description: Enable or disable monitoring of memory page faults metrics (memory, cow, I/O page, compress, decompress, zero fill, reactivate, purge).
-              default_value: yes
-              required: false
-            - name: disk i/o
-              section_name: plugin:macos:iokit
-              description: Enable or disable monitoring of disk I/O metrics (In, Out).
-              default_value: yes
-              required: false
-        examples:
-          folding:
-            enabled: false
-            title: "Config"
-          list:
-            - name: Disable swap monitoring.
-              folding:
-                enabled: true
-              description: A basic example that discards swap monitoring
-              config: |
-                [plugin:macos:sysctl]
-                  system swap = no
-                [plugin:macos:mach_smi]
-                  swap i/o = no
-            - name: Disable complete Machine SMI section.
-              folding:
-                enabled: true
-              description: A basic example that discards swap monitoring
-              config: |
-                [plugin:macos:mach_smi]
-                  cpu utilization = no
-                  system ram = no
-                  swap i/o = no
-                  memory page faults = no
-                  disk i/o = no
-    troubleshooting:
-      problems:
-        list: []
-    alerts:
-      - name: interface_speed
-        link: https://github.com/netdata/netdata/blob/master/health/health.d/net.conf
-        metric: net.net
-        info: network interface ${label:device} current speed
-        os: "*"
-    metrics:
-      folding:
-        title: Metrics
-        enabled: false
-      description: ""
-      availability: []
-      scopes:
-        - name: global
-          description: |
-            These metrics refer to hardware and network monitoring.
-          labels: []
-          metrics:
-            - name: system.cpu
-              description: Total CPU utilization
-              unit: "percentage"
-              chart_type: stacked
-              dimensions:
-                - name: user
-                - name: nice
-                - name: system
-                - name: idle
-            - name: system.ram
-              description: System RAM
-              unit: "MiB"
-              chart_type: stacked
-              dimensions:
-                - name: active
-                - name: wired
-                - name: throttled
-                - name: compressor
-                - name: inactive
-                - name: purgeable
-                - name: speculative
-                - name: free
-            - name: mem.swapio
-              description: Swap I/O
-              unit: "KiB/s"
-              chart_type: area
-              dimensions:
-                - name: io
-                - name: out
-            - name: mem.pgfaults
-              description: Memory Page Faults
-              unit: "faults/s"
-              chart_type: line
-              dimensions:
-                - name: memory
-                - name: cow
-                - name: pagein
-                - name: pageout
-                - name: compress
-                - name: decompress
-                - name: zero_fill
-                - name: reactivate
-                - name: purge
-            - name: system.load
-              description: System Load Average
-              unit: "load"
-              chart_type: line
-              dimensions:
-                - name: load1
-                - name: load5
-                - name: load15
-            - name: mem.swap
-              description: System Swap
-              unit: "MiB"
-              chart_type: stacked
-              dimensions:
-                - name: free
-                - name: used
-            - name: system.ipv4
-              description: IPv4 Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv4.tcppackets
-              description: IPv4 TCP Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv4.tcperrors
-              description: IPv4 TCP Errors
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: InErrs
-                - name: InCsumErrors
-                - name: RetransSegs
-            - name: ipv4.tcphandshake
-              description: IPv4 TCP Handshake Issues
-              unit: "events/s"
-              chart_type: line
-              dimensions:
-                - name: EstabResets
-                - name: ActiveOpens
-                - name: PassiveOpens
-                - name: AttemptFails
-            - name: ipv4.tcpconnaborts
-              description: TCP Connection Aborts
-              unit: "connections/s"
-              chart_type: line
-              dimensions:
-                - name: baddata
-                - name: userclosed
-                - name: nomemory
-                - name: timeout
-            - name: ipv4.tcpofo
-              description: TCP Out-Of-Order Queue
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: inqueue
-            - name: ipv4.tcpsyncookies
-              description: TCP SYN Cookies
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-                - name: failed
-            - name: ipv4.ecnpkts
-              description: IPv4 ECN Statistics
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: CEP
-                - name: NoECTP
-            - name: ipv4.udppackets
-              description: IPv4 UDP Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv4.udperrors
-              description: IPv4 UDP Errors
-              unit: "events/s"
-              chart_type: line
-              dimensions:
-                - name: RcvbufErrors
-                - name: InErrors
-                - name: NoPorts
-                - name: InCsumErrors
-                - name: IgnoredMulti
-            - name: ipv4.icmp
-              description: IPv4 ICMP Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv4.icmp_errors
-              description: IPv4 ICMP Errors
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: InErrors
-                - name: OutErrors
-                - name: InCsumErrors
-            - name: ipv4.icmpmsg
-              description: IPv4 ICMP Messages
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: InEchoReps
-                - name: OutEchoReps
-                - name: InEchos
-                - name: OutEchos
-            - name: ipv4.packets
-              description: IPv4 Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-                - name: forwarded
-                - name: delivered
-            - name: ipv4.fragsout
-              description: IPv4 Fragments Sent
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: created
-            - name: ipv4.fragsin
-              description: IPv4 Fragments Reassembly
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: all
-            - name: ipv4.errors
-              description: IPv4 Errors
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: InDiscards
-                - name: OutDiscards
-                - name: InHdrErrors
-                - name: OutNoRoutes
-                - name: InAddrErrors
-                - name: InUnknownProtos
-            - name: ipv6.packets
-              description: IPv6 Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-                - name: forwarded
-                - name: delivers
-            - name: ipv6.fragsout
-              description: IPv6 Fragments Sent
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: all
-            - name: ipv6.fragsin
-              description: IPv6 Fragments Reassembly
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: timeout
-                - name: all
-            - name: ipv6.errors
-              description: IPv6 Errors
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: InDiscards
-                - name: OutDiscards
-                - name: InHdrErrors
-                - name: InAddrErrors
-                - name: InTruncatedPkts
-                - name: InNoRoutes
-                - name: OutNoRoutes
-            - name: ipv6.icmp
-              description: IPv6 ICMP Messages
-              unit: "messages/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv6.icmpredir
-              description: IPv6 ICMP Redirects
-              unit: "redirects/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv6.icmperrors
-              description: IPv6 ICMP Errors
-              unit: "errors/s"
-              chart_type: line
-              dimensions:
-                - name: InErrors
-                - name: OutErrors
-                - name: InCsumErrors
-                - name: InDestUnreachs
-                - name: InPktTooBigs
-                - name: InTimeExcds
-                - name: InParmProblems
-                - name: OutDestUnreachs
-                - name: OutTimeExcds
-                - name: OutParmProblems
-            - name: ipv6.icmpechos
-              description: IPv6 ICMP Echo
-              unit: "messages/s"
-              chart_type: line
-              dimensions:
-                - name: InEchos
-                - name: OutEchos
-                - name: InEchoReplies
-                - name: OutEchoReplies
-            - name: ipv6.icmprouter
-              description: IPv6 Router Messages
-              unit: "messages/s"
-              chart_type: line
-              dimensions:
-                - name: InSolicits
-                - name: OutSolicits
-                - name: InAdvertisements
-                - name: OutAdvertisements
-            - name: ipv6.icmpneighbor
-              description: IPv6 Neighbor Messages
-              unit: "messages/s"
-              chart_type: line
-              dimensions:
-                - name: InSolicits
-                - name: OutSolicits
-                - name: InAdvertisements
-                - name: OutAdvertisements
-            - name: ipv6.icmptypes
-              description: IPv6 ICMP Types
-              unit: "messages/s"
-              chart_type: line
-              dimensions:
-                - name: InType1
-                - name: InType128
-                - name: InType129
-                - name: InType136
-                - name: OutType1
-                - name: OutType128
-                - name: OutType129
-                - name: OutType133
-                - name: OutType135
-                - name: OutType143
-            - name: system.uptime
-              description: System Uptime
-              unit: "seconds"
-              chart_type: line
-              dimensions:
-                - name: uptime
-            - name: system.io
-              description: Disk I/O
-              unit: "KiB/s"
-              chart_type: area
-              dimensions:
-                - name: in
-                - name: out
-        - name: disk
-          description: ""
-          labels: []
-          metrics:
-            - name: disk.io
-              description: Disk I/O Bandwidth
-              unit: "KiB/s"
-              chart_type: area
-              dimensions:
-                - name: read
-                - name: writes
-            - name: disk.ops
-              description: Disk Completed I/O Operations
-              unit: "operations/s"
-              chart_type: line
-              dimensions:
-                - name: read
-                - name: writes
-            - name: disk.util
-              description: Disk Utilization Time
-              unit: "% of time working"
-              chart_type: area
-              dimensions:
-                - name: utilization
-            - name: disk.iotime
-              description: Disk Total I/O Time
-              unit: "milliseconds/s"
-              chart_type: line
-              dimensions:
-                - name: reads
-                - name: writes
-            - name: disk.await
-              description: Average Completed I/O Operation Time
-              unit: "milliseconds/operation"
-              chart_type: line
-              dimensions:
-                - name: reads
-                - name: writes
-            - name: disk.avgsz
-              description: Average Completed I/O Operation Bandwidth
-              unit: "KiB/operation"
-              chart_type: line
-              dimensions:
-                - name: reads
-                - name: writes
-            - name: disk.svctm
-              description: Average Service Time
-              unit: "milliseconds/operation"
-              chart_type: line
-              dimensions:
-                - name: svctm
-        - name: mount point
-          description: ""
-          labels: []
-          metrics:
-            - name: disk.space
-              description: Disk Space Usage for {mounted dir} [{mounted filesystem}]
-              unit: "GiB"
-              chart_type: stacked
-              dimensions:
-                - name: avail
-                - name: used
-                - name: reserved_for_root
-            - name: disk.inodes
-              description: Disk Files (inodes) Usage for {mounted dir} [{mounted filesystem}]
-              unit: "inodes"
-              chart_type: stacked
-              dimensions:
-                - name: avail
-                - name: used
-                - name: reserved_for_root
-        - name: network device
-          description: ""
-          labels: []
-          metrics:
-            - name: net.net
-              description: Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: net.packets
-              description: Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-                - name: multicast_received
-                - name: multicast_sent
-            - name: net.errors
-              description: Interface Errors
-              unit: "errors/s"
-              chart_type: line
-              dimensions:
-                - name: inbound
-                - name: outbound
-            - name: net.drops
-              description: Interface Drops
-              unit: "drops/s"
-              chart_type: line
-              dimensions:
-                - name: inbound
-            - name: net.events
-              description: Network Interface Events
-              unit: "events/s"
-              chart_type: line
-              dimensions:
-                - name: frames
-                - name: collisions
-                - name: carrier
diff --git a/collectors/macos.plugin/plugin_macos.c b/collectors/macos.plugin/plugin_macos.c
deleted file mode 100644
index 3aaa46c7..00000000
--- a/collectors/macos.plugin/plugin_macos.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "plugin_macos.h"
-
-static struct macos_module {
-    const char *name;
-    const char *dim;
-
-    int enabled;
-
-    int (*func)(int update_every, usec_t dt);
-
-    RRDDIM *rd;
-
-} macos_modules[] = {
-    {.name = "sysctl",                           .dim = "sysctl",   .enabled = 1, .func = do_macos_sysctl},
-    {.name = "mach system management interface", .dim = "mach_smi", .enabled = 1, .func = do_macos_mach_smi},
-    {.name = "iokit",                            .dim = "iokit",    .enabled = 1, .func = do_macos_iokit},
-
-    // the terminator of this array
-    {.name = NULL, .dim = NULL, .enabled = 0, .func = NULL}
-};
-
-#if WORKER_UTILIZATION_MAX_JOB_TYPES < 3
-#error WORKER_UTILIZATION_MAX_JOB_TYPES has to be at least 3
-#endif
-
-static void macos_main_cleanup(void *ptr)
-{
-    worker_unregister();
-
-    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
-
-    collector_info("cleaning up...");
-
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
-}
-
-void *macos_main(void *ptr)
-{
-    worker_register("MACOS");
-
-    netdata_thread_cleanup_push(macos_main_cleanup, ptr);
-
-    // check the enabled status for each module
-    for (int i = 0; macos_modules[i].name; i++) {
-        struct macos_module *pm = &macos_modules[i];
-
-        pm->enabled = config_get_boolean("plugin:macos", pm->name, pm->enabled);
-        pm->rd = NULL;
-
-        worker_register_job_name(i, macos_modules[i].dim);
-    }
-
-    usec_t step = localhost->rrd_update_every * USEC_PER_SEC;
-    heartbeat_t hb;
-    heartbeat_init(&hb);
-
-    while (!netdata_exit) {
-        worker_is_idle();
-        usec_t hb_dt = heartbeat_next(&hb, step);
-
-        for (int i = 0; macos_modules[i].name; i++) {
-            struct macos_module *pm = &macos_modules[i];
-            if (unlikely(!pm->enabled))
-                continue;
-
-            netdata_log_debug(D_PROCNETDEV_LOOP, "macos calling %s.", pm->name);
-
-            worker_is_busy(i);
-            pm->enabled = !pm->func(localhost->rrd_update_every, hb_dt);
-
-            if (unlikely(netdata_exit))
-                break;
-        }
-    }
-
-    netdata_thread_cleanup_pop(1);
-    return NULL;
-}
diff --git a/collectors/macos.plugin/plugin_macos.h b/collectors/macos.plugin/plugin_macos.h
deleted file mode 100644
index 2c673a22..00000000
--- a/collectors/macos.plugin/plugin_macos.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef NETDATA_PLUGIN_MACOS_H
-#define NETDATA_PLUGIN_MACOS_H 1
-
-#include "daemon/common.h"
-
-int do_macos_sysctl(int update_every, usec_t dt);
-int do_macos_mach_smi(int update_every, usec_t dt);
-int do_macos_iokit(int update_every, usec_t dt);
-
-#endif /* NETDATA_PLUGIN_MACOS_H */