added proc plugin rusage chart
Costa Tsaousis (ktsaou) committed
Nov 21, 2015 at 01:31 UTC
ba428b943a08238534961d9017cb604fd52d3bd6
1 file changed
+26
-15
src/plugin_proc.c
+26
-15
@@ -26,7 +26,7 @@ void *proc_main(void *ptr)
26
if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
27
error("Cannot set pthread cancel state to ENABLE.");
28
29
- struct rusage me, me_last;
29
+ struct rusage me, thread;
30
struct timeval last, now;
31
32
gettimeofday(&last, NULL);
@@ -51,10 +51,9 @@ void *proc_main(void *ptr)
51
int vdo_proc_interrupts = !config_get_boolean("plugin:proc", "/proc/interrupts", 1);
52
int vdo_cpu_netdata = !config_get_boolean("plugin:proc", "netdata server resources", 1);
53
54
- RRDSET *stcpu = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL;
54
+ RRDSET *stcpu = NULL, *stcpu_thread = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL;
55
56
gettimeofday(&last, NULL);
57
- getrusage(RUSAGE_SELF, &me_last);
57
58
unsigned long long usec = 0, susec = 0;
59
for(;1;) {
@@ -129,31 +128,43 @@ void *proc_main(void *ptr)
128
129
// --------------------------------------------------------------------
130
132
- if(!vdo_cpu_netdata && getrusage(RUSAGE_SELF, &me) == 0) {
133
-
134
- unsigned long long cpuuser = me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec;
135
- unsigned long long cpusyst = me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec;
131
+ if(!vdo_cpu_netdata) {
132
+ getrusage(RUSAGE_THREAD, &thread);
133
+ getrusage(RUSAGE_SELF, &me);
134
+
135
+ if(!stcpu_thread) stcpu_thread = rrdset_find("netdata.plugin_proc_cpu");
136
+ if(!stcpu_thread) {
137
+ stcpu_thread = rrdset_create("netdata", "plugin_proc_cpu", NULL, "netdata", "NetData Proc Plugin CPU usage", "milliseconds/s", 9999, rrd_update_every, RRDSET_TYPE_STACKED);
138
+
139
+ rrddim_add(stcpu_thread, "user", NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
140
+ rrddim_add(stcpu_thread, "system", NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
141
+ }
142
+ else rrdset_next(stcpu_thread);
143
+
144
+ rrddim_set(stcpu_thread, "user" , thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
145
+ rrddim_set(stcpu_thread, "system", thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
146
+ rrdset_done(stcpu_thread);
147
+
148
+ // ----------------------------------------------------------------
149
150
if(!stcpu) stcpu = rrdset_find("netdata.server_cpu");
151
if(!stcpu) {
139
- stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", "NetData CPU usage", "milliseconds/s", 9999, rrd_update_every, RRDSET_TYPE_STACKED);
152
+ stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", "NetData CPU usage", "milliseconds/s", 2000, rrd_update_every, RRDSET_TYPE_STACKED);
153
154
rrddim_add(stcpu, "user", NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
155
rrddim_add(stcpu, "system", NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
156
}
157
else rrdset_next(stcpu);
158
146
- rrddim_set(stcpu, "user", cpuuser);
147
- rrddim_set(stcpu, "system", cpusyst);
159
+ rrddim_set(stcpu, "user" , me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec);
160
+ rrddim_set(stcpu, "system", me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec);
161
rrdset_done(stcpu);
149
-
150
- bcopy(&me, &me_last, sizeof(struct rusage));
162
163
// ----------------------------------------------------------------
164
165
if(!stclients) stclients = rrdset_find("netdata.clients");
166
if(!stclients) {
156
- stclients = rrdset_create("netdata", "clients", NULL, "netdata", "NetData Web Clients", "connected clients", 11000, rrd_update_every, RRDSET_TYPE_LINE);
167
+ stclients = rrdset_create("netdata", "clients", NULL, "netdata", "NetData Web Clients", "connected clients", 3000, rrd_update_every, RRDSET_TYPE_LINE);
168
169
rrddim_add(stclients, "clients", NULL, 1, 1, RRDDIM_ABSOLUTE);
170
}
@@ -166,7 +177,7 @@ void *proc_main(void *ptr)
177
178
if(!streqs) streqs = rrdset_find("netdata.requests");
179
if(!streqs) {
169
- streqs = rrdset_create("netdata", "requests", NULL, "netdata", "NetData Web Requests", "requests/s", 12000, rrd_update_every, RRDSET_TYPE_LINE);
180
+ streqs = rrdset_create("netdata", "requests", NULL, "netdata", "NetData Web Requests", "requests/s", 3001, rrd_update_every, RRDSET_TYPE_LINE);
181
182
rrddim_add(streqs, "requests", NULL, 1, 1 * rrd_update_every, RRDDIM_INCREMENTAL);
183
}
@@ -179,7 +190,7 @@ void *proc_main(void *ptr)
190
191
if(!stbytes) stbytes = rrdset_find("netdata.net");
192
if(!stbytes) {
182
- stbytes = rrdset_create("netdata", "net", NULL, "netdata", "NetData Network Traffic", "kilobits/s", 13000, rrd_update_every, RRDSET_TYPE_AREA);
193
+ stbytes = rrdset_create("netdata", "net", NULL, "netdata", "NetData Network Traffic", "kilobits/s", 3002, rrd_update_every, RRDSET_TYPE_AREA);
194
195
rrddim_add(stbytes, "in", NULL, 8, 1024 * rrd_update_every, RRDDIM_INCREMENTAL);
196
rrddim_add(stbytes, "out", NULL, -8, 1024 * rrd_update_every, RRDDIM_INCREMENTAL);