Combine msq size dimensions into one chart in FreeBSD plugin
Vladimir Kobal committed
Dec 12, 2016 at 20:33 UTC
1abcda28e0a6e57bff6e3cb3ffd57ad076a47858
1 file changed
+7
-19
src/freebsd_sysctl.c
+7
-19
@@ -797,23 +797,21 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
797
}
798
}
799
800
- // --------------------------------------------------------------------
800
+ // --------------------------------------------------------------------
801
802
if (likely(do_ipc_msg_queues)) {
803
if (unlikely(GETSYSCTL("kern.ipc.msgmni", ipc_msq.msgmni))) {
804
do_ipc_msg_queues = 0;
805
error("DISABLED: system.ipc_msq_queues");
806
error("DISABLED: system.ipc_msq_messages");
807
- error("DISABLED: system.ipc_msq_used_size");
808
- error("DISABLED: system.ipc_msq_allocated_size");
807
+ error("DISABLED: system.ipc_msq_size");
808
} else {
809
ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni);
810
if (unlikely(getsysctl("kern.ipc.msqids", ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni))) {
811
do_ipc_msg_queues = 0;
812
error("DISABLED: system.ipc_msq_queues");
813
error("DISABLED: system.ipc_msq_messages");
815
- error("DISABLED: system.ipc_msq_used_size");
816
- error("DISABLED: system.ipc_msq_allocated_size");
814
+ error("DISABLED: system.ipc_msq_size");
815
} else {
816
for (i = 0; i < ipc_msq.msgmni; i++) {
817
if (unlikely(ipc_msq_data[i].u.msg_qbytes != 0)) {
@@ -850,28 +848,18 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
848
849
// --------------------------------------------------------------------
850
853
- st = rrdset_find("system.ipc_msq_used_size");
851
+ st = rrdset_find("system.ipc_msq_size");
852
if (unlikely(!st)) {
855
- st = rrdset_create("system", "ipc_msq_used_size", NULL, "ipc message queues", NULL, "Number of used bytes in IPC Message Queues", "bytes", 1000, rrd_update_every, RRDSET_TYPE_AREA);
853
+ st = rrdset_create("system", "ipc_msq_size", NULL, "ipc message queues", NULL, "Size of IPC Message Queues", "bytes", 1000, rrd_update_every, RRDSET_TYPE_LINE);
854
+ rrddim_add(st, "allocated", NULL, 1, 1, RRDDIM_ABSOLUTE);
855
rrddim_add(st, "used", NULL, 1, 1, RRDDIM_ABSOLUTE);
856
}
857
else rrdset_next(st);
858
859
+ rrddim_set(st, "allocated", ipc_msq.allocsize);
860
rrddim_set(st, "used", ipc_msq.usedsize);
861
rrdset_done(st);
862
863
-
864
- // --------------------------------------------------------------------
865
-
866
- st = rrdset_find("system.ipc_msq_allocated_size");
867
- if (unlikely(!st)) {
868
- st = rrdset_create("system", "ipc_msq_allocated_size", NULL, "ipc message queues", NULL, "Maximum size of IPC Message Queues", "bytes", 1000, rrd_update_every, RRDSET_TYPE_AREA);
869
- rrddim_add(st, "allocated", NULL, 1, 1, RRDDIM_ABSOLUTE);
870
- }
871
- else rrdset_next(st);
872
-
873
- rrddim_set(st, "allocated", ipc_msq.allocsize);
874
- rrdset_done(st);
863
}
864
}
865
}