diff options
| author | Dimitris P <Dim-P@users.noreply.github.com> | 2023-08-08 18:52:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 20:52:14 +0300 |
| commit | 4093cac2fab29bffe3faf04c54e6960b128176e6 (patch) | |
| tree | 4df981d97d40f0460175cc4bdd6c82710dedbe86 /collectors/macos.plugin | |
| parent | 1c8e72dfea192a4ef33e9c29aa3861a495a58625 (diff) | |
Change FreeBSD / macOS system.swap(io) to mem.swap(io) (#15769)
Diffstat (limited to 'collectors/macos.plugin')
| -rw-r--r-- | collectors/macos.plugin/macos_mach_smi.c | 6 | ||||
| -rw-r--r-- | collectors/macos.plugin/macos_sysctl.c | 6 | ||||
| -rw-r--r-- | collectors/macos.plugin/metadata.yaml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/collectors/macos.plugin/macos_mach_smi.c b/collectors/macos.plugin/macos_mach_smi.c index f21a56af21..30c957187f 100644 --- a/collectors/macos.plugin/macos_mach_smi.c +++ b/collectors/macos.plugin/macos_mach_smi.c @@ -99,7 +99,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) { do_ram = 0; collector_error("DISABLED: system.ram"); do_swapio = 0; - collector_error("DISABLED: system.swapio"); + collector_error("DISABLED: mem.swapio"); do_pgfaults = 0; collector_error("DISABLED: mem.pgfaults"); } else { @@ -148,10 +148,10 @@ int do_macos_mach_smi(int update_every, usec_t dt) { #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) if (likely(do_swapio)) { - st = rrdset_find_active_localhost("system.swapio"); + st = rrdset_find_active_localhost("mem.swapio"); if (unlikely(!st)) { st = rrdset_create_localhost( - "system" + "mem" , "swapio" , NULL , "swap" diff --git a/collectors/macos.plugin/macos_sysctl.c b/collectors/macos.plugin/macos_sysctl.c index 42f01d85ac..520d2f9380 100644 --- a/collectors/macos.plugin/macos_sysctl.c +++ b/collectors/macos.plugin/macos_sysctl.c @@ -260,12 +260,12 @@ int do_macos_sysctl(int update_every, usec_t dt) { if (likely(do_swap)) { if (unlikely(GETSYSCTL_BY_NAME("vm.swapusage", swap_usage))) { do_swap = 0; - collector_error("DISABLED: system.swap"); + collector_error("DISABLED: mem.swap"); } else { - st = rrdset_find_active_localhost("system.swap"); + st = rrdset_find_active_localhost("mem.swap"); if (unlikely(!st)) { st = rrdset_create_localhost( - "system" + "mem" , "swap" , NULL , "swap" diff --git a/collectors/macos.plugin/metadata.yaml b/collectors/macos.plugin/metadata.yaml index 41f7d8facb..cc159ad1fc 100644 --- a/collectors/macos.plugin/metadata.yaml +++ b/collectors/macos.plugin/metadata.yaml @@ -317,7 +317,7 @@ modules: - name: purgeable - name: speculative - name: free - - name: system.swapio + - name: mem.swapio description: Swap I/O unit: "KiB/s" chart_type: area @@ -346,7 +346,7 @@ modules: - name: load1 - name: load5 - name: load15 - - name: system.swap + - name: mem.swap description: System Swap unit: "MiB" chart_type: stacked |