mirrors
/
munin-contrib
mirror of https://github.com/munin-monitoring/contrib.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote branch 'helmut/master'

This commit is contained in:
Steve Schnepp 2013-01-28 14:27:58 +01:00
parent 52f40c980d b9c124798f
commit 50b2baaf69
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/munin-plugins-busybox/cpu.c
View File

@ -42,7 +42,7 @@ int cpu(int argc, char **argv) {
}
puts("graph_title CPU usage");
if(extinfo == 7)
if(extinfo >= 7)
puts("graph_order system user nice idle iowait irq softirq");
else
puts("graph_order system user nice idle");
@ -87,7 +87,7 @@ int cpu(int argc, char **argv) {
"user.cdef user,%d,/\n"
"nice.cdef nice,%d,/\n"
"idle.cdef idle,%d,/\n", ncpu, ncpu, ncpu, ncpu);
if(extinfo == 7) {
if(extinfo >= 7) {
puts("iowait.label iowait\n"
"iowait.draw STACK\n"
"iowait.min 0");

11
tools/munin-plugins-busybox/interrupts.c
View File

@ -37,10 +37,13 @@ int interrupts(int argc, char **argv) {
return 1;
}
while(fgets(buff, 256, f)) {
if(!strncmp(buff, "intr ", 5))
printf("intr.value %s", buff+5);
else if(!strncmp(buff, "ctxt ", 5))
printf("ctx.value %s", buff+5);
if(!strncmp(buff, "intr ", 5)) {
buff[5 + strcspn(buff + 5, " \t\n")] = '\0';
printf("intr.value %s\n", buff+5);
} else if(!strncmp(buff, "ctxt ", 5)) {
buff[5 + strcspn(buff + 5, " \t\n")] = '\0';
printf("ctx.value %s\n", buff+5);
}
}
fclose(f);
return 0;