summaryrefslogtreecommitdiffstats
path: root/collectors/freebsd.plugin
diff options
context:
space:
mode:
authorVladimir Kobal <vlad@prokk.net>2018-12-17 13:20:51 +0200
committerGitHub <noreply@github.com>2018-12-17 13:20:51 +0200
commit989604bada2a5d075d3025fe8a85b77cede9c586 (patch)
tree561b478e6efc6291574f88aa81c11c928fd90f20 /collectors/freebsd.plugin
parent928d4c50f6174a170318625ec69bcbfe968797c0 (diff)
Make units compliant with IEC standard (#4985)
* Change GB to GiB * Change MB to MiB in apps.plugin * Change MB to MiB in cgroups.plugin * Change MB to MiB in freebsd.plugin and macos.plugin * Change MB to MiB in proc.plugin * Change KB to KiB * Change kB to KiB for divisor 1024 * Fix units for memory.failcnt * Fix other units * Change CPU time percentage * Change kilobytes to KiB in apps.plugin * Small fixes
Diffstat (limited to 'collectors/freebsd.plugin')
-rw-r--r--collectors/freebsd.plugin/freebsd_devstat.c48
-rw-r--r--collectors/freebsd.plugin/freebsd_getifaddrs.c50
-rw-r--r--collectors/freebsd.plugin/freebsd_getmntinfo.c12
-rw-r--r--collectors/freebsd.plugin/freebsd_ipfw.c8
-rw-r--r--collectors/freebsd.plugin/freebsd_sysctl.c14
5 files changed, 66 insertions, 66 deletions
diff --git a/collectors/freebsd.plugin/freebsd_devstat.c b/collectors/freebsd.plugin/freebsd_devstat.c
index 10279aabc8..6c613c2a06 100644
--- a/collectors/freebsd.plugin/freebsd_devstat.c
+++ b/collectors/freebsd.plugin/freebsd_devstat.c
@@ -360,10 +360,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
disk,
"disk.io",
"Disk I/O Bandwidth",
- "kilobytes/s",
- "freebsd.plugin",
+ "KiB/s",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_IO,
+ NETDATA_CHART_PRIO_DISK_IO,
update_every,
RRDSET_TYPE_AREA
);
@@ -398,9 +398,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
"disk.ops",
"Disk Completed I/O Operations",
"operations/s",
- "freebsd.plugin",
- "devstat",
- NETDATA_CHART_PRIO_DISK_OPS,
+ "freebsd.plugin",
+ "devstat",
+ NETDATA_CHART_PRIO_DISK_OPS,
update_every,
RRDSET_TYPE_LINE
);
@@ -437,9 +437,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
"disk.qops",
"Disk Current I/O Operations",
"operations",
- "freebsd.plugin",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_QOPS,
+ NETDATA_CHART_PRIO_DISK_QOPS,
update_every,
RRDSET_TYPE_LINE
);
@@ -466,9 +466,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
"disk.util",
"Disk Utilization Time",
"% of time working",
- "freebsd.plugin",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_UTIL,
+ NETDATA_CHART_PRIO_DISK_UTIL,
update_every,
RRDSET_TYPE_AREA
);
@@ -499,9 +499,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
"disk.iotime",
"Disk Total I/O Time",
"milliseconds/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_IOTIME,
+ NETDATA_CHART_PRIO_DISK_IOTIME,
update_every,
RRDSET_TYPE_LINE
);
@@ -546,10 +546,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
disk,
"disk.await",
"Average Completed I/O Operation Time",
- "ms per operation",
- "freebsd.plugin",
+ "milliseconds/operation",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_AWAIT,
+ NETDATA_CHART_PRIO_DISK_AWAIT,
update_every,
RRDSET_TYPE_LINE
);
@@ -611,10 +611,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
disk,
"disk.avgsz",
"Average Completed I/O Operation Bandwidth",
- "kilobytes per operation",
- "freebsd.plugin",
+ "KiB/operation",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_AVGSZ,
+ NETDATA_CHART_PRIO_DISK_AVGSZ,
update_every,
RRDSET_TYPE_AREA
);
@@ -668,10 +668,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
disk,
"disk.svctm",
"Average Service Time",
- "ms per operation",
- "freebsd.plugin",
+ "milliseconds/operation",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_DISK_SVCTM,
+ NETDATA_CHART_PRIO_DISK_SVCTM,
update_every,
RRDSET_TYPE_LINE
);
@@ -728,10 +728,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
"disk",
NULL,
"Disk I/O",
- "kilobytes/s",
- "freebsd.plugin",
+ "KiB/s",
+ "freebsd.plugin",
"devstat",
- NETDATA_CHART_PRIO_SYSTEM_IO,
+ NETDATA_CHART_PRIO_SYSTEM_IO,
update_every,
RRDSET_TYPE_AREA
);
diff --git a/collectors/freebsd.plugin/freebsd_getifaddrs.c b/collectors/freebsd.plugin/freebsd_getifaddrs.c
index e158458570..8a1ec229e5 100644
--- a/collectors/freebsd.plugin/freebsd_getifaddrs.c
+++ b/collectors/freebsd.plugin/freebsd_getifaddrs.c
@@ -156,7 +156,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
enable_new_interfaces = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS,
"enable new interfaces detected at runtime",
CONFIG_BOOLEAN_AUTO);
-
+
do_bandwidth_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
CONFIG_BOOLEAN_AUTO);
do_packets_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
@@ -229,7 +229,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
// --------------------------------------------------------------------
if (likely(do_bandwidth_net)) {
-
+
iftot.ift_ibytes = iftot.ift_obytes = 0;
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family != AF_LINK)
@@ -239,10 +239,10 @@ int do_getifaddrs(int update_every, usec_t dt) {
iftot.ift_ibytes += IFA_DATA(ibytes);
iftot.ift_obytes += IFA_DATA(obytes);
}
-
+
static RRDSET *st = NULL;
static RRDDIM *rd_in = NULL, *rd_out = NULL;
-
+
if (unlikely(!st)) {
st = rrdset_create_localhost("system",
"net",
@@ -251,23 +251,23 @@ int do_getifaddrs(int update_every, usec_t dt) {
NULL,
"Network Traffic",
"kilobits/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_SYSTEM_NET,
+ NETDATA_CHART_PRIO_SYSTEM_NET,
update_every,
RRDSET_TYPE_AREA
);
-
+
rd_in = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
rd_out = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
} else
rrdset_next(st);
-
+
rrddim_set_by_pointer(st, rd_in, iftot.ift_ibytes);
rrddim_set_by_pointer(st, rd_out, iftot.ift_obytes);
rrdset_done(st);
}
-
+
// --------------------------------------------------------------------
if (likely(do_packets_net)) {
@@ -295,9 +295,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
NULL,
"Network Packets",
"packets/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_SYSTEM_PACKETS,
+ NETDATA_CHART_PRIO_SYSTEM_PACKETS,
update_every,
RRDSET_TYPE_LINE
);
@@ -340,9 +340,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
NULL,
"IPv4 Bandwidth",
"kilobits/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_SYSTEM_IPV4,
+ NETDATA_CHART_PRIO_SYSTEM_IPV4,
update_every,
RRDSET_TYPE_AREA
);
@@ -379,9 +379,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
NULL,
"IPv6 Bandwidth",
"kilobits/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_SYSTEM_IPV6,
+ NETDATA_CHART_PRIO_SYSTEM_IPV6,
update_every,
RRDSET_TYPE_AREA
);
@@ -449,9 +449,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
"net.net",
"Bandwidth",
"kilobits/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_FIRST_NET_IFACE,
+ NETDATA_CHART_PRIO_FIRST_NET_IFACE,
update_every,
RRDSET_TYPE_AREA
);
@@ -478,9 +478,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
"net.packets",
"Packets",
"packets/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_FIRST_NET_PACKETS,
+ NETDATA_CHART_PRIO_FIRST_NET_PACKETS,
update_every,
RRDSET_TYPE_LINE
);
@@ -517,9 +517,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
"net.errors",
"Interface Errors",
"errors/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_FIRST_NET_ERRORS,
+ NETDATA_CHART_PRIO_FIRST_NET_ERRORS,
update_every,
RRDSET_TYPE_LINE
);
@@ -551,9 +551,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
"net.drops",
"Interface Drops",
"drops/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_FIRST_NET_DROPS,
+ NETDATA_CHART_PRIO_FIRST_NET_DROPS,
update_every,
RRDSET_TYPE_LINE
);
@@ -586,9 +586,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
"net.events",
"Network Interface Events",
"events/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"getifaddrs",
- NETDATA_CHART_PRIO_FIRST_NET_EVENTS,
+ NETDATA_CHART_PRIO_FIRST_NET_EVENTS,
update_every,
RRDSET_TYPE_LINE
);
diff --git a/collectors/freebsd.plugin/freebsd_getmntinfo.c b/collectors/freebsd.plugin/freebsd_getmntinfo.c
index c86f231669..d050c6270d 100644
--- a/collectors/freebsd.plugin/freebsd_getmntinfo.c
+++ b/collectors/freebsd.plugin/freebsd_getmntinfo.c
@@ -226,10 +226,10 @@ int do_getmntinfo(int update_every, usec_t dt) {
mntbuf[i].f_mntonname,
"disk.space",
title,
- "GB",
- "freebsd.plugin",
+ "GiB",
+ "freebsd.plugin",
"getmntinfo",
- NETDATA_CHART_PRIO_DISKSPACE_SPACE,
+ NETDATA_CHART_PRIO_DISKSPACE_SPACE,
update_every,
RRDSET_TYPE_STACKED
);
@@ -265,10 +265,10 @@ int do_getmntinfo(int update_every, usec_t dt) {
mntbuf[i].f_mntonname,
"disk.inodes",
title,
- "Inodes",
- "freebsd.plugin",
+ "inodes",
+ "freebsd.plugin",
"getmntinfo",
- NETDATA_CHART_PRIO_DISKSPACE_INODES,
+ NETDATA_CHART_PRIO_DISKSPACE_INODES,
update_every,
RRDSET_TYPE_STACKED
);
diff --git a/collectors/freebsd.plugin/freebsd_ipfw.c b/collectors/freebsd.plugin/freebsd_ipfw.c
index c256da8b3b..a1e50e204a 100644
--- a/collectors/freebsd.plugin/freebsd_ipfw.c
+++ b/collectors/freebsd.plugin/freebsd_ipfw.c
@@ -197,7 +197,7 @@ int do_ipfw(int update_every, usec_t dt) {
NULL,
"Packets",
"packets/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"ipfw",
NETDATA_CHART_PRIO_IPFW_PACKETS,
update_every,
@@ -214,7 +214,7 @@ int do_ipfw(int update_every, usec_t dt) {
NULL,
"Bytes",
"bytes/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"ipfw",
NETDATA_CHART_PRIO_IPFW_BYTES,
update_every,
@@ -318,7 +318,7 @@ int do_ipfw(int update_every, usec_t dt) {
NULL,
"Active rules",
"rules",
- "freebsd.plugin",
+ "freebsd.plugin",
"ipfw",
NETDATA_CHART_PRIO_IPFW_ACTIVE,
update_every,
@@ -335,7 +335,7 @@ int do_ipfw(int update_every, usec_t dt) {
NULL,
"Expired rules",
"rules",
- "freebsd.plugin",
+ "freebsd.plugin",
"ipfw",
NETDATA_CHART_PRIO_IPFW_EXPIRED,
update_every,
diff --git a/collectors/freebsd.plugin/freebsd_sysctl.c b/collectors/freebsd.plugin/freebsd_sysctl.c
index da5a351def..accd4ddc2c 100644
--- a/collectors/freebsd.plugin/freebsd_sysctl.c
+++ b/collectors/freebsd.plugin/freebsd_sysctl.c
@@ -276,7 +276,7 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
"system",
NULL,
"Committed (Allocated) Memory",
- "MB",
+ "MiB",
"freebsd.plugin",
"vm.vmtotal",
NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED,
@@ -936,7 +936,7 @@ int do_vm_swap_info(int update_every, usec_t dt) {
"swap",
NULL,
"System Swap",
- "MB",
+ "MiB",
"freebsd.plugin",
"vm.swap_info",
NETDATA_CHART_PRIO_SYSTEM_SWAP,
@@ -1000,7 +1000,7 @@ int do_system_ram(int update_every, usec_t dt) {
"ram",
NULL,
"System RAM",
- "MB",
+ "MiB",
"freebsd.plugin",
"system.ram",
NETDATA_CHART_PRIO_SYSTEM_RAM,
@@ -1067,7 +1067,7 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
"swap",
NULL,
"Swap I/O",
- "kilobytes/s",
+ "KiB/s",
"freebsd.plugin",
"vm.stats.vm.v_swappgs",
NETDATA_CHART_PRIO_SYSTEM_SWAPIO,
@@ -1327,7 +1327,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
"ipc shared memory",
NULL,
"IPC Shared Memory Segments Size",
- "kilobytes",
+ "KiB",
"freebsd.plugin",
"kern.ipc.shm",
NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SIZE,
@@ -2034,7 +2034,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrddim_set_by_pointer(st, rd_failed, tcpstat.tcps_sc_zonefail);
rrdset_done(st);
}
-
+
// --------------------------------------------------------------------
if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_listendrop)) {
@@ -2668,7 +2668,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Fragments Sent",
"packets/s",
- "freebsd.plugin",
+ "freebsd.plugin",
"net.inet6.ip6.stats",
3010,
update_every,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 02:04:03 +0000