@cryptotaxi247 / netdata-1 / commits / 6bfd6836d

Fix freebsd and macos plugin names (#11398)

Vladimir Kobal committed Aug 4, 2021 at 18:44 UTC 6bfd6836dab384d4add82a03975aae2762c5b3f7
6 files changed +59 -59
collectors/freebsd.plugin/freebsd_kstat_zfs.c
+5 -5
@@ -213,8 +213,8 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
213 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
214 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
215
216 - generate_charts_arcstats("freebsd", "zfs", show_zero_charts, update_every);
217 - generate_charts_arc_summary("freebsd", "zfs", show_zero_charts, update_every);
216 + generate_charts_arcstats("freebsd.plugin", "zfs", show_zero_charts, update_every);
217 + generate_charts_arc_summary("freebsd.plugin", "zfs", show_zero_charts, update_every);
218
219 return 0;
220 }
@@ -252,7 +252,7 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
252 NULL,
253 "Successfully TRIMmed bytes",
254 "bytes",
255 - "freebsd",
255 + "freebsd.plugin",
256 "zfs",
257 2320,
258 update_every,
@@ -280,7 +280,7 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
280 NULL,
281 "TRIM requests",
282 "requests",
283 - "freebsd",
283 + "freebsd.plugin",
284 "zfs",
285 2321,
286 update_every,
@@ -301,4 +301,4 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
301 }
302
303 return 0;
304 -}
\ No newline at end of file
304 +}
collectors/freebsd.plugin/plugin_freebsd.c
+2 -2
@@ -146,7 +146,7 @@ void *freebsd_main(void *ptr)
146 NULL,
147 "Netdata FreeBSD plugin CPU usage",
148 "milliseconds/s",
149 - "freebsd",
149 + "freebsd.plugin",
150 "stats",
151 132000,
152 localhost->rrd_update_every,
@@ -178,7 +178,7 @@ void *freebsd_main(void *ptr)
178 NULL,
179 "Netdata FreeBSD plugin modules durations",
180 "milliseconds/run",
181 - "freebsd",
181 + "freebsd.plugin",
182 "stats",
183 132001,
184 localhost->rrd_update_every,
collectors/macos.plugin/macos_fw.c
+15 -15
@@ -155,7 +155,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
155 , "disk.io"
156 , "Disk I/O Bandwidth"
157 , "KiB/s"
158 - , "macos"
158 + , "macos.plugin"
159 , "iokit"
160 , 2000
161 , update_every
@@ -193,7 +193,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
193 , "disk.ops"
194 , "Disk Completed I/O Operations"
195 , "operations/s"
196 - , "macos"
196 + , "macos.plugin"
197 , "iokit"
198 , 2001
199 , update_every
@@ -232,7 +232,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
232 , "disk.util"
233 , "Disk Utilization Time"
234 , "% of time working"
235 - , "macos"
235 + , "macos.plugin"
236 , "iokit"
237 , 2004
238 , update_every
@@ -270,7 +270,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
270 , "disk.iotime"
271 , "Disk Total I/O Time"
272 , "milliseconds/s"
273 - , "macos"
273 + , "macos.plugin"
274 , "iokit"
275 , 2022
276 , update_every
@@ -307,7 +307,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
307 , "disk.await"
308 , "Average Completed I/O Operation Time"
309 , "milliseconds/operation"
310 - , "macos"
310 + , "macos.plugin"
311 , "iokit"
312 , 2005
313 , update_every
@@ -338,7 +338,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
338 , "disk.avgsz"
339 , "Average Completed I/O Operation Bandwidth"
340 , "KiB/operation"
341 - , "macos"
341 + , "macos.plugin"
342 , "iokit"
343 , 2006
344 , update_every
@@ -369,7 +369,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
369 , "disk.svctm"
370 , "Average Service Time"
371 , "milliseconds/operation"
372 - , "macos"
372 + , "macos.plugin"
373 , "iokit"
374 , 2007
375 , update_every
@@ -411,7 +411,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
411 , NULL
412 , "Disk I/O"
413 , "KiB/s"
414 - , "macos"
414 + , "macos.plugin"
415 , "iokit"
416 , 150
417 , update_every
@@ -464,7 +464,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
464 , "disk.space"
465 , title
466 , "GiB"
467 - , "macos"
467 + , "macos.plugin"
468 , "iokit"
469 , 2023
470 , update_every
@@ -497,7 +497,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
497 , "disk.inodes"
498 , title
499 , "inodes"
500 - , "macos"
500 + , "macos.plugin"
501 , "iokit"
502 , 2024
503 , update_every
@@ -543,7 +543,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
543 , "net.net"
544 , "Bandwidth"
545 , "kilobits/s"
546 - , "macos"
546 + , "macos.plugin"
547 , "iokit"
548 , 7000
549 , update_every
@@ -571,7 +571,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
571 , "net.packets"
572 , "Packets"
573 , "packets/s"
574 - , "macos"
574 + , "macos.plugin"
575 , "iokit"
576 , 7001
577 , update_every
@@ -604,7 +604,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
604 , "net.errors"
605 , "Interface Errors"
606 , "errors/s"
607 - , "macos"
607 + , "macos.plugin"
608 , "iokit"
609 , 7002
610 , update_every
@@ -633,7 +633,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
633 , "net.drops"
634 , "Interface Drops"
635 , "drops/s"
636 - , "macos"
636 + , "macos.plugin"
637 , "iokit"
638 , 7003
639 , update_every
@@ -660,7 +660,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
660 , "net.events"
661 , "Network Interface Events"
662 , "events/s"
663 - , "macos"
663 + , "macos.plugin"
664 , "iokit"
665 , 7006
666 , update_every
collectors/macos.plugin/macos_mach_smi.c
+4 -4
@@ -65,7 +65,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
65 , "system.cpu"
66 , "Total CPU utilization"
67 , "percentage"
68 - , "macos"
68 + , "macos.plugin"
69 , "mach_smi"
70 , 100
71 , update_every
@@ -119,7 +119,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
119 , NULL
120 , "System RAM"
121 , "MiB"
122 - , "macos"
122 + , "macos.plugin"
123 , "mach_smi"
124 , 200
125 , update_every
@@ -166,7 +166,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
166 , NULL
167 , "Swap I/O"
168 , "KiB/s"
169 - , "macos"
169 + , "macos.plugin"
170 , "mach_smi"
171 , 250
172 , update_every
@@ -197,7 +197,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
197 , NULL
198 , "Memory Page Faults"
199 , "faults/s"
200 - , "macos"
200 + , "macos.plugin"
201 , "mach_smi"
202 , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
203 , update_every
collectors/macos.plugin/macos_sysctl.c
+31 -31
@@ -240,7 +240,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
240 , NULL
241 , "System Load Average"
242 , "load"
243 - , "macos"
243 + , "macos.plugin"
244 , "sysctl"
245 , 100
246 , (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) {
280 , NULL
281 , "System Swap"
282 , "MiB"
283 - , "macos"
283 + , "macos.plugin"
284 , "sysctl"
285 , 201
286 , update_every
@@ -342,7 +342,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
342 , NULL
343 , "IPv4 Bandwidth"
344 , "kilobits/s"
345 - , "macos"
345 + , "macos.plugin"
346 , "sysctl"
347 , 500
348 , update_every
@@ -392,7 +392,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
392 , NULL
393 , "IPv4 TCP Packets"
394 , "packets/s"
395 - , "macos"
395 + , "macos.plugin"
396 , "sysctl"
397 , 2600
398 , update_every
@@ -422,7 +422,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
422 , NULL
423 , "IPv4 TCP Errors"
424 , "packets/s"
425 - , "macos"
425 + , "macos.plugin"
426 , "sysctl"
427 , 2700
428 , update_every
@@ -455,7 +455,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
455 , NULL
456 , "IPv4 TCP Handshake Issues"
457 , "events/s"
458 - , "macos"
458 + , "macos.plugin"
459 , "sysctl"
460 , 2900
461 , update_every
@@ -496,7 +496,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
496 , NULL
497 , "TCP Connection Aborts"
498 , "connections/s"
499 - , "macos"
499 + , "macos.plugin"
500 , "sysctl"
501 , 3010
502 , update_every
@@ -533,7 +533,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
533 , NULL
534 , "TCP Out-Of-Order Queue"
535 , "packets/s"
536 - , "macos"
536 + , "macos.plugin"
537 , "sysctl"
538 , 3050
539 , update_every
@@ -567,7 +567,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
567 , NULL
568 , "TCP SYN Cookies"
569 , "packets/s"
570 - , "macos"
570 + , "macos.plugin"
571 , "sysctl"
572 , 3100
573 , update_every
@@ -605,7 +605,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
605 , NULL
606 , "IPv4 ECN Statistics"
607 , "packets/s"
608 - , "macos"
608 + , "macos.plugin"
609 , "sysctl"
610 , 8700
611 , update_every
@@ -648,7 +648,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
648 , NULL
649 , "IPv4 UDP Packets"
650 , "packets/s"
651 - , "macos"
651 + , "macos.plugin"
652 , "sysctl"
653 , 2601
654 , update_every
@@ -678,7 +678,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
678 , NULL
679 , "IPv4 UDP Errors"
680 , "events/s"
681 - , "macos"
681 + , "macos.plugin"
682 , "sysctl"
683 , 2701
684 , update_every
@@ -739,7 +739,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
739 , NULL
740 , "IPv4 ICMP Packets"
741 , "packets/s"
742 - , "macos"
742 + , "macos.plugin"
743 , "sysctl"
744 , 2602
745 , update_every
@@ -768,7 +768,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
768 , NULL
769 , "IPv4 ICMP Errors"
770 , "packets/s"
771 - , "macos"
771 + , "macos.plugin"
772 , "sysctl"
773 , 2603
774 , update_every
@@ -801,7 +801,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
801 , NULL
802 , "IPv4 ICMP Messages"
803 , "packets/s"
804 - , "macos"
804 + , "macos.plugin"
805 , "sysctl"
806 , 2604
807 , update_every
@@ -850,7 +850,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
850 , NULL
851 , "IPv4 Packets"
852 , "packets/s"
853 - , "macos"
853 + , "macos.plugin"
854 , "sysctl"
855 , 3000
856 , update_every
@@ -884,7 +884,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
884 , NULL
885 , "IPv4 Fragments Sent"
886 , "packets/s"
887 - , "macos"
887 + , "macos.plugin"
888 , "sysctl"
889 , 3010
890 , update_every
@@ -917,7 +917,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
917 , NULL
918 , "IPv4 Fragments Reassembly"
919 , "packets/s"
920 - , "macos"
920 + , "macos.plugin"
921 , "sysctl"
922 , 3011
923 , update_every
@@ -950,7 +950,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
950 , NULL
951 , "IPv4 Errors"
952 , "packets/s"
953 - , "macos"
953 + , "macos.plugin"
954 , "sysctl"
955 , 3002
956 , update_every
@@ -1010,7 +1010,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1010 , NULL
1011 , "IPv6 Packets"
1012 , "packets/s"
1013 - , "macos"
1013 + , "macos.plugin"
1014 , "sysctl"
1015 , 3000
1016 , update_every
@@ -1049,7 +1049,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1049 , NULL
1050 , "IPv6 Fragments Sent"
1051 , "packets/s"
1052 - , "macos"
1052 + , "macos.plugin"
1053 , "sysctl"
1054 , 3010
1055 , update_every
@@ -1088,7 +1088,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1088 , NULL
1089 , "IPv6 Fragments Reassembly"
1090 , "packets/s"
1091 - , "macos"
1091 + , "macos.plugin"
1092 , "sysctl"
1093 , 3011
1094 , update_every
@@ -1134,7 +1134,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1134 , NULL
1135 , "IPv6 Errors"
1136 , "packets/s"
1137 - , "macos"
1137 + , "macos.plugin"
1138 , "sysctl"
1139 , 3002
1140 , update_every
@@ -1196,7 +1196,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1196 , NULL
1197 , "IPv6 ICMP Messages"
1198 , "messages/s"
1199 - , "macos"
1199 + , "macos.plugin"
1200 , "sysctl"
1201 , 10000
1202 , update_every
@@ -1230,7 +1230,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1230 , NULL
1231 , "IPv6 ICMP Redirects"
1232 , "redirects/s"
1233 - , "macos"
1233 + , "macos.plugin"
1234 , "sysctl"
1235 , 10050
1236 , update_every
@@ -1273,7 +1273,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1273 , NULL
1274 , "IPv6 ICMP Errors"
1275 , "errors/s"
1276 - , "macos"
1276 + , "macos.plugin"
1277 , "sysctl"
1278 , 10100
1279 , update_every
@@ -1326,7 +1326,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1326 , NULL
1327 , "IPv6 ICMP Echo"
1328 , "messages/s"
1329 - , "macos"
1329 + , "macos.plugin"
1330 , "sysctl"
1331 , 10200
1332 , update_every
@@ -1366,7 +1366,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1366 , NULL
1367 , "IPv6 Router Messages"
1368 , "messages/s"
1369 - , "macos"
1369 + , "macos.plugin"
1370 , "sysctl"
1371 , 10400
1372 , update_every
@@ -1406,7 +1406,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1406 , NULL
1407 , "IPv6 Neighbor Messages"
1408 , "messages/s"
1409 - , "macos"
1409 + , "macos.plugin"
1410 , "sysctl"
1411 , 10500
1412 , update_every
@@ -1452,7 +1452,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1452 , NULL
1453 , "IPv6 ICMP Types"
1454 , "messages/s"
1455 - , "macos"
1455 + , "macos.plugin"
1456 , "sysctl"
1457 , 10700
1458 , update_every
@@ -1506,7 +1506,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1506 , NULL
1507 , "System Uptime"
1508 , "seconds"
1509 - , "macos"
1509 + , "macos.plugin"
1510 , "sysctl"
1511 , 1000
1512 , update_every
collectors/macos.plugin/plugin_macos.c
+2 -2
@@ -92,7 +92,7 @@ void *macos_main(void *ptr)
92 NULL,
93 "Netdata macOS plugin CPU usage",
94 "milliseconds/s",
95 - "macos",
95 + "macos.plugin",
96 "stats",
97 132000,
98 localhost->rrd_update_every,
@@ -124,7 +124,7 @@ void *macos_main(void *ptr)
124 NULL,
125 "Netdata macOS plugin modules durations",
126 "milliseconds/run",
127 - "macos",
127 + "macos.plugin",
128 "stats",
129 132001,
130 localhost->rrd_update_every,