summaryrefslogtreecommitdiffstats
path: root/collectors/macos.plugin
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
commit483926a283e118590da3f9ecfa75a8a4d62143ce (patch)
treecb77052778df9a128a8cd3ff5bf7645322a13bc5 /collectors/macos.plugin
parentReleasing debian version 1.31.0-4. (diff)
downloadnetdata-483926a283e118590da3f9ecfa75a8a4d62143ce.tar.xz
netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.zip
Merging upstream version 1.32.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/macos.plugin')
-rw-r--r--collectors/macos.plugin/macos_fw.c30
-rw-r--r--collectors/macos.plugin/macos_mach_smi.c8
-rw-r--r--collectors/macos.plugin/macos_sysctl.c62
-rw-r--r--collectors/macos.plugin/plugin_macos.c4
-rw-r--r--collectors/macos.plugin/plugin_macos.h2
5 files changed, 53 insertions, 53 deletions
diff --git a/collectors/macos.plugin/macos_fw.c b/collectors/macos.plugin/macos_fw.c
index d0b3e0fd2..1fa2d39c8 100644
--- a/collectors/macos.plugin/macos_fw.c
+++ b/collectors/macos.plugin/macos_fw.c
@@ -155,7 +155,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.io"
, "Disk I/O Bandwidth"
, "KiB/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2000
, update_every
@@ -193,7 +193,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.ops"
, "Disk Completed I/O Operations"
, "operations/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2001
, update_every
@@ -232,7 +232,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.util"
, "Disk Utilization Time"
, "% of time working"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2004
, update_every
@@ -270,7 +270,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.iotime"
, "Disk Total I/O Time"
, "milliseconds/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2022
, update_every
@@ -307,7 +307,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.await"
, "Average Completed I/O Operation Time"
, "milliseconds/operation"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2005
, update_every
@@ -338,7 +338,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.avgsz"
, "Average Completed I/O Operation Bandwidth"
, "KiB/operation"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2006
, update_every
@@ -369,7 +369,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.svctm"
, "Average Service Time"
, "milliseconds/operation"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2007
, update_every
@@ -411,7 +411,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, NULL
, "Disk I/O"
, "KiB/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 150
, update_every
@@ -464,7 +464,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.space"
, title
, "GiB"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2023
, update_every
@@ -497,7 +497,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "disk.inodes"
, title
, "inodes"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 2024
, update_every
@@ -543,7 +543,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "net.net"
, "Bandwidth"
, "kilobits/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 7000
, update_every
@@ -571,7 +571,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "net.packets"
, "Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 7001
, update_every
@@ -604,7 +604,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "net.errors"
, "Interface Errors"
, "errors/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 7002
, update_every
@@ -633,7 +633,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "net.drops"
, "Interface Drops"
, "drops/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 7003
, update_every
@@ -660,7 +660,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
, "net.events"
, "Network Interface Events"
, "events/s"
- , "macos"
+ , "macos.plugin"
, "iokit"
, 7006
, update_every
diff --git a/collectors/macos.plugin/macos_mach_smi.c b/collectors/macos.plugin/macos_mach_smi.c
index 973b90a20..f2c4623c9 100644
--- a/collectors/macos.plugin/macos_mach_smi.c
+++ b/collectors/macos.plugin/macos_mach_smi.c
@@ -65,7 +65,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
, "system.cpu"
, "Total CPU utilization"
, "percentage"
- , "macos"
+ , "macos.plugin"
, "mach_smi"
, 100
, update_every
@@ -119,7 +119,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
, NULL
, "System RAM"
, "MiB"
- , "macos"
+ , "macos.plugin"
, "mach_smi"
, 200
, update_every
@@ -166,7 +166,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
, NULL
, "Swap I/O"
, "KiB/s"
- , "macos"
+ , "macos.plugin"
, "mach_smi"
, 250
, update_every
@@ -197,7 +197,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
, NULL
, "Memory Page Faults"
, "faults/s"
- , "macos"
+ , "macos.plugin"
, "mach_smi"
, NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
, update_every
diff --git a/collectors/macos.plugin/macos_sysctl.c b/collectors/macos.plugin/macos_sysctl.c
index 84f754185..b744ebbcc 100644
--- a/collectors/macos.plugin/macos_sysctl.c
+++ b/collectors/macos.plugin/macos_sysctl.c
@@ -240,7 +240,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "System Load Average"
, "load"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 100
, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every
@@ -280,7 +280,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "System Swap"
, "MiB"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 201
, update_every
@@ -342,7 +342,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 Bandwidth"
, "kilobits/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 500
, update_every
@@ -392,7 +392,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 TCP Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2600
, update_every
@@ -422,7 +422,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 TCP Errors"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2700
, update_every
@@ -455,7 +455,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 TCP Handshake Issues"
, "events/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2900
, update_every
@@ -496,7 +496,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "TCP Connection Aborts"
, "connections/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3010
, update_every
@@ -533,7 +533,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "TCP Out-Of-Order Queue"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3050
, update_every
@@ -567,7 +567,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "TCP SYN Cookies"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3100
, update_every
@@ -605,7 +605,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 ECN Statistics"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 8700
, update_every
@@ -648,7 +648,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 UDP Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2601
, update_every
@@ -678,7 +678,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 UDP Errors"
, "events/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2701
, update_every
@@ -739,7 +739,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2602
, update_every
@@ -768,7 +768,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Errors"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2603
, update_every
@@ -801,7 +801,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Messages"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 2604
, update_every
@@ -850,7 +850,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3000
, update_every
@@ -884,7 +884,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 Fragments Sent"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3010
, update_every
@@ -917,7 +917,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 Fragments Reassembly"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3011
, update_every
@@ -950,7 +950,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv4 Errors"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3002
, update_every
@@ -1010,7 +1010,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Packets"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3000
, update_every
@@ -1049,7 +1049,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Fragments Sent"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3010
, update_every
@@ -1088,7 +1088,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Fragments Reassembly"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3011
, update_every
@@ -1134,7 +1134,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Errors"
, "packets/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 3002
, update_every
@@ -1196,7 +1196,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 ICMP Messages"
, "messages/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10000
, update_every
@@ -1230,7 +1230,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 ICMP Redirects"
, "redirects/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10050
, update_every
@@ -1273,7 +1273,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 ICMP Errors"
, "errors/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10100
, update_every
@@ -1326,7 +1326,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 ICMP Echo"
, "messages/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10200
, update_every
@@ -1366,7 +1366,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Router Messages"
, "messages/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10400
, update_every
@@ -1406,7 +1406,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 Neighbor Messages"
, "messages/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10500
, update_every
@@ -1452,7 +1452,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "IPv6 ICMP Types"
, "messages/s"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 10700
, update_every
@@ -1506,7 +1506,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
, NULL
, "System Uptime"
, "seconds"
- , "macos"
+ , "macos.plugin"
, "sysctl"
, 1000
, update_every
diff --git a/collectors/macos.plugin/plugin_macos.c b/collectors/macos.plugin/plugin_macos.c
index 1a64ed81c..4566c09ee 100644
--- a/collectors/macos.plugin/plugin_macos.c
+++ b/collectors/macos.plugin/plugin_macos.c
@@ -92,7 +92,7 @@ void *macos_main(void *ptr)
NULL,
"Netdata macOS plugin CPU usage",
"milliseconds/s",
- "macos",
+ "macos.plugin",
"stats",
132000,
localhost->rrd_update_every,
@@ -124,7 +124,7 @@ void *macos_main(void *ptr)
NULL,
"Netdata macOS plugin modules durations",
"milliseconds/run",
- "macos",
+ "macos.plugin",
"stats",
132001,
localhost->rrd_update_every,
diff --git a/collectors/macos.plugin/plugin_macos.h b/collectors/macos.plugin/plugin_macos.h
index 0815c59c3..a66ec0852 100644
--- a/collectors/macos.plugin/plugin_macos.h
+++ b/collectors/macos.plugin/plugin_macos.h
@@ -4,7 +4,7 @@
#ifndef NETDATA_PLUGIN_MACOS_H
#define NETDATA_PLUGIN_MACOS_H 1
-#include "../../daemon/common.h"
+#include "daemon/common.h"
#if (TARGET_OS == OS_MACOS)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 13:35:59 +0000