lower the memory footprint of dimensions by 1.5KB
Costa Tsaousis (ktsaou) committed
Feb 17, 2017 at 22:37 UTC
bb6da9c67e6ee7a257f764d2d3e26cc0a276e5c7
41 files changed
+919
-902
src/backends.c
+15
-15
@@ -240,28 +240,28 @@ void *backends_main(void *ptr) {
240
RRDSET *chart_metrics = rrdset_find("netdata.backend_metrics");
241
if(!chart_metrics) {
242
chart_metrics = rrdset_create("netdata", "backend_metrics", NULL, "backend", NULL, "Netdata Buffered Metrics", "metrics", 130600, frequency, RRDSET_TYPE_LINE);
243
- rrddim_add(chart_metrics, "buffered", NULL, 1, 1, RRDDIM_ABSOLUTE);
244
- rrddim_add(chart_metrics, "lost", NULL, 1, 1, RRDDIM_ABSOLUTE);
245
- rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRDDIM_ABSOLUTE);
243
+ rrddim_add(chart_metrics, "buffered", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
244
+ rrddim_add(chart_metrics, "lost", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
245
+ rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
246
}
247
248
RRDSET *chart_bytes = rrdset_find("netdata.backend_bytes");
249
if(!chart_bytes) {
250
chart_bytes = rrdset_create("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KB", 130610, frequency, RRDSET_TYPE_AREA);
251
- rrddim_add(chart_bytes, "buffered", NULL, 1, 1024, RRDDIM_ABSOLUTE);
252
- rrddim_add(chart_bytes, "lost", NULL, 1, 1024, RRDDIM_ABSOLUTE);
253
- rrddim_add(chart_bytes, "sent", NULL, 1, 1024, RRDDIM_ABSOLUTE);
254
- rrddim_add(chart_bytes, "received", NULL, 1, 1024, RRDDIM_ABSOLUTE);
251
+ rrddim_add(chart_bytes, "buffered", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
252
+ rrddim_add(chart_bytes, "lost", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
253
+ rrddim_add(chart_bytes, "sent", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
254
+ rrddim_add(chart_bytes, "received", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
255
}
256
257
RRDSET *chart_ops = rrdset_find("netdata.backend_ops");
258
if(!chart_ops) {
259
chart_ops = rrdset_create("netdata", "backend_ops", NULL, "backend", NULL, "Netdata Backend Operations", "operations", 130630, frequency, RRDSET_TYPE_LINE);
260
- rrddim_add(chart_ops, "write", NULL, 1, 1, RRDDIM_ABSOLUTE);
261
- rrddim_add(chart_ops, "discard", NULL, 1, 1, RRDDIM_ABSOLUTE);
262
- rrddim_add(chart_ops, "reconnect", NULL, 1, 1, RRDDIM_ABSOLUTE);
263
- rrddim_add(chart_ops, "failure", NULL, 1, 1, RRDDIM_ABSOLUTE);
264
- rrddim_add(chart_ops, "read", NULL, 1, 1, RRDDIM_ABSOLUTE);
260
+ rrddim_add(chart_ops, "write", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
261
+ rrddim_add(chart_ops, "discard", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
262
+ rrddim_add(chart_ops, "reconnect", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
263
+ rrddim_add(chart_ops, "failure", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
264
+ rrddim_add(chart_ops, "read", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
265
}
266
267
/*
@@ -274,15 +274,15 @@ void *backends_main(void *ptr) {
274
RRDSET *chart_latency = rrdset_find("netdata.backend_latency");
275
if(!chart_latency) {
276
chart_latency = rrdset_create("netdata", "backend_latency", NULL, "backend", NULL, "Netdata Backend Latency", "ms", 130620, frequency, RRDSET_TYPE_AREA);
277
- rrddim_add(chart_latency, "latency", NULL, 1, 1000, RRDDIM_ABSOLUTE);
277
+ rrddim_add(chart_latency, "latency", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
278
}
279
*/
280
281
RRDSET *chart_rusage = rrdset_find("netdata.backend_thread_cpu");
282
if(!chart_rusage) {
283
chart_rusage = rrdset_create("netdata", "backend_thread_cpu", NULL, "backend", NULL, "NetData Backend Thread CPU usage", "milliseconds/s", 130630, frequency, RRDSET_TYPE_STACKED);
284
- rrddim_add(chart_rusage, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
285
- rrddim_add(chart_rusage, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
284
+ rrddim_add(chart_rusage, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
285
+ rrddim_add(chart_rusage, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
286
}
287
288
// ------------------------------------------------------------------------
src/global_statistics.c
+11
-11
@@ -135,8 +135,8 @@ void global_statistics_charts(void) {
135
"NetData Proc Plugin CPU usage", "milliseconds/s", 132000, rrd_update_every,
136
RRDSET_TYPE_STACKED);
137
138
- rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
139
- rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
138
+ rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
139
+ rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
140
} else rrdset_next(stcpu_thread);
141
142
rrddim_set(stcpu_thread, "user", thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
@@ -150,8 +150,8 @@ void global_statistics_charts(void) {
150
stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage", "milliseconds/s",
151
130000, rrd_update_every, RRDSET_TYPE_STACKED);
152
153
- rrddim_add(stcpu, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
154
- rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
153
+ rrddim_add(stcpu, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
154
+ rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
155
} else rrdset_next(stcpu);
156
157
rrddim_set(stcpu, "user", me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec);
@@ -165,7 +165,7 @@ void global_statistics_charts(void) {
165
stclients = rrdset_create("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients",
166
"connected clients", 130200, rrd_update_every, RRDSET_TYPE_LINE);
167
168
- rrddim_add(stclients, "clients", NULL, 1, 1, RRDDIM_ABSOLUTE);
168
+ rrddim_add(stclients, "clients", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
169
} else rrdset_next(stclients);
170
171
rrddim_set(stclients, "clients", gs.connected_clients);
@@ -178,7 +178,7 @@ void global_statistics_charts(void) {
178
streqs = rrdset_create("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests", "requests/s",
179
130300, rrd_update_every, RRDSET_TYPE_LINE);
180
181
- rrddim_add(streqs, "requests", NULL, 1, 1, RRDDIM_INCREMENTAL);
181
+ rrddim_add(streqs, "requests", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
182
} else rrdset_next(streqs);
183
184
rrddim_set(streqs, "requests", (collected_number) gs.web_requests);
@@ -191,8 +191,8 @@ void global_statistics_charts(void) {
191
stbytes = rrdset_create("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic", "kilobits/s",
192
130000, rrd_update_every, RRDSET_TYPE_AREA);
193
194
- rrddim_add(stbytes, "in", NULL, 8, 1024, RRDDIM_INCREMENTAL);
195
- rrddim_add(stbytes, "out", NULL, -8, 1024, RRDDIM_INCREMENTAL);
194
+ rrddim_add(stbytes, "in", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
195
+ rrddim_add(stbytes, "out", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
196
} else rrdset_next(stbytes);
197
198
rrddim_set(stbytes, "in", (collected_number) gs.bytes_received);
@@ -206,8 +206,8 @@ void global_statistics_charts(void) {
206
stduration = rrdset_create("netdata", "response_time", NULL, "netdata", NULL, "NetData API Response Time",
207
"ms/request", 130400, rrd_update_every, RRDSET_TYPE_LINE);
208
209
- rrddim_add(stduration, "average", NULL, 1, 1000, RRDDIM_ABSOLUTE);
210
- rrddim_add(stduration, "max", NULL, 1, 1000, RRDDIM_ABSOLUTE);
209
+ rrddim_add(stduration, "average", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
210
+ rrddim_add(stduration, "max", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
211
} else rrdset_next(stduration);
212
213
uint64_t gweb_usec = gs.web_usec;
@@ -238,7 +238,7 @@ void global_statistics_charts(void) {
238
"NetData API Responses Compression Savings Ratio", "percentage", 130500,
239
rrd_update_every, RRDSET_TYPE_LINE);
240
241
- rrddim_add(stcompression, "savings", NULL, 1, 1000, RRDDIM_ABSOLUTE);
241
+ rrddim_add(stcompression, "savings", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
242
} else rrdset_next(stcompression);
243
244
// since we don't lock here to read the global statistics
src/ipc.c
+2
-2
@@ -194,13 +194,13 @@ int do_ipc(int update_every, usec_t dt) {
194
semaphores = rrdset_find("system.ipc_semaphores");
195
if(!semaphores) {
196
semaphores = rrdset_create("system", "ipc_semaphores", NULL, "ipc semaphores", NULL, "IPC Semaphores", "semaphores", 1000, rrd_update_every, RRDSET_TYPE_AREA);
197
- rrddim_add(semaphores, "semaphores", NULL, 1, 1, RRDDIM_ABSOLUTE);
197
+ rrddim_add(semaphores, "semaphores", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
198
}
199
200
arrays = rrdset_find("system.ipc_semaphore_arrays");
201
if(!arrays) {
202
arrays = rrdset_create("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL, "IPC Semaphore Arrays", "arrays", 1000, rrd_update_every, RRDSET_TYPE_AREA);
203
- rrddim_add(arrays, "arrays", NULL, 1, 1, RRDDIM_ABSOLUTE);
203
+ rrddim_add(arrays, "arrays", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
204
}
205
}
206
src/macos_fw.c
+32
-32
@@ -140,8 +140,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
140
if (unlikely(!st)) {
141
st = rrdset_create("disk", diskstat.name, NULL, diskstat.name, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
142
143
- rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_INCREMENTAL);
144
- rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_INCREMENTAL);
143
+ rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
144
+ rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
145
}
146
else rrdset_next(st);
147
@@ -166,8 +166,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
166
st = rrdset_create("disk_ops", diskstat.name, NULL, diskstat.name, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
167
st->isdetail = 1;
168
169
- rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
170
- rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
169
+ rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
170
+ rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
171
}
172
else rrdset_next(st);
173
@@ -192,7 +192,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
192
st = rrdset_create("disk_util", diskstat.name, NULL, diskstat.name, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
193
st->isdetail = 1;
194
195
- rrddim_add(st, "utilization", NULL, 1, 10000000, RRDDIM_INCREMENTAL);
195
+ rrddim_add(st, "utilization", NULL, 1, 10000000, RRDDIM_ALGORITHM_INCREMENTAL);
196
}
197
else rrdset_next(st);
198
@@ -217,8 +217,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
217
st = rrdset_create("disk_iotime", diskstat.name, NULL, diskstat.name, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
218
st->isdetail = 1;
219
220
- rrddim_add(st, "reads", NULL, 1, 1000000, RRDDIM_INCREMENTAL);
221
- rrddim_add(st, "writes", NULL, -1, 1000000, RRDDIM_INCREMENTAL);
220
+ rrddim_add(st, "reads", NULL, 1, 1000000, RRDDIM_ALGORITHM_INCREMENTAL);
221
+ rrddim_add(st, "writes", NULL, -1, 1000000, RRDDIM_ALGORITHM_INCREMENTAL);
222
}
223
else rrdset_next(st);
224
@@ -241,8 +241,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
241
st = rrdset_create("disk_await", diskstat.name, NULL, diskstat.name, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
242
st->isdetail = 1;
243
244
- rrddim_add(st, "reads", NULL, 1, 1000000, RRDDIM_ABSOLUTE);
245
- rrddim_add(st, "writes", NULL, -1, 1000000, RRDDIM_ABSOLUTE);
244
+ rrddim_add(st, "reads", NULL, 1, 1000000, RRDDIM_ALGORITHM_ABSOLUTE);
245
+ rrddim_add(st, "writes", NULL, -1, 1000000, RRDDIM_ALGORITHM_ABSOLUTE);
246
}
247
else rrdset_next(st);
248
@@ -259,8 +259,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
259
st = rrdset_create("disk_avgsz", diskstat.name, NULL, diskstat.name, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
260
st->isdetail = 1;
261
262
- rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_ABSOLUTE);
263
- rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_ABSOLUTE);
262
+ rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
263
+ rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
264
}
265
else rrdset_next(st);
266
@@ -277,7 +277,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
277
st = rrdset_create("disk_svctm", diskstat.name, NULL, diskstat.name, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
278
st->isdetail = 1;
279
280
- rrddim_add(st, "svctm", NULL, 1, 1000000, RRDDIM_ABSOLUTE);
280
+ rrddim_add(st, "svctm", NULL, 1, 1000000, RRDDIM_ALGORITHM_ABSOLUTE);
281
}
282
else rrdset_next(st);
283
@@ -304,8 +304,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
304
st = rrdset_find_bytype("system", "io");
305
if (unlikely(!st)) {
306
st = rrdset_create("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
307
- rrddim_add(st, "in", NULL, 1, 1024, RRDDIM_INCREMENTAL);
308
- rrddim_add(st, "out", NULL, -1, 1024, RRDDIM_INCREMENTAL);
307
+ rrddim_add(st, "in", NULL, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
308
+ rrddim_add(st, "out", NULL, -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
309
}
310
else rrdset_next(st);
311
@@ -347,10 +347,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
347
update_every,
348
RRDSET_TYPE_STACKED);
349
350
- rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ABSOLUTE);
351
- rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ABSOLUTE);
350
+ rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ALGORITHM_ABSOLUTE);
351
+ rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ALGORITHM_ABSOLUTE);
352
rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR,
353
- RRDDIM_ABSOLUTE);
353
+ RRDDIM_ALGORITHM_ABSOLUTE);
354
} else
355
rrdset_next(st);
356
@@ -369,9 +369,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
369
st = rrdset_create("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.inodes", title, "Inodes", 2024,
370
update_every, RRDSET_TYPE_STACKED);
371
372
- rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
373
- rrddim_add(st, "used", NULL, 1, 1, RRDDIM_ABSOLUTE);
374
- rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
372
+ rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
373
+ rrddim_add(st, "used", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
374
+ rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
375
} else
376
rrdset_next(st);
377
@@ -402,8 +402,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
402
if (unlikely(!st)) {
403
st = rrdset_create("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
404
405
- rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
406
- rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
405
+ rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
406
+ rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
407
}
408
else rrdset_next(st);
409
@@ -418,10 +418,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
418
st = rrdset_create("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
419
st->isdetail = 1;
420
421
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
422
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
423
- rrddim_add(st, "multicast_received", NULL, 1, 1, RRDDIM_INCREMENTAL);
424
- rrddim_add(st, "multicast_sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
421
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
422
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
423
+ rrddim_add(st, "multicast_received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
424
+ rrddim_add(st, "multicast_sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
425
}
426
else rrdset_next(st);
427
@@ -438,8 +438,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
438
st = rrdset_create("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
439
st->isdetail = 1;
440
441
- rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
442
- rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL);
441
+ rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
442
+ rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
443
}
444
else rrdset_next(st);
445
@@ -454,7 +454,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
454
st = rrdset_create("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
455
st->isdetail = 1;
456
457
- rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
457
+ rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
458
}
459
else rrdset_next(st);
460
@@ -468,9 +468,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
468
st = rrdset_create("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
469
st->isdetail = 1;
470
471
- rrddim_add(st, "frames", NULL, 1, 1, RRDDIM_INCREMENTAL);
472
- rrddim_add(st, "collisions", NULL, -1, 1, RRDDIM_INCREMENTAL);
473
- rrddim_add(st, "carrier", NULL, -1, 1, RRDDIM_INCREMENTAL);
471
+ rrddim_add(st, "frames", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
472
+ rrddim_add(st, "collisions", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
473
+ rrddim_add(st, "carrier", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
474
}
475
else rrdset_next(st);
476
src/macos_mach_smi.c
+23
-23
@@ -52,10 +52,10 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
52
if (unlikely(!st)) {
53
st = rrdset_create("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization", "percentage", 100, update_every, RRDSET_TYPE_STACKED);
54
55
- rrddim_add(st, "user", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
56
- rrddim_add(st, "nice", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
57
- rrddim_add(st, "system", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
58
- rrddim_add(st, "idle", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
55
+ rrddim_add(st, "user", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
56
+ rrddim_add(st, "nice", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
57
+ rrddim_add(st, "system", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
58
+ rrddim_add(st, "idle", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
59
rrddim_hide(st, "idle");
60
}
61
else rrdset_next(st);
@@ -88,14 +88,14 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
88
if (unlikely(!st)) {
89
st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
90
91
- rrddim_add(st, "active", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
92
- rrddim_add(st, "wired", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
93
- rrddim_add(st, "throttled", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
94
- rrddim_add(st, "compressor", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
95
- rrddim_add(st, "inactive", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
96
- rrddim_add(st, "purgeable", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
97
- rrddim_add(st, "speculative", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
98
- rrddim_add(st, "free", NULL, system_pagesize, 1048576, RRDDIM_ABSOLUTE);
91
+ rrddim_add(st, "active", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
92
+ rrddim_add(st, "wired", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
93
+ rrddim_add(st, "throttled", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
94
+ rrddim_add(st, "compressor", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
95
+ rrddim_add(st, "inactive", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
96
+ rrddim_add(st, "purgeable", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
97
+ rrddim_add(st, "speculative", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
98
+ rrddim_add(st, "free", NULL, system_pagesize, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
99
}
100
else rrdset_next(st);
101
@@ -117,8 +117,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
117
if (unlikely(!st)) {
118
st = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
119
120
- rrddim_add(st, "in", NULL, system_pagesize, 1024, RRDDIM_INCREMENTAL);
121
- rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRDDIM_INCREMENTAL);
120
+ rrddim_add(st, "in", NULL, system_pagesize, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
121
+ rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
122
}
123
else rrdset_next(st);
124
@@ -135,15 +135,15 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
135
st = rrdset_create("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
136
st->isdetail = 1;
137
138
- rrddim_add(st, "memory", NULL, 1, 1, RRDDIM_INCREMENTAL);
139
- rrddim_add(st, "cow", NULL, 1, 1, RRDDIM_INCREMENTAL);
140
- rrddim_add(st, "pagein", NULL, 1, 1, RRDDIM_INCREMENTAL);
141
- rrddim_add(st, "pageout", NULL, 1, 1, RRDDIM_INCREMENTAL);
142
- rrddim_add(st, "compress", NULL, 1, 1, RRDDIM_INCREMENTAL);
143
- rrddim_add(st, "decompress", NULL, 1, 1, RRDDIM_INCREMENTAL);
144
- rrddim_add(st, "zero_fill", NULL, 1, 1, RRDDIM_INCREMENTAL);
145
- rrddim_add(st, "reactivate", NULL, 1, 1, RRDDIM_INCREMENTAL);
146
- rrddim_add(st, "purge", NULL, 1, 1, RRDDIM_INCREMENTAL);
138
+ rrddim_add(st, "memory", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
139
+ rrddim_add(st, "cow", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
140
+ rrddim_add(st, "pagein", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
141
+ rrddim_add(st, "pageout", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
142
+ rrddim_add(st, "compress", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
143
+ rrddim_add(st, "decompress", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
144
+ rrddim_add(st, "zero_fill", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
145
+ rrddim_add(st, "reactivate", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
146
+ rrddim_add(st, "purge", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
147
}
148
else rrdset_next(st);
149
src/macos_sysctl.c
+114
-114
@@ -218,9 +218,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
218
st = rrdset_find_bytype("system", "load");
219
if (unlikely(!st)) {
220
st = rrdset_create("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
221
- rrddim_add(st, "load1", NULL, 1, 1000, RRDDIM_ABSOLUTE);
222
- rrddim_add(st, "load5", NULL, 1, 1000, RRDDIM_ABSOLUTE);
223
- rrddim_add(st, "load15", NULL, 1, 1000, RRDDIM_ABSOLUTE);
221
+ rrddim_add(st, "load1", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
222
+ rrddim_add(st, "load5", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
223
+ rrddim_add(st, "load15", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
224
}
225
else rrdset_next(st);
226
@@ -247,8 +247,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
247
st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
248
st->isdetail = 1;
249
250
- rrddim_add(st, "free", NULL, 1, 1048576, RRDDIM_ABSOLUTE);
251
- rrddim_add(st, "used", NULL, 1, 1048576, RRDDIM_ABSOLUTE);
250
+ rrddim_add(st, "free", NULL, 1, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
251
+ rrddim_add(st, "used", NULL, 1, 1048576, RRDDIM_ALGORITHM_ABSOLUTE);
252
}
253
else rrdset_next(st);
254
@@ -295,8 +295,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
295
if (unlikely(!st)) {
296
st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
297
298
- rrddim_add(st, "InOctets", "received", 8, 1024, RRDDIM_INCREMENTAL);
299
- rrddim_add(st, "OutOctets", "sent", -8, 1024, RRDDIM_INCREMENTAL);
298
+ rrddim_add(st, "InOctets", "received", 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
299
+ rrddim_add(st, "OutOctets", "sent", -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
300
}
301
else rrdset_next(st);
302
@@ -334,8 +334,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
334
"packets/s",
335
2600, update_every, RRDSET_TYPE_LINE);
336
337
- rrddim_add(st, "InSegs", "received", 1, 1, RRDDIM_INCREMENTAL);
338
- rrddim_add(st, "OutSegs", "sent", -1, 1, RRDDIM_INCREMENTAL);
337
+ rrddim_add(st, "InSegs", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
338
+ rrddim_add(st, "OutSegs", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
339
} else
340
rrdset_next(st);
341
@@ -354,9 +354,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
354
2700, update_every, RRDSET_TYPE_LINE);
355
st->isdetail = 1;
356
357
- rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_INCREMENTAL);
358
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
359
- rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_INCREMENTAL);
357
+ rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
358
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
359
+ rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
360
} else
361
rrdset_next(st);
362
@@ -376,10 +376,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
376
"events/s", 2900, update_every, RRDSET_TYPE_LINE);
377
st->isdetail = 1;
378
379
- rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_INCREMENTAL);
380
- rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
381
- rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
382
- rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_INCREMENTAL);
379
+ rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
380
+ rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
381
+ rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
382
+ rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
383
} else
384
rrdset_next(st);
385
@@ -398,10 +398,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
398
if (unlikely(!st)) {
399
st = rrdset_create("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
400
401
- rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRDDIM_INCREMENTAL);
402
- rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRDDIM_INCREMENTAL);
403
- rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRDDIM_INCREMENTAL);
404
- rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRDDIM_INCREMENTAL);
401
+ rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
402
+ rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
403
+ rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
404
+ rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
405
}
406
else rrdset_next(st);
407
@@ -420,7 +420,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
420
if (unlikely(!st)) {
421
st = rrdset_create("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
422
423
- rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRDDIM_INCREMENTAL);
423
+ rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
424
}
425
else rrdset_next(st);
426
@@ -437,9 +437,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
437
if (unlikely(!st)) {
438
st = rrdset_create("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
439
440
- rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRDDIM_INCREMENTAL);
441
- rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRDDIM_INCREMENTAL);
442
- rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRDDIM_INCREMENTAL);
440
+ rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
441
+ rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
442
+ rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
443
}
444
else rrdset_next(st);
445
@@ -458,8 +458,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
458
st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
459
st->isdetail = 1;
460
461
- rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRDDIM_INCREMENTAL);
462
- rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRDDIM_INCREMENTAL);
461
+ rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
462
+ rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
463
}
464
else rrdset_next(st);
465
@@ -487,8 +487,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
487
st = rrdset_create("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets",
488
"packets/s", 2601, update_every, RRDSET_TYPE_LINE);
489
490
- rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_INCREMENTAL);
491
- rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_INCREMENTAL);
490
+ rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
491
+ rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
492
} else
493
rrdset_next(st);
494
@@ -506,11 +506,11 @@ int do_macos_sysctl(int update_every, usec_t dt) {
506
2701, update_every, RRDSET_TYPE_LINE);
507
st->isdetail = 1;
508
509
- rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
510
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
511
- rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
512
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
513
- rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_INCREMENTAL);
509
+ rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
510
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
511
+ rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
512
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
513
+ rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
514
} else
515
rrdset_next(st);
516
@@ -549,8 +549,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
549
2602,
550
update_every, RRDSET_TYPE_LINE);
551
552
- rrddim_add(st, "InMsgs", "received", 1, 1, RRDDIM_INCREMENTAL);
553
- rrddim_add(st, "OutMsgs", "sent", -1, 1, RRDDIM_INCREMENTAL);
552
+ rrddim_add(st, "InMsgs", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
553
+ rrddim_add(st, "OutMsgs", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
554
} else
555
rrdset_next(st);
556
@@ -567,9 +567,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
567
"packets/s",
568
2603, update_every, RRDSET_TYPE_LINE);
569
570
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
571
- rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
572
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
570
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
571
+ rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
572
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
573
} else
574
rrdset_next(st);
575
@@ -588,10 +588,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
588
st = rrdset_create("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages",
589
"packets/s", 2604, update_every, RRDSET_TYPE_LINE);
590
591
- rrddim_add(st, "InEchoReps", NULL, 1, 1, RRDDIM_INCREMENTAL);
592
- rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRDDIM_INCREMENTAL);
593
- rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_INCREMENTAL);
594
- rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_INCREMENTAL);
591
+ rrddim_add(st, "InEchoReps", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
592
+ rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
593
+ rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
594
+ rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
595
} else
596
rrdset_next(st);
597
@@ -625,10 +625,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
625
st = rrdset_create("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s",
626
3000, update_every, RRDSET_TYPE_LINE);
627
628
- rrddim_add(st, "InReceives", "received", 1, 1, RRDDIM_INCREMENTAL);
629
- rrddim_add(st, "OutRequests", "sent", -1, 1, RRDDIM_INCREMENTAL);
630
- rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_INCREMENTAL);
631
- rrddim_add(st, "InDelivers", "delivered", 1, 1, RRDDIM_INCREMENTAL);
628
+ rrddim_add(st, "InReceives", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
629
+ rrddim_add(st, "OutRequests", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
630
+ rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
631
+ rrddim_add(st, "InDelivers", "delivered", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
632
} else
633
rrdset_next(st);
634
@@ -648,9 +648,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
648
"packets/s", 3010, update_every, RRDSET_TYPE_LINE);
649
st->isdetail = 1;
650
651
- rrddim_add(st, "FragOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
652
- rrddim_add(st, "FragFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
653
- rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_INCREMENTAL);
651
+ rrddim_add(st, "FragOKs", "ok", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
652
+ rrddim_add(st, "FragFails", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
653
+ rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
654
} else
655
rrdset_next(st);
656
@@ -670,9 +670,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
670
"packets/s", 3011, update_every, RRDSET_TYPE_LINE);
671
st->isdetail = 1;
672
673
- rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
674
- rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
675
- rrddim_add(st, "ReasmReqds", "all", 1, 1, RRDDIM_INCREMENTAL);
673
+ rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
674
+ rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
675
+ rrddim_add(st, "ReasmReqds", "all", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
676
} else
677
rrdset_next(st);
678
@@ -692,14 +692,14 @@ int do_macos_sysctl(int update_every, usec_t dt) {
692
update_every, RRDSET_TYPE_LINE);
693
st->isdetail = 1;
694
695
- rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
696
- rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
695
+ rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
696
+ rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
697
698
- rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
699
- rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
698
+ rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
699
+ rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
700
701
- rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
702
- rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_INCREMENTAL);
701
+ rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
702
+ rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
703
} else
704
rrdset_next(st);
705
@@ -736,10 +736,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
736
st = rrdset_create("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
737
update_every, RRDSET_TYPE_LINE);
738
739
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
740
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
741
- rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_INCREMENTAL);
742
- rrddim_add(st, "delivers", NULL, -1, 1, RRDDIM_INCREMENTAL);
739
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
740
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
741
+ rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
742
+ rrddim_add(st, "delivers", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
743
} else
744
rrdset_next(st);
745
@@ -762,9 +762,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
762
"packets/s", 3010, update_every, RRDSET_TYPE_LINE);
763
st->isdetail = 1;
764
765
- rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
766
- rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
767
- rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
765
+ rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
766
+ rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
767
+ rrddim_add(st, "all", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
768
} else
769
rrdset_next(st);
770
@@ -786,10 +786,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
786
"packets/s", 3011, update_every, RRDSET_TYPE_LINE);
787
st->isdetail = 1;
788
789
- rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
790
- rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
791
- rrddim_add(st, "timeout", NULL, -1, 1, RRDDIM_INCREMENTAL);
792
- rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
789
+ rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
790
+ rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
791
+ rrddim_add(st, "timeout", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
792
+ rrddim_add(st, "all", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
793
} else
794
rrdset_next(st);
795
@@ -819,15 +819,15 @@ int do_macos_sysctl(int update_every, usec_t dt) {
819
update_every, RRDSET_TYPE_LINE);
820
st->isdetail = 1;
821
822
- rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
823
- rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
822
+ rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
823
+ rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
824
825
- rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
826
- rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
827
- rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
828
- rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRDDIM_INCREMENTAL);
825
+ rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
826
+ rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
827
+ rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
828
+ rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
829
830
- rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
830
+ rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
831
} else
832
rrdset_next(st);
833
@@ -865,8 +865,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
865
st = rrdset_create("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
866
"messages/s", 10000, update_every, RRDSET_TYPE_LINE);
867
868
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
869
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
868
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
869
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
870
} else
871
rrdset_next(st);
872
@@ -884,8 +884,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
884
st = rrdset_create("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
885
"redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
886
887
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
888
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
887
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
888
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
889
} else
890
rrdset_next(st);
891
@@ -913,17 +913,17 @@ int do_macos_sysctl(int update_every, usec_t dt) {
913
if (unlikely(!st)) {
914
st = rrdset_create("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
915
916
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
917
- rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
918
-
919
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
920
- rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRDDIM_INCREMENTAL);
921
- rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRDDIM_INCREMENTAL);
922
- rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRDDIM_INCREMENTAL);
923
- rrddim_add(st, "InParmProblems", NULL, 1, 1, RRDDIM_INCREMENTAL);
924
- rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRDDIM_INCREMENTAL);
925
- rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRDDIM_INCREMENTAL);
926
- rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRDDIM_INCREMENTAL);
916
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
917
+ rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
918
+
919
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
920
+ rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
921
+ rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
922
+ rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
923
+ rrddim_add(st, "InParmProblems", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
924
+ rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
925
+ rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
926
+ rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
927
} else
928
rrdset_next(st);
929
@@ -952,10 +952,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
952
if (unlikely(!st)) {
953
st = rrdset_create("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
954
955
- rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_INCREMENTAL);
956
- rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_INCREMENTAL);
957
- rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRDDIM_INCREMENTAL);
958
- rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRDDIM_INCREMENTAL);
955
+ rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
956
+ rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
957
+ rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
958
+ rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
959
} else
960
rrdset_next(st);
961
@@ -978,10 +978,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
978
if (unlikely(!st)) {
979
st = rrdset_create("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
980
981
- rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
982
- rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
983
- rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
984
- rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
981
+ rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
982
+ rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
983
+ rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
984
+ rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
985
} else
986
rrdset_next(st);
987
@@ -1004,10 +1004,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1004
if (unlikely(!st)) {
1005
st = rrdset_create("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
1006
1007
- rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
1008
- rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
1009
- rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
1010
- rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
1007
+ rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1008
+ rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1009
+ rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1010
+ rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1011
} else
1012
rrdset_next(st);
1013
@@ -1037,16 +1037,16 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1037
st = rrdset_create("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
1038
"messages/s", 10700, update_every, RRDSET_TYPE_LINE);
1039
1040
- rrddim_add(st, "InType1", NULL, 1, 1, RRDDIM_INCREMENTAL);
1041
- rrddim_add(st, "InType128", NULL, 1, 1, RRDDIM_INCREMENTAL);
1042
- rrddim_add(st, "InType129", NULL, 1, 1, RRDDIM_INCREMENTAL);
1043
- rrddim_add(st, "InType136", NULL, 1, 1, RRDDIM_INCREMENTAL);
1044
- rrddim_add(st, "OutType1", NULL, -1, 1, RRDDIM_INCREMENTAL);
1045
- rrddim_add(st, "OutType128", NULL, -1, 1, RRDDIM_INCREMENTAL);
1046
- rrddim_add(st, "OutType129", NULL, -1, 1, RRDDIM_INCREMENTAL);
1047
- rrddim_add(st, "OutType133", NULL, -1, 1, RRDDIM_INCREMENTAL);
1048
- rrddim_add(st, "OutType135", NULL, -1, 1, RRDDIM_INCREMENTAL);
1049
- rrddim_add(st, "OutType143", NULL, -1, 1, RRDDIM_INCREMENTAL);
1040
+ rrddim_add(st, "InType1", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1041
+ rrddim_add(st, "InType128", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1042
+ rrddim_add(st, "InType129", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1043
+ rrddim_add(st, "InType136", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1044
+ rrddim_add(st, "OutType1", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1045
+ rrddim_add(st, "OutType128", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1046
+ rrddim_add(st, "OutType129", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1047
+ rrddim_add(st, "OutType133", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1048
+ rrddim_add(st, "OutType135", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1049
+ rrddim_add(st, "OutType143", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1050
} else
1051
rrdset_next(st);
1052
@@ -1077,7 +1077,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1077
1078
if(unlikely(!st)) {
1079
st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
1080
- rrddim_add(st, "uptime", NULL, 1, 1, RRDDIM_ABSOLUTE);
1080
+ rrddim_add(st, "uptime", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
1081
}
1082
else rrdset_next(st);
1083
src/plugin_checks.c
+7
-7
@@ -17,17 +17,17 @@ void *checks_main(void *ptr) {
17
RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
18
19
check1 = rrdset_create("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
20
- rrddim_add(check1, "absolute", NULL, -1, 1, RRDDIM_ABSOLUTE);
21
- rrddim_add(check1, "incremental", NULL, 1, 1, RRDDIM_INCREMENTAL);
20
+ rrddim_add(check1, "absolute", NULL, -1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
21
+ rrddim_add(check1, "incremental", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
22
23
check2 = rrdset_create("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
24
- rrddim_add(check2, "absolute", NULL, -1, 1, RRDDIM_ABSOLUTE);
25
- rrddim_add(check2, "incremental", NULL, 1, 1, RRDDIM_INCREMENTAL);
24
+ rrddim_add(check2, "absolute", NULL, -1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
25
+ rrddim_add(check2, "incremental", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
26
27
check3 = rrdset_create("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference", "microseconds diff", 99999, rrd_update_every, RRDSET_TYPE_LINE);
28
- rrddim_add(check3, "caller", NULL, 1, 1, RRDDIM_ABSOLUTE);
29
- rrddim_add(check3, "netdata", NULL, 1, 1, RRDDIM_ABSOLUTE);
30
- rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRDDIM_ABSOLUTE);
28
+ rrddim_add(check3, "caller", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
29
+ rrddim_add(check3, "netdata", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
30
+ rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
31
32
now_realtime_timeval(&last);
33
while(1) {
src/plugin_idlejitter.c
+1
-1
@@ -22,7 +22,7 @@ void *cpuidlejitter_main(void *ptr) {
22
RRDSET *st = rrdset_find("system.idlejitter");
23
if(!st) {
24
st = rrdset_create("system", "idlejitter", NULL, "processes", NULL, "CPU Idle Jitter", "microseconds lost/s", 9999, rrd_update_every, RRDSET_TYPE_LINE);
25
- rrddim_add(st, "jitter", NULL, 1, 1, RRDDIM_ABSOLUTE);
25
+ rrddim_add(st, "jitter", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
26
}
27
28
struct timeval before, after;
src/plugin_nfacct.c
+4
-4
@@ -142,14 +142,14 @@ void *nfacct_main(void *ptr) {
142
st = rrdset_create("netfilter", "nfacct_packets", NULL, "nfacct", NULL, "Netfilter Accounting Packets", "packets/s", 3206, rrd_update_every, RRDSET_TYPE_STACKED);
143
144
for(i = 0; i < nfacct_list->len ; i++)
145
- rrddim_add(st, nfacct_list->data[i].name, NULL, 1, rrd_update_every, RRDDIM_INCREMENTAL);
145
+ rrddim_add(st, nfacct_list->data[i].name, NULL, 1, rrd_update_every, RRDDIM_ALGORITHM_INCREMENTAL);
146
}
147
else rrdset_next(st);
148
149
for(i = 0; i < nfacct_list->len ; i++) {
150
RRDDIM *rd = rrddim_find(st, nfacct_list->data[i].name);
151
152
- if(!rd) rd = rrddim_add(st, nfacct_list->data[i].name, NULL, 1, rrd_update_every, RRDDIM_INCREMENTAL);
152
+ if(!rd) rd = rrddim_add(st, nfacct_list->data[i].name, NULL, 1, rrd_update_every, RRDDIM_ALGORITHM_INCREMENTAL);
153
if(rd) rrddim_set_by_pointer(st, rd, nfacct_list->data[i].pkts);
154
}
155
@@ -162,14 +162,14 @@ void *nfacct_main(void *ptr) {
162
st = rrdset_create("netfilter", "nfacct_bytes", NULL, "nfacct", NULL, "Netfilter Accounting Bandwidth", "kilobytes/s", 3207, rrd_update_every, RRDSET_TYPE_STACKED);
163
164
for(i = 0; i < nfacct_list->len ; i++)
165
- rrddim_add(st, nfacct_list->data[i].name, NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
165
+ rrddim_add(st, nfacct_list->data[i].name, NULL, 1, 1000 * rrd_update_every, RRDDIM_ALGORITHM_INCREMENTAL);
166
}
167
else rrdset_next(st);
168
169
for(i = 0; i < nfacct_list->len ; i++) {
170
RRDDIM *rd = rrddim_find(st, nfacct_list->data[i].name);
171
172
- if(!rd) rd = rrddim_add(st, nfacct_list->data[i].name, NULL, 1, 1000 * rrd_update_every, RRDDIM_INCREMENTAL);
172
+ if(!rd) rd = rrddim_add(st, nfacct_list->data[i].name, NULL, 1, 1000 * rrd_update_every, RRDDIM_ALGORITHM_INCREMENTAL);
173
if(rd) rrddim_set_by_pointer(st, rd, nfacct_list->data[i].bytes);
174
}
175
src/plugin_proc.c
+1
-1
@@ -121,7 +121,7 @@ void *proc_main(void *ptr) {
121
struct proc_module *pm = &proc_modules[i];
122
if(unlikely(!pm->enabled)) continue;
123
124
- pm->rd = rrddim_add(st, pm->dim, NULL, 1, 1000, RRDDIM_ABSOLUTE);
124
+ pm->rd = rrddim_add(st, pm->dim, NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
125
}
126
}
127
}
src/plugin_proc_diskspace.c
+9
-9
@@ -160,9 +160,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
160
m->st_space = rrdset_create("disk_space", disk, NULL, family, "disk.space", title, "GB", 2023, update_every, RRDSET_TYPE_STACKED);
161
}
162
163
- m->rd_space_avail = rrddim_add(m->st_space, "avail", NULL, bsize, 1024 * 1024 * 1024, RRDDIM_ABSOLUTE);
164
- m->rd_space_used = rrddim_add(m->st_space, "used", NULL, bsize, 1024 * 1024 * 1024, RRDDIM_ABSOLUTE);
165
- m->rd_space_reserved = rrddim_add(m->st_space, "reserved_for_root", "reserved for root", bsize, 1024 * 1024 * 1024, RRDDIM_ABSOLUTE);
163
+ m->rd_space_avail = rrddim_add(m->st_space, "avail", NULL, bsize, 1024 * 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
164
+ m->rd_space_used = rrddim_add(m->st_space, "used", NULL, bsize, 1024 * 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
165
+ m->rd_space_reserved = rrddim_add(m->st_space, "reserved_for_root", "reserved for root", bsize, 1024 * 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
166
}
167
else
168
rrdset_next(m->st_space);
@@ -187,9 +187,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
187
m->st_inodes = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", title, "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
188
}
189
190
- m->rd_inodes_avail = rrddim_add(m->st_inodes, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
191
- m->rd_inodes_used = rrddim_add(m->st_inodes, "used", NULL, 1, 1, RRDDIM_ABSOLUTE);
192
- m->rd_inodes_reserved = rrddim_add(m->st_inodes, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
190
+ m->rd_inodes_avail = rrddim_add(m->st_inodes, "avail", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
191
+ m->rd_inodes_used = rrddim_add(m->st_inodes, "used", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
192
+ m->rd_inodes_reserved = rrddim_add(m->st_inodes, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
193
}
194
else
195
rrdset_next(m->st_inodes);
@@ -277,8 +277,8 @@ void *proc_diskspace_main(void *ptr) {
277
, "NetData Disk Space Plugin CPU usage", "milliseconds/s", 132020
278
, update_every, RRDSET_TYPE_STACKED);
279
280
- rd_user = rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
281
- rd_system = rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
280
+ rd_user = rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
281
+ rd_system = rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
282
}
283
else
284
rrdset_next(stcpu_thread);
@@ -295,7 +295,7 @@ void *proc_diskspace_main(void *ptr) {
295
, "NetData Disk Space Plugin Duration", "milliseconds/run", 132021
296
, update_every, RRDSET_TYPE_AREA);
297
298
- rd_duration = rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ABSOLUTE);
298
+ rd_duration = rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
299
}
300
else
301
rrdset_next(st_duration);
src/plugin_tc.c
+8
-8
@@ -388,7 +388,7 @@ static inline void tc_device_commit(struct tc_device *d) {
388
if(unlikely(!c->render)) continue;
389
390
if(unlikely(!c->rd_bytes))
391
- c->rd_bytes = rrddim_add(d->st_bytes, c->id, c->name?c->name:c->id, 8, 1024, RRDDIM_INCREMENTAL);
391
+ c->rd_bytes = rrddim_add(d->st_bytes, c->id, c->name?c->name:c->id, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
392
else if(unlikely(c->name_updated))
393
rrddim_set_name(d->st_bytes, c->rd_bytes, c->name);
394
@@ -428,7 +428,7 @@ static inline void tc_device_commit(struct tc_device *d) {
428
if(unlikely(!c->render)) continue;
429
430
if(unlikely(!c->rd_packets))
431
- c->rd_packets = rrddim_add(d->st_packets, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_INCREMENTAL);
431
+ c->rd_packets = rrddim_add(d->st_packets, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
432
else if(unlikely(c->name_updated))
433
rrddim_set_name(d->st_packets, c->rd_packets, c->name);
434
@@ -468,7 +468,7 @@ static inline void tc_device_commit(struct tc_device *d) {
468
if(unlikely(!c->render)) continue;
469
470
if(unlikely(!c->rd_dropped))
471
- c->rd_dropped = rrddim_add(d->st_dropped, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_INCREMENTAL);
471
+ c->rd_dropped = rrddim_add(d->st_dropped, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
472
else if(unlikely(c->name_updated))
473
rrddim_set_name(d->st_dropped, c->rd_dropped, c->name);
474
@@ -508,7 +508,7 @@ static inline void tc_device_commit(struct tc_device *d) {
508
if(unlikely(!c->render)) continue;
509
510
if(unlikely(!c->rd_tokens)) {
511
- c->rd_tokens = rrddim_add(d->st_tokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ABSOLUTE);
511
+ c->rd_tokens = rrddim_add(d->st_tokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
512
}
513
else if(unlikely(c->name_updated))
514
rrddim_set_name(d->st_tokens, c->rd_tokens, c->name);
@@ -550,7 +550,7 @@ static inline void tc_device_commit(struct tc_device *d) {
550
if(unlikely(!c->render)) continue;
551
552
if(unlikely(!c->rd_ctokens))
553
- c->rd_ctokens = rrddim_add(d->st_ctokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ABSOLUTE);
553
+ c->rd_ctokens = rrddim_add(d->st_ctokens, c->id, c->name?c->name:c->id, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
554
else if(unlikely(c->name_updated))
555
rrddim_set_name(d->st_ctokens, c->rd_ctokens, c->name);
556
@@ -977,8 +977,8 @@ void *tc_main(void *ptr) {
977
if(unlikely(!stcpu)) stcpu = rrdset_find("netdata.plugin_tc_cpu");
978
if(unlikely(!stcpu)) {
979
stcpu = rrdset_create("netdata", "plugin_tc_cpu", NULL, "tc.helper", NULL, "NetData TC CPU usage", "milliseconds/s", 135000, rrd_update_every, RRDSET_TYPE_STACKED);
980
- rrddim_add(stcpu, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
981
- rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
980
+ rrddim_add(stcpu, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
981
+ rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
982
}
983
else rrdset_next(stcpu);
984
@@ -989,7 +989,7 @@ void *tc_main(void *ptr) {
989
if(unlikely(!sttime)) stcpu = rrdset_find("netdata.plugin_tc_time");
990
if(unlikely(!sttime)) {
991
sttime = rrdset_create("netdata", "plugin_tc_time", NULL, "tc.helper", NULL, "NetData TC script execution", "milliseconds/run", 135001, rrd_update_every, RRDSET_TYPE_AREA);
992
- rrddim_add(sttime, "run_time", "run time", 1, 1, RRDDIM_ABSOLUTE);
992
+ rrddim_add(sttime, "run_time", "run time", 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
993
}
994
else rrdset_next(sttime);
995
src/plugins_d.c
+3
-3
@@ -316,9 +316,9 @@ void *pluginsd_worker_thread(void *arg)
316
rd = rrddim_add(st, id, name, multiplier, divisor, rrddim_algorithm_id(algorithm));
317
rd->flags = 0x00000000;
318
if(options && *options) {
319
- if(strstr(options, "hidden") != NULL) rd->flags |= RRDDIM_FLAG_HIDDEN;
320
- if(strstr(options, "noreset") != NULL) rd->flags |= RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS;
321
- if(strstr(options, "nooverflow") != NULL) rd->flags |= RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS;
319
+ if(strstr(options, "hidden") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_HIDDEN);
320
+ if(strstr(options, "noreset") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
321
+ if(strstr(options, "nooverflow") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
322
}
323
}
324
else if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
src/proc_diskstats.c
+16
-16
@@ -421,8 +421,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
421
if(unlikely(!st)) {
422
st = rrdset_create(RRD_TYPE_DISK, disk, NULL, family, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
423
424
- rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_INCREMENTAL);
425
- rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_INCREMENTAL);
424
+ rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
425
+ rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
426
}
427
else rrdset_next(st);
428
@@ -441,8 +441,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
441
st = rrdset_create("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
442
st->isdetail = 1;
443
444
- rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
445
- rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
444
+ rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
445
+ rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
446
}
447
else rrdset_next(st);
448
@@ -461,7 +461,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
461
st = rrdset_create("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
462
st->isdetail = 1;
463
464
- rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE);
464
+ rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
465
}
466
else rrdset_next(st);
467
@@ -479,7 +479,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
479
st = rrdset_create("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog", "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
480
st->isdetail = 1;
481
482
- rrddim_add(st, "backlog", NULL, 1, 10, RRDDIM_INCREMENTAL);
482
+ rrddim_add(st, "backlog", NULL, 1, 10, RRDDIM_ALGORITHM_INCREMENTAL);
483
}
484
else rrdset_next(st);
485
@@ -497,7 +497,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
497
st = rrdset_create("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
498
st->isdetail = 1;
499
500
- rrddim_add(st, "utilization", NULL, 1, 10, RRDDIM_INCREMENTAL);
500
+ rrddim_add(st, "utilization", NULL, 1, 10, RRDDIM_ALGORITHM_INCREMENTAL);
501
}
502
else rrdset_next(st);
503
@@ -515,8 +515,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
515
st = rrdset_create("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations", "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
516
st->isdetail = 1;
517
518
- rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
519
- rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
518
+ rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
519
+ rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
520
}
521
else rrdset_next(st);
522
@@ -535,8 +535,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
535
st = rrdset_create("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
536
st->isdetail = 1;
537
538
- rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
539
- rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
538
+ rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
539
+ rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
540
}
541
else rrdset_next(st);
542
@@ -557,8 +557,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
557
st = rrdset_create("disk_await", disk, NULL, family, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
558
st->isdetail = 1;
559
560
- rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ABSOLUTE);
561
- rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ABSOLUTE);
560
+ rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
561
+ rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
562
}
563
else rrdset_next(st);
564
@@ -574,8 +574,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
574
st = rrdset_create("disk_avgsz", disk, NULL, family, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
575
st->isdetail = 1;
576
577
- rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_ABSOLUTE);
578
- rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_ABSOLUTE);
577
+ rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
578
+ rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
579
}
580
else rrdset_next(st);
581
@@ -591,7 +591,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
591
st = rrdset_create("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
592
st->isdetail = 1;
593
594
- rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ABSOLUTE);
594
+ rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
595
}
596
else rrdset_next(st);
597
src/proc_interrupts.c
+2
-2
@@ -159,7 +159,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {
159
if(unlikely(!irr->rd || strncmp(irr->rd->name, irr->name, MAX_INTERRUPT_NAME) != 0)) {
160
irr->rd = rrddim_find(st, irr->id);
161
if(unlikely(!irr->rd))
162
- irr->rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_INCREMENTAL);
162
+ irr->rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
163
else
164
rrddim_set_name(st, irr->rd, irr->name);
165
@@ -195,7 +195,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {
195
if(unlikely(!irr->cpu[c].rd)) {
196
irr->cpu[c].rd = rrddim_find(st, irr->id);
197
if(unlikely(!irr->cpu[c].rd))
198
- irr->cpu[c].rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_INCREMENTAL);
198
+ irr->cpu[c].rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
199
else
200
rrddim_set_name(st, irr->cpu[c].rd, irr->name);
201
}
src/proc_loadavg.c
+4
-4
@@ -53,9 +53,9 @@ int do_proc_loadavg(int update_every, usec_t dt) {
53
load_chart = rrdset_find_byname("system.load");
54
if(unlikely(!load_chart)) {
55
load_chart = rrdset_create("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
56
- rrddim_add(load_chart, "load1", NULL, 1, 1000, RRDDIM_ABSOLUTE);
57
- rrddim_add(load_chart, "load5", NULL, 1, 1000, RRDDIM_ABSOLUTE);
58
- rrddim_add(load_chart, "load15", NULL, 1, 1000, RRDDIM_ABSOLUTE);
56
+ rrddim_add(load_chart, "load1", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
57
+ rrddim_add(load_chart, "load5", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
58
+ rrddim_add(load_chart, "load15", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
59
}
60
}
61
else
@@ -78,7 +78,7 @@ int do_proc_loadavg(int update_every, usec_t dt) {
78
processes_chart = rrdset_find_byname("system.active_processes");
79
if(unlikely(!processes_chart)) {
80
processes_chart = rrdset_create("system", "active_processes", NULL, "processes", NULL, "System Active Processes", "processes", 750, update_every, RRDSET_TYPE_LINE);
81
- rrddim_add(processes_chart, "active", NULL, 1, 1, RRDDIM_ABSOLUTE);
81
+ rrddim_add(processes_chart, "active", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
82
}
83
}
84
else rrdset_next(processes_chart);
src/proc_meminfo.c
+19
-19
@@ -144,10 +144,10 @@ int do_proc_meminfo(int update_every, usec_t dt) {
144
if(!st) {
145
st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
146
147
- rrddim_add(st, "free", NULL, 1, 1024, RRDDIM_ABSOLUTE);
148
- rrddim_add(st, "used", NULL, 1, 1024, RRDDIM_ABSOLUTE);
149
- rrddim_add(st, "cached", NULL, 1, 1024, RRDDIM_ABSOLUTE);
150
- rrddim_add(st, "buffers", NULL, 1, 1024, RRDDIM_ABSOLUTE);
147
+ rrddim_add(st, "free", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
148
+ rrddim_add(st, "used", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
149
+ rrddim_add(st, "cached", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
150
+ rrddim_add(st, "buffers", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
151
}
152
else rrdset_next(st);
153
@@ -170,8 +170,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
170
st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
171
st->isdetail = 1;
172
173
- rrddim_add(st, "free", NULL, 1, 1024, RRDDIM_ABSOLUTE);
174
- rrddim_add(st, "used", NULL, 1, 1024, RRDDIM_ABSOLUTE);
173
+ rrddim_add(st, "free", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
174
+ rrddim_add(st, "used", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
175
}
176
else rrdset_next(st);
177
@@ -190,7 +190,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
190
st = rrdset_create("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000, update_every, RRDSET_TYPE_LINE);
191
st->isdetail = 1;
192
193
- rrddim_add(st, "HardwareCorrupted", NULL, 1, 1024, RRDDIM_ABSOLUTE);
193
+ rrddim_add(st, "HardwareCorrupted", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
194
}
195
else rrdset_next(st);
196
@@ -206,7 +206,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
206
st = rrdset_create("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
207
st->isdetail = 1;
208
209
- rrddim_add(st, "Committed_AS", NULL, 1, 1024, RRDDIM_ABSOLUTE);
209
+ rrddim_add(st, "Committed_AS", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
210
}
211
else rrdset_next(st);
212
@@ -222,11 +222,11 @@ int do_proc_meminfo(int update_every, usec_t dt) {
222
st = rrdset_create("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000, update_every, RRDSET_TYPE_LINE);
223
st->isdetail = 1;
224
225
- rrddim_add(st, "Dirty", NULL, 1, 1024, RRDDIM_ABSOLUTE);
226
- rrddim_add(st, "Writeback", NULL, 1, 1024, RRDDIM_ABSOLUTE);
227
- rrddim_add(st, "FuseWriteback", NULL, 1, 1024, RRDDIM_ABSOLUTE);
228
- rrddim_add(st, "NfsWriteback", NULL, 1, 1024, RRDDIM_ABSOLUTE);
229
- rrddim_add(st, "Bounce", NULL, 1, 1024, RRDDIM_ABSOLUTE);
225
+ rrddim_add(st, "Dirty", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
226
+ rrddim_add(st, "Writeback", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
227
+ rrddim_add(st, "FuseWriteback", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
228
+ rrddim_add(st, "NfsWriteback", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
229
+ rrddim_add(st, "Bounce", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
230
}
231
else rrdset_next(st);
232
@@ -246,10 +246,10 @@ int do_proc_meminfo(int update_every, usec_t dt) {
246
st = rrdset_create("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000, update_every, RRDSET_TYPE_STACKED);
247
st->isdetail = 1;
248
249
- rrddim_add(st, "Slab", NULL, 1, 1024, RRDDIM_ABSOLUTE);
250
- rrddim_add(st, "KernelStack", NULL, 1, 1024, RRDDIM_ABSOLUTE);
251
- rrddim_add(st, "PageTables", NULL, 1, 1024, RRDDIM_ABSOLUTE);
252
- rrddim_add(st, "VmallocUsed", NULL, 1, 1024, RRDDIM_ABSOLUTE);
249
+ rrddim_add(st, "Slab", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
250
+ rrddim_add(st, "KernelStack", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
251
+ rrddim_add(st, "PageTables", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
252
+ rrddim_add(st, "VmallocUsed", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
253
}
254
else rrdset_next(st);
255
@@ -268,8 +268,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
268
st = rrdset_create("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500, update_every, RRDSET_TYPE_STACKED);
269
st->isdetail = 1;
270
271
- rrddim_add(st, "reclaimable", NULL, 1, 1024, RRDDIM_ABSOLUTE);
272
- rrddim_add(st, "unreclaimable", NULL, 1, 1024, RRDDIM_ABSOLUTE);
271
+ rrddim_add(st, "reclaimable", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
272
+ rrddim_add(st, "unreclaimable", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
273
}
274
else rrdset_next(st);
275
src/proc_net_dev.c
+16
-16
@@ -228,8 +228,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
228
if(!d->st_bandwidth)
229
d->st_bandwidth = rrdset_create("net", d->name, NULL, d->name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
230
231
- d->rd_rbytes = rrddim_add(d->st_bandwidth, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
232
- d->rd_tbytes = rrddim_add(d->st_bandwidth, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
231
+ d->rd_rbytes = rrddim_add(d->st_bandwidth, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
232
+ d->rd_tbytes = rrddim_add(d->st_bandwidth, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
233
}
234
else rrdset_next(d->st_bandwidth);
235
@@ -252,9 +252,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
252
253
d->st_packets->isdetail = 1;
254
255
- d->rd_rpackets = rrddim_add(d->st_packets, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
256
- d->rd_tpackets = rrddim_add(d->st_packets, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
257
- d->rd_rmulticast = rrddim_add(d->st_packets, "multicast", NULL, 1, 1, RRDDIM_INCREMENTAL);
255
+ d->rd_rpackets = rrddim_add(d->st_packets, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
256
+ d->rd_tpackets = rrddim_add(d->st_packets, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
257
+ d->rd_rmulticast = rrddim_add(d->st_packets, "multicast", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
258
}
259
else rrdset_next(d->st_packets);
260
@@ -278,8 +278,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
278
279
d->st_errors->isdetail = 1;
280
281
- d->rd_rerrors = rrddim_add(d->st_errors, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
282
- d->rd_terrors = rrddim_add(d->st_errors, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL);
281
+ d->rd_rerrors = rrddim_add(d->st_errors, "inbound", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
282
+ d->rd_terrors = rrddim_add(d->st_errors, "outbound", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
283
}
284
else rrdset_next(d->st_errors);
285
@@ -302,8 +302,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
302
303
d->st_drops->isdetail = 1;
304
305
- d->rd_rdrops = rrddim_add(d->st_drops, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
306
- d->rd_tdrops = rrddim_add(d->st_drops, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL);
305
+ d->rd_rdrops = rrddim_add(d->st_drops, "inbound", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
306
+ d->rd_tdrops = rrddim_add(d->st_drops, "outbound", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
307
}
308
else rrdset_next(d->st_drops);
309
@@ -326,8 +326,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
326
327
d->st_fifo->isdetail = 1;
328
329
- d->rd_rfifo = rrddim_add(d->st_fifo, "receive", NULL, 1, 1, RRDDIM_INCREMENTAL);
330
- d->rd_tfifo = rrddim_add(d->st_fifo, "transmit", NULL, -1, 1, RRDDIM_INCREMENTAL);
329
+ d->rd_rfifo = rrddim_add(d->st_fifo, "receive", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
330
+ d->rd_tfifo = rrddim_add(d->st_fifo, "transmit", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
331
}
332
else rrdset_next(d->st_fifo);
333
@@ -349,8 +349,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
349
350
d->st_compressed->isdetail = 1;
351
352
- d->rd_rcompressed = rrddim_add(d->st_compressed, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
353
- d->rd_tcompressed = rrddim_add(d->st_compressed, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
352
+ d->rd_rcompressed = rrddim_add(d->st_compressed, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
353
+ d->rd_tcompressed = rrddim_add(d->st_compressed, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
354
}
355
else rrdset_next(d->st_compressed);
356
@@ -372,9 +372,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
372
373
d->st_events->isdetail = 1;
374
375
- d->rd_rframe = rrddim_add(d->st_events, "frames", NULL, 1, 1, RRDDIM_INCREMENTAL);
376
- d->rd_tcollisions = rrddim_add(d->st_events, "collisions", NULL, -1, 1, RRDDIM_INCREMENTAL);
377
- d->rd_tcarrier = rrddim_add(d->st_events, "carrier", NULL, -1, 1, RRDDIM_INCREMENTAL);
375
+ d->rd_rframe = rrddim_add(d->st_events, "frames", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
376
+ d->rd_tcollisions = rrddim_add(d->st_events, "collisions", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
377
+ d->rd_tcarrier = rrddim_add(d->st_events, "carrier", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
378
}
379
else rrdset_next(d->st_events);
380
src/proc_net_ip_vs_stats.c
+5
-5
@@ -44,7 +44,7 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
44
if(!st) {
45
st = rrdset_create(RRD_TYPE_NET_IPVS, "sockets", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS New Connections", "connections/s", 3101, update_every, RRDSET_TYPE_LINE);
46
47
- rrddim_add(st, "connections", NULL, 1, 1, RRDDIM_INCREMENTAL);
47
+ rrddim_add(st, "connections", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
48
}
49
else rrdset_next(st);
50
@@ -59,8 +59,8 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
59
if(!st) {
60
st = rrdset_create(RRD_TYPE_NET_IPVS, "packets", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Packets", "packets/s", 3102, update_every, RRDSET_TYPE_LINE);
61
62
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
63
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
62
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
63
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
64
}
65
else rrdset_next(st);
66
@@ -76,8 +76,8 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
76
if(!st) {
77
st = rrdset_create(RRD_TYPE_NET_IPVS, "net", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Bandwidth", "kilobits/s", 3100, update_every, RRDSET_TYPE_AREA);
78
79
- rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
80
- rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
79
+ rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
80
+ rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
81
}
82
else rrdset_next(st);
83
src/proc_net_netstat.c
+35
-35
@@ -234,8 +234,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
234
if(unlikely(!st)) {
235
st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
236
237
- rrddim_add(st, "InOctets", "received", 8, 1024, RRDDIM_INCREMENTAL);
238
- rrddim_add(st, "OutOctets", "sent", -8, 1024, RRDDIM_INCREMENTAL);
237
+ rrddim_add(st, "InOctets", "received", 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
238
+ rrddim_add(st, "OutOctets", "sent", -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
239
}
240
else rrdset_next(st);
241
@@ -253,9 +253,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
253
st = rrdset_create("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors", "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
254
st->isdetail = 1;
255
256
- rrddim_add(st, "InNoRoutes", "noroutes", 1, 1, RRDDIM_INCREMENTAL);
257
- rrddim_add(st, "InTruncatedPkts", "truncated", 1, 1, RRDDIM_INCREMENTAL);
258
- rrddim_add(st, "InCsumErrors", "checksum", 1, 1, RRDDIM_INCREMENTAL);
256
+ rrddim_add(st, "InNoRoutes", "noroutes", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
257
+ rrddim_add(st, "InTruncatedPkts", "truncated", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
258
+ rrddim_add(st, "InCsumErrors", "checksum", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
259
}
260
else rrdset_next(st);
261
@@ -274,8 +274,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
274
st = rrdset_create("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
275
st->isdetail = 1;
276
277
- rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRDDIM_INCREMENTAL);
278
- rrddim_add(st, "OutMcastOctets", "sent", -8, 1024, RRDDIM_INCREMENTAL);
277
+ rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
278
+ rrddim_add(st, "OutMcastOctets", "sent", -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
279
}
280
else rrdset_next(st);
281
@@ -293,8 +293,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
293
st = rrdset_create("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
294
st->isdetail = 1;
295
296
- rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRDDIM_INCREMENTAL);
297
- rrddim_add(st, "OutBcastOctets", "sent", -8, 1024, RRDDIM_INCREMENTAL);
296
+ rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
297
+ rrddim_add(st, "OutBcastOctets", "sent", -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
298
}
299
else rrdset_next(st);
300
@@ -312,8 +312,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
312
st = rrdset_create("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets", "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
313
st->isdetail = 1;
314
315
- rrddim_add(st, "InMcastPkts", "received", 1, 1, RRDDIM_INCREMENTAL);
316
- rrddim_add(st, "OutMcastPkts", "sent", -1, 1, RRDDIM_INCREMENTAL);
315
+ rrddim_add(st, "InMcastPkts", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
316
+ rrddim_add(st, "OutMcastPkts", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
317
}
318
else rrdset_next(st);
319
@@ -331,8 +331,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
331
st = rrdset_create("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets", "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
332
st->isdetail = 1;
333
334
- rrddim_add(st, "InBcastPkts", "received", 1, 1, RRDDIM_INCREMENTAL);
335
- rrddim_add(st, "OutBcastPkts", "sent", -1, 1, RRDDIM_INCREMENTAL);
334
+ rrddim_add(st, "InBcastPkts", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
335
+ rrddim_add(st, "OutBcastPkts", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
336
}
337
else rrdset_next(st);
338
@@ -350,10 +350,10 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
350
st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
351
st->isdetail = 1;
352
353
- rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRDDIM_INCREMENTAL);
354
- rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRDDIM_INCREMENTAL);
355
- rrddim_add(st, "InECT0Pkts", "ECTP0", 1, 1, RRDDIM_INCREMENTAL);
356
- rrddim_add(st, "InECT1Pkts", "ECTP1", 1, 1, RRDDIM_INCREMENTAL);
353
+ rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
354
+ rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
355
+ rrddim_add(st, "InECT0Pkts", "ECTP0", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
356
+ rrddim_add(st, "InECT1Pkts", "ECTP1", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
357
}
358
else rrdset_next(st);
359
@@ -385,7 +385,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
385
if(unlikely(!st)) {
386
st = rrdset_create("ipv4", "tcpmemorypressures", NULL, "tcp", NULL, "TCP Memory Pressures", "events/s", 3000, update_every, RRDSET_TYPE_LINE);
387
388
- rrddim_add(st, "TCPMemoryPressures", "pressures", 1, 1, RRDDIM_INCREMENTAL);
388
+ rrddim_add(st, "TCPMemoryPressures", "pressures", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
389
}
390
else rrdset_next(st);
391
@@ -401,12 +401,12 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
401
if(unlikely(!st)) {
402
st = rrdset_create("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
403
404
- rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRDDIM_INCREMENTAL);
405
- rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRDDIM_INCREMENTAL);
406
- rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRDDIM_INCREMENTAL);
407
- rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRDDIM_INCREMENTAL);
408
- rrddim_add(st, "TCPAbortOnLinger", "linger", 1, 1, RRDDIM_INCREMENTAL);
409
- rrddim_add(st, "TCPAbortFailed", "failed", -1, 1, RRDDIM_INCREMENTAL);
404
+ rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
405
+ rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
406
+ rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
407
+ rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
408
+ rrddim_add(st, "TCPAbortOnLinger", "linger", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
409
+ rrddim_add(st, "TCPAbortFailed", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
410
}
411
else rrdset_next(st);
412
@@ -426,10 +426,10 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
426
if(unlikely(!st)) {
427
st = rrdset_create("ipv4", "tcpreorders", NULL, "tcp", NULL, "TCP Reordered Packets by Detection Method", "packets/s", 3020, update_every, RRDSET_TYPE_LINE);
428
429
- rrddim_add(st, "TCPTSReorder", "timestamp", 1, 1, RRDDIM_INCREMENTAL);
430
- rrddim_add(st, "TCPSACKReorder", "sack", 1, 1, RRDDIM_INCREMENTAL);
431
- rrddim_add(st, "TCPFACKReorder", "fack", 1, 1, RRDDIM_INCREMENTAL);
432
- rrddim_add(st, "TCPRenoReorder", "reno", 1, 1, RRDDIM_INCREMENTAL);
429
+ rrddim_add(st, "TCPTSReorder", "timestamp", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
430
+ rrddim_add(st, "TCPSACKReorder", "sack", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
431
+ rrddim_add(st, "TCPFACKReorder", "fack", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
432
+ rrddim_add(st, "TCPRenoReorder", "reno", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
433
}
434
else rrdset_next(st);
435
@@ -448,10 +448,10 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
448
if(unlikely(!st)) {
449
st = rrdset_create("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
450
451
- rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRDDIM_INCREMENTAL);
452
- rrddim_add(st, "TCPOFODrop", "dropped", -1, 1, RRDDIM_INCREMENTAL);
453
- rrddim_add(st, "TCPOFOMerge", "merged", 1, 1, RRDDIM_INCREMENTAL);
454
- rrddim_add(st, "OfoPruned", "pruned", -1, 1, RRDDIM_INCREMENTAL);
451
+ rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
452
+ rrddim_add(st, "TCPOFODrop", "dropped", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
453
+ rrddim_add(st, "TCPOFOMerge", "merged", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
454
+ rrddim_add(st, "OfoPruned", "pruned", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
455
}
456
else rrdset_next(st);
457
@@ -470,9 +470,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
470
if(unlikely(!st)) {
471
st = rrdset_create("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
472
473
- rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRDDIM_INCREMENTAL);
474
- rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRDDIM_INCREMENTAL);
475
- rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRDDIM_INCREMENTAL);
473
+ rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
474
+ rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
475
+ rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
476
}
477
else rrdset_next(st);
478
src/proc_net_rpc_nfs.c
+8
-8
@@ -274,8 +274,8 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
274
st = rrdset_create("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007, update_every, RRDSET_TYPE_STACKED);
275
st->isdetail = 1;
276
277
- rrddim_add(st, "udp", NULL, 1, 1, RRDDIM_INCREMENTAL);
278
- rrddim_add(st, "tcp", NULL, 1, 1, RRDDIM_INCREMENTAL);
277
+ rrddim_add(st, "udp", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
278
+ rrddim_add(st, "tcp", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
279
}
280
else rrdset_next(st);
281
@@ -296,9 +296,9 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
296
st = rrdset_create("nfs", "rpc", NULL, "rpc", NULL, "NFS Client Remote Procedure Calls Statistics", "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
297
st->isdetail = 1;
298
299
- rrddim_add(st, "calls", NULL, 1, 1, RRDDIM_INCREMENTAL);
300
- rrddim_add(st, "retransmits", NULL, -1, 1, RRDDIM_INCREMENTAL);
301
- rrddim_add(st, "auth_refresh", NULL, -1, 1, RRDDIM_INCREMENTAL);
299
+ rrddim_add(st, "calls", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
300
+ rrddim_add(st, "retransmits", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
301
+ rrddim_add(st, "auth_refresh", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
302
}
303
else rrdset_next(st);
304
@@ -317,7 +317,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
317
st = rrdset_create("nfs", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Client Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
318
319
for(i = 0; nfs_proc2_values[i].present ; i++)
320
- rrddim_add(st, nfs_proc2_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
320
+ rrddim_add(st, nfs_proc2_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
321
}
322
else rrdset_next(st);
323
@@ -336,7 +336,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
336
st = rrdset_create("nfs", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Client Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
337
338
for(i = 0; nfs_proc3_values[i].present ; i++)
339
- rrddim_add(st, nfs_proc3_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
339
+ rrddim_add(st, nfs_proc3_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
340
}
341
else rrdset_next(st);
342
@@ -355,7 +355,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
355
st = rrdset_create("nfs", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Client Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
356
357
for(i = 0; nfs_proc4_values[i].present ; i++)
358
- rrddim_add(st, nfs_proc4_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
358
+ rrddim_add(st, nfs_proc4_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
359
}
360
else rrdset_next(st);
361
src/proc_net_rpc_nfsd.c
+42
-42
@@ -496,9 +496,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
496
if(!st) {
497
st = rrdset_create("nfsd", "readcache", NULL, "cache", NULL, "NFS Server Read Cache", "reads/s", 5000, update_every, RRDSET_TYPE_STACKED);
498
499
- rrddim_add(st, "hits", NULL, 1, 1, RRDDIM_INCREMENTAL);
500
- rrddim_add(st, "misses", NULL, 1, 1, RRDDIM_INCREMENTAL);
501
- rrddim_add(st, "nocache", NULL, 1, 1, RRDDIM_INCREMENTAL);
499
+ rrddim_add(st, "hits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
500
+ rrddim_add(st, "misses", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
501
+ rrddim_add(st, "nocache", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
502
}
503
else rrdset_next(st);
504
@@ -516,11 +516,11 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
516
st = rrdset_create("nfsd", "filehandles", NULL, "filehandles", NULL, "NFS Server File Handles", "handles/s", 5001, update_every, RRDSET_TYPE_LINE);
517
st->isdetail = 1;
518
519
- rrddim_add(st, "stale", NULL, 1, 1, RRDDIM_ABSOLUTE);
520
- rrddim_add(st, "total_lookups", NULL, 1, 1, RRDDIM_INCREMENTAL);
521
- rrddim_add(st, "anonymous_lookups", NULL, 1, 1, RRDDIM_INCREMENTAL);
522
- rrddim_add(st, "dir_not_in_dcache", NULL, -1, 1, RRDDIM_INCREMENTAL);
523
- rrddim_add(st, "non_dir_not_in_dcache", NULL, -1, 1, RRDDIM_INCREMENTAL);
519
+ rrddim_add(st, "stale", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
520
+ rrddim_add(st, "total_lookups", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
521
+ rrddim_add(st, "anonymous_lookups", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
522
+ rrddim_add(st, "dir_not_in_dcache", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
523
+ rrddim_add(st, "non_dir_not_in_dcache", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
524
}
525
else rrdset_next(st);
526
@@ -539,8 +539,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
539
if(!st) {
540
st = rrdset_create("nfsd", "io", NULL, "io", NULL, "NFS Server I/O", "kilobytes/s", 5002, update_every, RRDSET_TYPE_AREA);
541
542
- rrddim_add(st, "read", NULL, 1, 1000, RRDDIM_INCREMENTAL);
543
- rrddim_add(st, "write", NULL, -1, 1000, RRDDIM_INCREMENTAL);
542
+ rrddim_add(st, "read", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
543
+ rrddim_add(st, "write", NULL, -1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
544
}
545
else rrdset_next(st);
546
@@ -556,7 +556,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
556
if(!st) {
557
st = rrdset_create("nfsd", "threads", NULL, "threads", NULL, "NFS Server Threads", "threads", 5003, update_every, RRDSET_TYPE_LINE);
558
559
- rrddim_add(st, "threads", NULL, 1, 1, RRDDIM_ABSOLUTE);
559
+ rrddim_add(st, "threads", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
560
}
561
else rrdset_next(st);
562
@@ -567,7 +567,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
567
if(!st) {
568
st = rrdset_create("nfsd", "threads_fullcnt", NULL, "threads", NULL, "NFS Server Threads Full Count", "ops/s", 5004, update_every, RRDSET_TYPE_LINE);
569
570
- rrddim_add(st, "full_count", NULL, 1, 1, RRDDIM_INCREMENTAL);
570
+ rrddim_add(st, "full_count", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
571
}
572
else rrdset_next(st);
573
@@ -578,16 +578,16 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
578
if(!st) {
579
st = rrdset_create("nfsd", "threads_histogram", NULL, "threads", NULL, "NFS Server Threads Usage Histogram", "percentage", 5005, update_every, RRDSET_TYPE_LINE);
580
581
- rrddim_add(st, "0%-10%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
582
- rrddim_add(st, "10%-20%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
583
- rrddim_add(st, "20%-30%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
584
- rrddim_add(st, "30%-40%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
585
- rrddim_add(st, "40%-50%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
586
- rrddim_add(st, "50%-60%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
587
- rrddim_add(st, "60%-70%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
588
- rrddim_add(st, "70%-80%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
589
- rrddim_add(st, "80%-90%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
590
- rrddim_add(st, "90%-100%", NULL, 1, 1000, RRDDIM_ABSOLUTE);
581
+ rrddim_add(st, "0%-10%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
582
+ rrddim_add(st, "10%-20%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
583
+ rrddim_add(st, "20%-30%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
584
+ rrddim_add(st, "30%-40%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
585
+ rrddim_add(st, "40%-50%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
586
+ rrddim_add(st, "50%-60%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
587
+ rrddim_add(st, "60%-70%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
588
+ rrddim_add(st, "70%-80%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
589
+ rrddim_add(st, "80%-90%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
590
+ rrddim_add(st, "90%-100%", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
591
}
592
else rrdset_next(st);
593
@@ -611,17 +611,17 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
611
if(!st) {
612
st = rrdset_create("nfsd", "readahead", NULL, "readahead", NULL, "NFS Server Read Ahead Depth", "percentage", 5005, update_every, RRDSET_TYPE_STACKED);
613
614
- rrddim_add(st, "10%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
615
- rrddim_add(st, "20%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
616
- rrddim_add(st, "30%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
617
- rrddim_add(st, "40%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
618
- rrddim_add(st, "50%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
619
- rrddim_add(st, "60%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
620
- rrddim_add(st, "70%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
621
- rrddim_add(st, "80%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
622
- rrddim_add(st, "90%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
623
- rrddim_add(st, "100%", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
624
- rrddim_add(st, "misses", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
614
+ rrddim_add(st, "10%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
615
+ rrddim_add(st, "20%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
616
+ rrddim_add(st, "30%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
617
+ rrddim_add(st, "40%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
618
+ rrddim_add(st, "50%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
619
+ rrddim_add(st, "60%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
620
+ rrddim_add(st, "70%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
621
+ rrddim_add(st, "80%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
622
+ rrddim_add(st, "90%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
623
+ rrddim_add(st, "100%", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
624
+ rrddim_add(st, "misses", NULL, 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
625
}
626
else rrdset_next(st);
627
@@ -650,8 +650,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
650
st = rrdset_create("nfsd", "net", NULL, "network", NULL, "NFS Server Network Statistics", "packets/s", 5007, update_every, RRDSET_TYPE_STACKED);
651
st->isdetail = 1;
652
653
- rrddim_add(st, "udp", NULL, 1, 1, RRDDIM_INCREMENTAL);
654
- rrddim_add(st, "tcp", NULL, 1, 1, RRDDIM_INCREMENTAL);
653
+ rrddim_add(st, "udp", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
654
+ rrddim_add(st, "tcp", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
655
}
656
else rrdset_next(st);
657
@@ -672,9 +672,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
672
st = rrdset_create("nfsd", "rpc", NULL, "rpc", NULL, "NFS Server Remote Procedure Calls Statistics", "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
673
st->isdetail = 1;
674
675
- rrddim_add(st, "calls", NULL, 1, 1, RRDDIM_INCREMENTAL);
676
- rrddim_add(st, "bad_format", NULL, -1, 1, RRDDIM_INCREMENTAL);
677
- rrddim_add(st, "bad_auth", NULL, -1, 1, RRDDIM_INCREMENTAL);
675
+ rrddim_add(st, "calls", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
676
+ rrddim_add(st, "bad_format", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
677
+ rrddim_add(st, "bad_auth", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
678
}
679
else rrdset_next(st);
680
@@ -696,7 +696,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
696
st = rrdset_create("nfsd", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Server Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
697
698
for(i = 0; nfsd_proc2_values[i].present ; i++)
699
- rrddim_add(st, nfsd_proc2_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
699
+ rrddim_add(st, nfsd_proc2_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
700
}
701
else rrdset_next(st);
702
@@ -715,7 +715,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
715
st = rrdset_create("nfsd", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Server Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
716
717
for(i = 0; nfsd_proc3_values[i].present ; i++)
718
- rrddim_add(st, nfsd_proc3_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
718
+ rrddim_add(st, nfsd_proc3_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
719
}
720
else rrdset_next(st);
721
@@ -734,7 +734,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
734
st = rrdset_create("nfsd", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Server Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
735
736
for(i = 0; nfsd_proc4_values[i].present ; i++)
737
- rrddim_add(st, nfsd_proc4_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
737
+ rrddim_add(st, nfsd_proc4_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
738
}
739
else rrdset_next(st);
740
@@ -753,7 +753,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
753
st = rrdset_create("nfsd", "proc4ops", NULL, "nfsv2ops", NULL, "NFS v4 Server Operations", "operations/s", 5012, update_every, RRDSET_TYPE_STACKED);
754
755
for(i = 0; nfsd4_ops_values[i].present ; i++)
756
- rrddim_add(st, nfsd4_ops_values[i].name, NULL, 1, 1, RRDDIM_INCREMENTAL);
756
+ rrddim_add(st, nfsd4_ops_values[i].name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
757
}
758
else rrdset_next(st);
759
src/proc_net_snmp.c
+49
-49
@@ -396,10 +396,10 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
396
if(!st) {
397
st = rrdset_create(RRD_TYPE_NET_SNMP, "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
398
399
- rrddim_add(st, "InReceives", "received", 1, 1, RRDDIM_INCREMENTAL);
400
- rrddim_add(st, "OutRequests", "sent", -1, 1, RRDDIM_INCREMENTAL);
401
- rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_INCREMENTAL);
402
- rrddim_add(st, "InDelivers", "delivered", 1, 1, RRDDIM_INCREMENTAL);
399
+ rrddim_add(st, "InReceives", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
400
+ rrddim_add(st, "OutRequests", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
401
+ rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
402
+ rrddim_add(st, "InDelivers", "delivered", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
403
}
404
else rrdset_next(st);
405
@@ -418,9 +418,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
418
st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
419
st->isdetail = 1;
420
421
- rrddim_add(st, "FragOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
422
- rrddim_add(st, "FragFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
423
- rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_INCREMENTAL);
421
+ rrddim_add(st, "FragOKs", "ok", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
422
+ rrddim_add(st, "FragFails", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
423
+ rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
424
}
425
else rrdset_next(st);
426
@@ -438,9 +438,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
438
st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
439
st->isdetail = 1;
440
441
- rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
442
- rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
443
- rrddim_add(st, "ReasmReqds", "all", 1, 1, RRDDIM_INCREMENTAL);
441
+ rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
442
+ rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
443
+ rrddim_add(st, "ReasmReqds", "all", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
444
}
445
else rrdset_next(st);
446
@@ -458,14 +458,14 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
458
st = rrdset_create(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
459
st->isdetail = 1;
460
461
- rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
462
- rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
461
+ rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
462
+ rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
463
464
- rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
465
- rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
464
+ rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
465
+ rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
466
467
- rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
468
- rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_INCREMENTAL);
467
+ rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
468
+ rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
469
}
470
else rrdset_next(st);
471
@@ -501,8 +501,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
501
if(!st) {
502
st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s", 2602, update_every, RRDSET_TYPE_LINE);
503
504
- rrddim_add(st, "InMsgs", "received", 1, 1, RRDDIM_INCREMENTAL);
505
- rrddim_add(st, "OutMsgs", "sent", -1, 1, RRDDIM_INCREMENTAL);
504
+ rrddim_add(st, "InMsgs", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
505
+ rrddim_add(st, "OutMsgs", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
506
}
507
else rrdset_next(st);
508
@@ -515,9 +515,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
515
if(!st) {
516
st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
517
518
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
519
- rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
520
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
518
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
519
+ rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
520
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
521
}
522
else rrdset_next(st);
523
@@ -548,7 +548,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
548
st = rrdset_create(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
549
550
for(i = 0; icmpmsg_data[i].name ;i++)
551
- rrddim_add(st, icmpmsg_data[i].name, icmpmsg_data[i].label, icmpmsg_data[i].multiplier, 1, RRDDIM_INCREMENTAL);
551
+ rrddim_add(st, icmpmsg_data[i].name, icmpmsg_data[i].label, icmpmsg_data[i].multiplier, 1, RRDDIM_ALGORITHM_INCREMENTAL);
552
}
553
else rrdset_next(st);
554
@@ -582,7 +582,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
582
if(!st) {
583
st = rrdset_create(RRD_TYPE_NET_SNMP, "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections", "active connections", 2500, update_every, RRDSET_TYPE_LINE);
584
585
- rrddim_add(st, "CurrEstab", "connections", 1, 1, RRDDIM_ABSOLUTE);
585
+ rrddim_add(st, "CurrEstab", "connections", 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
586
}
587
else rrdset_next(st);
588
@@ -597,8 +597,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
597
if(!st) {
598
st = rrdset_create(RRD_TYPE_NET_SNMP, "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets", "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
599
600
- rrddim_add(st, "InSegs", "received", 1, 1, RRDDIM_INCREMENTAL);
601
- rrddim_add(st, "OutSegs", "sent", -1, 1, RRDDIM_INCREMENTAL);
600
+ rrddim_add(st, "InSegs", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
601
+ rrddim_add(st, "OutSegs", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
602
}
603
else rrdset_next(st);
604
@@ -615,9 +615,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
615
st = rrdset_create(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
616
st->isdetail = 1;
617
618
- rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_INCREMENTAL);
619
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
620
- rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_INCREMENTAL);
618
+ rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
619
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
620
+ rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
621
}
622
else rrdset_next(st);
623
@@ -635,11 +635,11 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
635
st = rrdset_create(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues", "events/s", 2900, update_every, RRDSET_TYPE_LINE);
636
st->isdetail = 1;
637
638
- rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_INCREMENTAL);
639
- rrddim_add(st, "OutRsts", NULL, -1, 1, RRDDIM_INCREMENTAL);
640
- rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
641
- rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
642
- rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_INCREMENTAL);
638
+ rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
639
+ rrddim_add(st, "OutRsts", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
640
+ rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
641
+ rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
642
+ rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
643
}
644
else rrdset_next(st);
645
@@ -675,8 +675,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
675
if(!st) {
676
st = rrdset_create(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets", "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
677
678
- rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_INCREMENTAL);
679
- rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_INCREMENTAL);
678
+ rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
679
+ rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
680
}
681
else rrdset_next(st);
682
@@ -693,12 +693,12 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
693
st = rrdset_create(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s", 2701, update_every, RRDSET_TYPE_LINE);
694
st->isdetail = 1;
695
696
- rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
697
- rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
698
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
699
- rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
700
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
701
- rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_INCREMENTAL);
696
+ rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
697
+ rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
698
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
699
+ rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
700
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
701
+ rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
702
}
703
else rrdset_next(st);
704
@@ -734,8 +734,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
734
if(!st) {
735
st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite", NULL, "udplite", NULL, "IPv4 UDPLite Packets", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
736
737
- rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_INCREMENTAL);
738
- rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_INCREMENTAL);
737
+ rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
738
+ rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
739
}
740
else rrdset_next(st);
741
@@ -747,12 +747,12 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
747
if(!st) {
748
st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite_errors", NULL, "udplite", NULL, "IPv4 UDPLite Errors", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
749
750
- rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
751
- rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
752
- rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
753
- rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_INCREMENTAL);
754
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
755
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
750
+ rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
751
+ rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
752
+ rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
753
+ rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
754
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
755
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
756
}
757
else rrdset_next(st);
758
src/proc_net_snmp6.c
+93
-93
@@ -282,8 +282,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
282
if(unlikely(!st)) {
283
st = rrdset_create("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
284
285
- rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
286
- rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
285
+ rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
286
+ rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
287
}
288
else rrdset_next(st);
289
@@ -300,10 +300,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
300
if(unlikely(!st)) {
301
st = rrdset_create(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
302
303
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
304
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
305
- rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_INCREMENTAL);
306
- rrddim_add(st, "delivers", NULL, -1, 1, RRDDIM_INCREMENTAL);
303
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
304
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
305
+ rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
306
+ rrddim_add(st, "delivers", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
307
}
308
else rrdset_next(st);
309
@@ -323,9 +323,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
323
st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
324
st->isdetail = 1;
325
326
- rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
327
- rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
328
- rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
326
+ rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
327
+ rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
328
+ rrddim_add(st, "all", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
329
}
330
else rrdset_next(st);
331
@@ -350,10 +350,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
350
st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
351
st->isdetail = 1;
352
353
- rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
354
- rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
355
- rrddim_add(st, "timeout", NULL, -1, 1, RRDDIM_INCREMENTAL);
356
- rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
353
+ rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
354
+ rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
355
+ rrddim_add(st, "timeout", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
356
+ rrddim_add(st, "all", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
357
}
358
else rrdset_next(st);
359
@@ -383,17 +383,17 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
383
st = rrdset_create(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
384
st->isdetail = 1;
385
386
- rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
387
- rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
386
+ rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
387
+ rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
388
389
- rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
390
- rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
391
- rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_INCREMENTAL);
392
- rrddim_add(st, "InTooBigErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
393
- rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
394
- rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRDDIM_INCREMENTAL);
389
+ rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
390
+ rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
391
+ rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
392
+ rrddim_add(st, "InTooBigErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
393
+ rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
394
+ rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
395
396
- rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
396
+ rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
397
}
398
else rrdset_next(st);
399
@@ -419,8 +419,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
419
if(unlikely(!st)) {
420
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udppackets", NULL, "udp", NULL, "IPv6 UDP Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
421
422
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
423
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
422
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
423
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
424
}
425
else rrdset_next(st);
426
@@ -446,12 +446,12 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
446
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
447
st->isdetail = 1;
448
449
- rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
450
- rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
451
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
452
- rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
453
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
454
- rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_INCREMENTAL);
449
+ rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
450
+ rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
451
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
452
+ rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
453
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
454
+ rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
455
}
456
else rrdset_next(st);
457
@@ -472,8 +472,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
472
if(unlikely(!st)) {
473
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udplitepackets", NULL, "udplite", NULL, "IPv6 UDPlite Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
474
475
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
476
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
475
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
476
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
477
}
478
else rrdset_next(st);
479
@@ -499,11 +499,11 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
499
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL, "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
500
st->isdetail = 1;
501
502
- rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
503
- rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
504
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
505
- rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
506
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
502
+ rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
503
+ rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
504
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
505
+ rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
506
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
507
}
508
else rrdset_next(st);
509
@@ -524,8 +524,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
524
st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL, "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
525
st->isdetail = 1;
526
527
- rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
528
- rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
527
+ rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
528
+ rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
529
}
530
else rrdset_next(st);
531
@@ -543,8 +543,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
543
st = rrdset_create(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL, "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
544
st->isdetail = 1;
545
546
- rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
547
- rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
546
+ rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
547
+ rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
548
}
549
else rrdset_next(st);
550
@@ -562,8 +562,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
562
st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL, "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
563
st->isdetail = 1;
564
565
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
566
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
565
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
566
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
567
}
568
else rrdset_next(st);
569
@@ -580,8 +580,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
580
if(unlikely(!st)) {
581
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
582
583
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
584
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
583
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
584
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
585
}
586
else rrdset_next(st);
587
@@ -598,8 +598,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
598
if(unlikely(!st)) {
599
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects", "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
600
601
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
602
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
601
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
602
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
603
}
604
else rrdset_next(st);
605
@@ -629,18 +629,18 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
629
if(unlikely(!st)) {
630
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
631
632
- rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
633
- rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
634
-
635
- rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
636
- rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRDDIM_INCREMENTAL);
637
- rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRDDIM_INCREMENTAL);
638
- rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRDDIM_INCREMENTAL);
639
- rrddim_add(st, "InParmProblems", NULL, 1, 1, RRDDIM_INCREMENTAL);
640
- rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRDDIM_INCREMENTAL);
641
- rrddim_add(st, "OutPktTooBigs", NULL, -1, 1, RRDDIM_INCREMENTAL);
642
- rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRDDIM_INCREMENTAL);
643
- rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRDDIM_INCREMENTAL);
632
+ rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
633
+ rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
634
+
635
+ rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
636
+ rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
637
+ rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
638
+ rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
639
+ rrddim_add(st, "InParmProblems", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
640
+ rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
641
+ rrddim_add(st, "OutPktTooBigs", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
642
+ rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
643
+ rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
644
}
645
else rrdset_next(st);
646
@@ -672,10 +672,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
672
if(unlikely(!st)) {
673
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
674
675
- rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_INCREMENTAL);
676
- rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_INCREMENTAL);
677
- rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRDDIM_INCREMENTAL);
678
- rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRDDIM_INCREMENTAL);
675
+ rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
676
+ rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
677
+ rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
678
+ rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
679
}
680
else rrdset_next(st);
681
@@ -702,12 +702,12 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
702
if(unlikely(!st)) {
703
st = rrdset_create(RRD_TYPE_NET_SNMP6, "groupmemb", NULL, "icmp", NULL, "IPv6 ICMP Group Membership", "messages/s", 10300, update_every, RRDSET_TYPE_LINE);
704
705
- rrddim_add(st, "InQueries", NULL, 1, 1, RRDDIM_INCREMENTAL);
706
- rrddim_add(st, "OutQueries", NULL, -1, 1, RRDDIM_INCREMENTAL);
707
- rrddim_add(st, "InResponses", NULL, 1, 1, RRDDIM_INCREMENTAL);
708
- rrddim_add(st, "OutResponses", NULL, -1, 1, RRDDIM_INCREMENTAL);
709
- rrddim_add(st, "InReductions", NULL, 1, 1, RRDDIM_INCREMENTAL);
710
- rrddim_add(st, "OutReductions", NULL, -1, 1, RRDDIM_INCREMENTAL);
705
+ rrddim_add(st, "InQueries", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
706
+ rrddim_add(st, "OutQueries", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
707
+ rrddim_add(st, "InResponses", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
708
+ rrddim_add(st, "OutResponses", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
709
+ rrddim_add(st, "InReductions", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
710
+ rrddim_add(st, "OutReductions", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
711
}
712
else rrdset_next(st);
713
@@ -734,10 +734,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
734
if(unlikely(!st)) {
735
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
736
737
- rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
738
- rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
739
- rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
740
- rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
737
+ rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
738
+ rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
739
+ rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
740
+ rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
741
}
742
else rrdset_next(st);
743
@@ -762,10 +762,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
762
if(unlikely(!st)) {
763
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
764
765
- rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
766
- rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
767
- rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
768
- rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
765
+ rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
766
+ rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
767
+ rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
768
+ rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
769
}
770
else rrdset_next(st);
771
@@ -784,8 +784,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
784
if(unlikely(!st)) {
785
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpmldv2", NULL, "icmp", NULL, "IPv6 ICMP MLDv2 Reports", "reports/s", 10600, update_every, RRDSET_TYPE_LINE);
786
787
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
788
- rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
787
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
788
+ rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
789
}
790
else rrdset_next(st);
791
@@ -814,16 +814,16 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
814
if(unlikely(!st)) {
815
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types", "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
816
817
- rrddim_add(st, "InType1", NULL, 1, 1, RRDDIM_INCREMENTAL);
818
- rrddim_add(st, "InType128", NULL, 1, 1, RRDDIM_INCREMENTAL);
819
- rrddim_add(st, "InType129", NULL, 1, 1, RRDDIM_INCREMENTAL);
820
- rrddim_add(st, "InType136", NULL, 1, 1, RRDDIM_INCREMENTAL);
821
- rrddim_add(st, "OutType1", NULL, -1, 1, RRDDIM_INCREMENTAL);
822
- rrddim_add(st, "OutType128", NULL, -1, 1, RRDDIM_INCREMENTAL);
823
- rrddim_add(st, "OutType129", NULL, -1, 1, RRDDIM_INCREMENTAL);
824
- rrddim_add(st, "OutType133", NULL, -1, 1, RRDDIM_INCREMENTAL);
825
- rrddim_add(st, "OutType135", NULL, -1, 1, RRDDIM_INCREMENTAL);
826
- rrddim_add(st, "OutType143", NULL, -1, 1, RRDDIM_INCREMENTAL);
817
+ rrddim_add(st, "InType1", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
818
+ rrddim_add(st, "InType128", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
819
+ rrddim_add(st, "InType129", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
820
+ rrddim_add(st, "InType136", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
821
+ rrddim_add(st, "OutType1", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
822
+ rrddim_add(st, "OutType128", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
823
+ rrddim_add(st, "OutType129", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
824
+ rrddim_add(st, "OutType133", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
825
+ rrddim_add(st, "OutType135", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
826
+ rrddim_add(st, "OutType143", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
827
}
828
else rrdset_next(st);
829
@@ -854,10 +854,10 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
854
if(unlikely(!st)) {
855
st = rrdset_create(RRD_TYPE_NET_SNMP6, "ect", NULL, "packets", NULL, "IPv6 ECT Packets", "packets/s", 10800, update_every, RRDSET_TYPE_LINE);
856
857
- rrddim_add(st, "InNoECTPkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
858
- rrddim_add(st, "InECT1Pkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
859
- rrddim_add(st, "InECT0Pkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
860
- rrddim_add(st, "InCEPkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
857
+ rrddim_add(st, "InNoECTPkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
858
+ rrddim_add(st, "InECT1Pkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
859
+ rrddim_add(st, "InECT0Pkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
860
+ rrddim_add(st, "InCEPkts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
861
}
862
else rrdset_next(st);
863
src/proc_net_softnet_stat.c
+2
-2
@@ -82,7 +82,7 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
82
st = rrdset_create("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat", "events/s", 955, update_every, RRDSET_TYPE_LINE);
83
for(w = 0; w < allocated_columns ;w++)
84
if(unlikely(softnet_column_name(w)))
85
- rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
85
+ rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
86
}
87
else rrdset_next(st);
88
@@ -105,7 +105,7 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
105
st = rrdset_create("cpu", id, NULL, "softnet_stat", NULL, title, "events/s", 4101 + l, update_every, RRDSET_TYPE_LINE);
106
for(w = 0; w < allocated_columns ;w++)
107
if(unlikely(softnet_column_name(w)))
108
- rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
108
+ rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
109
}
110
else rrdset_next(st);
111
src/proc_net_stat_conntrack.c
+17
-17
@@ -134,7 +134,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
134
if(unlikely(!st)) {
135
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_sockets", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Connections", "active connections", 3000, update_every, RRDSET_TYPE_LINE);
136
137
- rrddim_add(st, "connections", NULL, 1, 1, RRDDIM_ABSOLUTE);
137
+ rrddim_add(st, "connections", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
138
}
139
else rrdset_next(st);
140
@@ -149,9 +149,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
149
if(unlikely(!st)) {
150
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_new", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker New Connections", "connections/s", 3001, update_every, RRDSET_TYPE_LINE);
151
152
- rrddim_add(st, "new", NULL, 1, 1, RRDDIM_INCREMENTAL);
153
- rrddim_add(st, "ignore", NULL, -1, 1, RRDDIM_INCREMENTAL);
154
- rrddim_add(st, "invalid", NULL, -1, 1, RRDDIM_INCREMENTAL);
152
+ rrddim_add(st, "new", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
153
+ rrddim_add(st, "ignore", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
154
+ rrddim_add(st, "invalid", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
155
}
156
else rrdset_next(st);
157
@@ -169,9 +169,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
169
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_changes", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Changes", "changes/s", 3002, update_every, RRDSET_TYPE_LINE);
170
st->isdetail = 1;
171
172
- rrddim_add(st, "inserted", NULL, 1, 1, RRDDIM_INCREMENTAL);
173
- rrddim_add(st, "deleted", NULL, -1, 1, RRDDIM_INCREMENTAL);
174
- rrddim_add(st, "delete_list", NULL, -1, 1, RRDDIM_INCREMENTAL);
172
+ rrddim_add(st, "inserted", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
173
+ rrddim_add(st, "deleted", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
174
+ rrddim_add(st, "delete_list", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
175
}
176
else rrdset_next(st);
177
@@ -189,9 +189,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
189
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_expect", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Expectations", "expectations/s", 3003, update_every, RRDSET_TYPE_LINE);
190
st->isdetail = 1;
191
192
- rrddim_add(st, "created", NULL, 1, 1, RRDDIM_INCREMENTAL);
193
- rrddim_add(st, "deleted", NULL, -1, 1, RRDDIM_INCREMENTAL);
194
- rrddim_add(st, "new", NULL, 1, 1, RRDDIM_INCREMENTAL);
192
+ rrddim_add(st, "created", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
193
+ rrddim_add(st, "deleted", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
194
+ rrddim_add(st, "new", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
195
}
196
else rrdset_next(st);
197
@@ -209,9 +209,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
209
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_search", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Searches", "searches/s", 3010, update_every, RRDSET_TYPE_LINE);
210
st->isdetail = 1;
211
212
- rrddim_add(st, "searched", NULL, 1, 1, RRDDIM_INCREMENTAL);
213
- rrddim_add(st, "restarted", NULL, -1, 1, RRDDIM_INCREMENTAL);
214
- rrddim_add(st, "found", NULL, 1, 1, RRDDIM_INCREMENTAL);
212
+ rrddim_add(st, "searched", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
213
+ rrddim_add(st, "restarted", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
214
+ rrddim_add(st, "found", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
215
}
216
else rrdset_next(st);
217
@@ -229,10 +229,10 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
229
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_errors", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Errors", "events/s", 3005, update_every, RRDSET_TYPE_LINE);
230
st->isdetail = 1;
231
232
- rrddim_add(st, "icmp_error", NULL, 1, 1, RRDDIM_INCREMENTAL);
233
- rrddim_add(st, "insert_failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
234
- rrddim_add(st, "drop", NULL, -1, 1, RRDDIM_INCREMENTAL);
235
- rrddim_add(st, "early_drop", NULL, -1, 1, RRDDIM_INCREMENTAL);
232
+ rrddim_add(st, "icmp_error", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
233
+ rrddim_add(st, "insert_failed", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
234
+ rrddim_add(st, "drop", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
235
+ rrddim_add(st, "early_drop", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
236
}
237
else rrdset_next(st);
238
src/proc_net_stat_synproxy.c
+6
-6
@@ -64,7 +64,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
64
if(unlikely(!st)) {
65
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_entries", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Entries Used", "entries", 3304, update_every, RRDSET_TYPE_LINE);
66
67
- rrddim_add(st, "entries", NULL, 1, 1, RRDDIM_ABSOLUTE);
67
+ rrddim_add(st, "entries", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
68
}
69
else rrdset_next(st);
70
@@ -81,7 +81,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
81
if(unlikely(!st)) {
82
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_syn_received", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY SYN Packets received", "SYN/s", 3301, update_every, RRDSET_TYPE_LINE);
83
84
- rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
84
+ rrddim_add(st, "received", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
85
}
86
else rrdset_next(st);
87
@@ -98,7 +98,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
98
if(unlikely(!st)) {
99
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Connections Reopened", "connections/s", 3303, update_every, RRDSET_TYPE_LINE);
100
101
- rrddim_add(st, "reopened", NULL, 1, 1, RRDDIM_INCREMENTAL);
101
+ rrddim_add(st, "reopened", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
102
}
103
else rrdset_next(st);
104
@@ -115,9 +115,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
115
if(unlikely(!st)) {
116
st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_cookies", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY TCP Cookies", "cookies/s", 3302, update_every, RRDSET_TYPE_LINE);
117
118
- rrddim_add(st, "valid", NULL, 1, 1, RRDDIM_INCREMENTAL);
119
- rrddim_add(st, "invalid", NULL, -1, 1, RRDDIM_INCREMENTAL);
120
- rrddim_add(st, "retransmits", NULL, 1, 1, RRDDIM_INCREMENTAL);
118
+ rrddim_add(st, "valid", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
119
+ rrddim_add(st, "invalid", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
120
+ rrddim_add(st, "retransmits", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
121
}
122
else rrdset_next(st);
123
src/proc_softirqs.c
+2
-2
@@ -141,7 +141,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
141
if(unlikely(!irr->rd || strncmp(irr->name, irr->rd->name, MAX_INTERRUPT_NAME) != 0)) {
142
irr->rd = rrddim_find(st, irr->id);
143
if(unlikely(!irr->rd))
144
- irr->rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_INCREMENTAL);
144
+ irr->rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
145
else
146
rrddim_set_name(st, irr->rd, irr->name);
147
@@ -186,7 +186,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
186
if(unlikely(!irr->cpu[c].rd)) {
187
irr->cpu[c].rd = rrddim_find(st, irr->id);
188
if(unlikely(!irr->cpu[c].rd))
189
- irr->cpu[c].rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_INCREMENTAL);
189
+ irr->cpu[c].rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
190
else
191
rrddim_set_name(st, irr->cpu[c].rd, irr->name);
192
}
src/proc_stat.c
+16
-16
@@ -98,17 +98,17 @@ int do_proc_stat(int update_every, usec_t dt) {
98
long multiplier = 1;
99
long divisor = 1; // sysconf(_SC_CLK_TCK);
100
101
- rrddim_add(st, "guest_nice", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
102
- rrddim_add(st, "guest", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
103
- rrddim_add(st, "steal", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
104
- rrddim_add(st, "softirq", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
105
- rrddim_add(st, "irq", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
106
- rrddim_add(st, "user", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
107
- rrddim_add(st, "system", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
108
- rrddim_add(st, "nice", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
109
- rrddim_add(st, "iowait", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
110
-
111
- rrddim_add(st, "idle", NULL, multiplier, divisor, RRDDIM_PCENT_OVER_DIFF_TOTAL);
101
+ rrddim_add(st, "guest_nice", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
102
+ rrddim_add(st, "guest", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
103
+ rrddim_add(st, "steal", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
104
+ rrddim_add(st, "softirq", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
105
+ rrddim_add(st, "irq", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
106
+ rrddim_add(st, "user", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
107
+ rrddim_add(st, "system", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
108
+ rrddim_add(st, "nice", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
109
+ rrddim_add(st, "iowait", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
110
+
111
+ rrddim_add(st, "idle", NULL, multiplier, divisor, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
112
rrddim_hide(st, "idle");
113
}
114
else rrdset_next(st);
@@ -137,7 +137,7 @@ int do_proc_stat(int update_every, usec_t dt) {
137
st = rrdset_create("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
138
st->isdetail = 1;
139
140
- rrddim_add(st, "interrupts", NULL, 1, 1, RRDDIM_INCREMENTAL);
140
+ rrddim_add(st, "interrupts", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
141
}
142
else rrdset_next(st);
143
@@ -155,7 +155,7 @@ int do_proc_stat(int update_every, usec_t dt) {
155
if(unlikely(!st)) {
156
st = rrdset_create("system", "ctxt", NULL, "processes", NULL, "CPU Context Switches", "context switches/s", 800, update_every, RRDSET_TYPE_LINE);
157
158
- rrddim_add(st, "switches", NULL, 1, 1, RRDDIM_INCREMENTAL);
158
+ rrddim_add(st, "switches", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
159
}
160
else rrdset_next(st);
161
@@ -182,7 +182,7 @@ int do_proc_stat(int update_every, usec_t dt) {
182
st = rrdset_create("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
183
st->isdetail = 1;
184
185
- rrddim_add(st, "started", NULL, 1, 1, RRDDIM_INCREMENTAL);
185
+ rrddim_add(st, "started", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
186
}
187
else rrdset_next(st);
188
@@ -197,8 +197,8 @@ int do_proc_stat(int update_every, usec_t dt) {
197
if(unlikely(!st)) {
198
st = rrdset_create("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
199
200
- rrddim_add(st, "running", NULL, 1, 1, RRDDIM_ABSOLUTE);
201
- rrddim_add(st, "blocked", NULL, -1, 1, RRDDIM_ABSOLUTE);
200
+ rrddim_add(st, "running", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
201
+ rrddim_add(st, "blocked", NULL, -1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
202
}
203
else rrdset_next(st);
204
src/proc_sys_kernel_random_entropy_avail.c
+1
-1
@@ -20,7 +20,7 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
20
RRDSET *st = rrdset_find_bytype("system", "entropy");
21
if(unlikely(!st)) {
22
st = rrdset_create("system", "entropy", NULL, "entropy", NULL, "Available Entropy", "entropy", 1000, update_every, RRDSET_TYPE_LINE);
23
- rrddim_add(st, "entropy", NULL, 1, 1, RRDDIM_ABSOLUTE);
23
+ rrddim_add(st, "entropy", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
24
}
25
else rrdset_next(st);
26
src/proc_uptime.c
+1
-1
@@ -43,7 +43,7 @@ int do_proc_uptime(int update_every, usec_t dt) {
43
44
if(unlikely(!st)) {
45
st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
46
- rrddim_add(st, "uptime", NULL, 1, 1000, RRDDIM_ABSOLUTE);
46
+ rrddim_add(st, "uptime", NULL, 1, 1000, RRDDIM_ALGORITHM_ABSOLUTE);
47
}
48
else rrdset_next(st);
49
src/proc_vmstat.c
+15
-15
@@ -94,8 +94,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
94
if(unlikely(!st_swapio)) {
95
st_swapio = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
96
97
- rrddim_add(st_swapio, "in", NULL, sysconf(_SC_PAGESIZE), 1024, RRDDIM_INCREMENTAL);
98
- rrddim_add(st_swapio, "out", NULL, -sysconf(_SC_PAGESIZE), 1024, RRDDIM_INCREMENTAL);
97
+ rrddim_add(st_swapio, "in", NULL, sysconf(_SC_PAGESIZE), 1024, RRDDIM_ALGORITHM_INCREMENTAL);
98
+ rrddim_add(st_swapio, "out", NULL, -sysconf(_SC_PAGESIZE), 1024, RRDDIM_ALGORITHM_INCREMENTAL);
99
}
100
else rrdset_next(st_swapio);
101
@@ -111,8 +111,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
111
if(unlikely(!st_io)) {
112
st_io = rrdset_create("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
113
114
- rrddim_add(st_io, "in", NULL, 1, 1, RRDDIM_INCREMENTAL);
115
- rrddim_add(st_io, "out", NULL, -1, 1, RRDDIM_INCREMENTAL);
114
+ rrddim_add(st_io, "in", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
115
+ rrddim_add(st_io, "out", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
116
}
117
else rrdset_next(st_io);
118
@@ -129,8 +129,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
129
st_pgfaults = rrdset_create("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
130
st_pgfaults->isdetail = 1;
131
132
- rrddim_add(st_pgfaults, "minor", NULL, 1, 1, RRDDIM_INCREMENTAL);
133
- rrddim_add(st_pgfaults, "major", NULL, -1, 1, RRDDIM_INCREMENTAL);
132
+ rrddim_add(st_pgfaults, "minor", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
133
+ rrddim_add(st_pgfaults, "major", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
134
}
135
else rrdset_next(st_pgfaults);
136
@@ -158,18 +158,18 @@ int do_proc_vmstat(int update_every, usec_t dt) {
158
st_numa->isdetail = 1;
159
160
// These depend on CONFIG_NUMA in the kernel.
161
- rrddim_add(st_numa, "local", NULL, 1, 1, RRDDIM_INCREMENTAL);
162
- rrddim_add(st_numa, "foreign", NULL, 1, 1, RRDDIM_INCREMENTAL);
163
- rrddim_add(st_numa, "interleave", NULL, 1, 1, RRDDIM_INCREMENTAL);
164
- rrddim_add(st_numa, "other", NULL, 1, 1, RRDDIM_INCREMENTAL);
161
+ rrddim_add(st_numa, "local", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
162
+ rrddim_add(st_numa, "foreign", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
163
+ rrddim_add(st_numa, "interleave", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
164
+ rrddim_add(st_numa, "other", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
165
166
// The following stats depend on CONFIG_NUMA_BALANCING in the
167
// kernel.
168
- rrddim_add(st_numa, "pte updates", NULL, 1, 1, RRDDIM_INCREMENTAL);
169
- rrddim_add(st_numa, "huge pte updates", NULL, 1, 1, RRDDIM_INCREMENTAL);
170
- rrddim_add(st_numa, "hint faults", NULL, 1, 1, RRDDIM_INCREMENTAL);
171
- rrddim_add(st_numa, "hint faults local", NULL, 1, 1, RRDDIM_INCREMENTAL);
172
- rrddim_add(st_numa, "pages migrated", NULL, 1, 1, RRDDIM_INCREMENTAL);
168
+ rrddim_add(st_numa, "pte updates", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
169
+ rrddim_add(st_numa, "huge pte updates", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
170
+ rrddim_add(st_numa, "hint faults", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
171
+ rrddim_add(st_numa, "hint faults local", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
172
+ rrddim_add(st_numa, "pages migrated", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
173
}
174
else rrdset_next(st_numa);
175
src/registry.c
+11
-11
@@ -327,7 +327,7 @@ void registry_statistics(void) {
327
if(!sts) {
328
sts = rrdset_create("netdata", "registry_sessions", NULL, "registry", NULL, "NetData Registry Sessions", "session", 131000, rrd_update_every, RRDSET_TYPE_LINE);
329
330
- rrddim_add(sts, "sessions", NULL, 1, 1, RRDDIM_ABSOLUTE);
330
+ rrddim_add(sts, "sessions", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
331
}
332
else rrdset_next(sts);
333
@@ -340,11 +340,11 @@ void registry_statistics(void) {
340
if(!stc) {
341
stc = rrdset_create("netdata", "registry_entries", NULL, "registry", NULL, "NetData Registry Entries", "entries", 131100, rrd_update_every, RRDSET_TYPE_LINE);
342
343
- rrddim_add(stc, "persons", NULL, 1, 1, RRDDIM_ABSOLUTE);
344
- rrddim_add(stc, "machines", NULL, 1, 1, RRDDIM_ABSOLUTE);
345
- rrddim_add(stc, "urls", NULL, 1, 1, RRDDIM_ABSOLUTE);
346
- rrddim_add(stc, "persons_urls", NULL, 1, 1, RRDDIM_ABSOLUTE);
347
- rrddim_add(stc, "machines_urls", NULL, 1, 1, RRDDIM_ABSOLUTE);
343
+ rrddim_add(stc, "persons", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
344
+ rrddim_add(stc, "machines", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
345
+ rrddim_add(stc, "urls", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
346
+ rrddim_add(stc, "persons_urls", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
347
+ rrddim_add(stc, "machines_urls", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
348
}
349
else rrdset_next(stc);
350
@@ -361,11 +361,11 @@ void registry_statistics(void) {
361
if(!stm) {
362
stm = rrdset_create("netdata", "registry_mem", NULL, "registry", NULL, "NetData Registry Memory", "KB", 131300, rrd_update_every, RRDSET_TYPE_STACKED);
363
364
- rrddim_add(stm, "persons", NULL, 1, 1024, RRDDIM_ABSOLUTE);
365
- rrddim_add(stm, "machines", NULL, 1, 1024, RRDDIM_ABSOLUTE);
366
- rrddim_add(stm, "urls", NULL, 1, 1024, RRDDIM_ABSOLUTE);
367
- rrddim_add(stm, "persons_urls", NULL, 1, 1024, RRDDIM_ABSOLUTE);
368
- rrddim_add(stm, "machines_urls", NULL, 1, 1024, RRDDIM_ABSOLUTE);
364
+ rrddim_add(stm, "persons", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
365
+ rrddim_add(stm, "machines", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
366
+ rrddim_add(stm, "urls", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
367
+ rrddim_add(stm, "persons_urls", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
368
+ rrddim_add(stm, "machines_urls", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
369
}
370
else rrdset_next(stm);
371
src/rrd.c
+164
-154
@@ -14,7 +14,7 @@ int rrd_delete_unupdated_dimensions = 0;
14
15
int rrd_update_every = UPDATE_EVERY;
16
int rrd_default_history_entries = RRD_DEFAULT_HISTORY_ENTRIES;
17
-int rrd_memory_mode = RRD_MEMORY_MODE_SAVE;
17
+RRD_MEMORY_MODE rrd_memory_mode = RRD_MEMORY_MODE_SAVE;
18
19
static int rrdset_compare(void* a, void* b);
20
static int rrdset_compare_name(void* a, void* b);
@@ -226,65 +226,56 @@ static int rrddim_compare(void* a, void* b) {
226
#define rrddim_index_del(st,rd ) (RRDDIM *)avl_remove_lock(&((st)->dimensions_index), (avl *)(rd))
227
228
static RRDDIM *rrddim_index_find(RRDSET *st, const char *id, uint32_t hash) {
229
- RRDDIM tmp;
230
- strncpyz(tmp.id, id, RRD_ID_LENGTH_MAX);
231
- tmp.hash = (hash)?hash:simple_hash(tmp.id);
232
-
229
+ RRDDIM tmp = {
230
+ .id = id,
231
+ .hash = (hash)?hash:simple_hash(id)
232
+ };
233
return (RRDDIM *)avl_search_lock(&(st->dimensions_index), (avl *) &tmp);
234
}
235
236
// ----------------------------------------------------------------------------
237
// chart types
238
239
-int rrdset_type_id(const char *name)
240
-{
241
- if(unlikely(strcmp(name, RRDSET_TYPE_AREA_NAME) == 0)) return RRDSET_TYPE_AREA;
242
- else if(unlikely(strcmp(name, RRDSET_TYPE_STACKED_NAME) == 0)) return RRDSET_TYPE_STACKED;
243
- else if(unlikely(strcmp(name, RRDSET_TYPE_LINE_NAME) == 0)) return RRDSET_TYPE_LINE;
244
- return RRDSET_TYPE_LINE;
245
-}
239
+inline RRDSET_TYPE rrdset_type_id(const char *name) {
240
+ if(unlikely(strcmp(name, RRDSET_TYPE_AREA_NAME) == 0))
241
+ return RRDSET_TYPE_AREA;
242
247
-const char *rrdset_type_name(int chart_type)
248
-{
249
- static char line[] = RRDSET_TYPE_LINE_NAME;
250
- static char area[] = RRDSET_TYPE_AREA_NAME;
251
- static char stacked[] = RRDSET_TYPE_STACKED_NAME;
243
+ else if(unlikely(strcmp(name, RRDSET_TYPE_STACKED_NAME) == 0))
244
+ return RRDSET_TYPE_STACKED;
245
+
246
+ else // if(unlikely(strcmp(name, RRDSET_TYPE_LINE_NAME) == 0))
247
+ return RRDSET_TYPE_LINE;
248
+}
249
250
+const char *rrdset_type_name(RRDSET_TYPE chart_type) {
251
switch(chart_type) {
252
case RRDSET_TYPE_LINE:
255
- return line;
253
+ default:
254
+ return RRDSET_TYPE_LINE_NAME;
255
256
case RRDSET_TYPE_AREA:
258
- return area;
257
+ return RRDSET_TYPE_AREA_NAME;
258
259
case RRDSET_TYPE_STACKED:
261
- return stacked;
260
+ return RRDSET_TYPE_STACKED_NAME;
261
}
263
- return line;
262
}
263
264
// ----------------------------------------------------------------------------
265
// load / save
266
269
-const char *rrd_memory_mode_name(int id)
270
-{
271
- static const char ram[] = RRD_MEMORY_MODE_RAM_NAME;
272
- static const char map[] = RRD_MEMORY_MODE_MAP_NAME;
273
- static const char save[] = RRD_MEMORY_MODE_SAVE_NAME;
274
-
267
+inline const char *rrd_memory_mode_name(RRD_MEMORY_MODE id) {
268
switch(id) {
269
case RRD_MEMORY_MODE_RAM:
277
- return ram;
270
+ return RRD_MEMORY_MODE_RAM_NAME;
271
272
case RRD_MEMORY_MODE_MAP:
280
- return map;
273
+ return RRD_MEMORY_MODE_MAP_NAME;
274
275
case RRD_MEMORY_MODE_SAVE:
276
default:
284
- return save;
277
+ return RRD_MEMORY_MODE_SAVE_NAME;
278
}
286
-
287
- return save;
279
}
280
281
int rrd_memory_mode_id(const char *name)
@@ -300,36 +291,40 @@ int rrd_memory_mode_id(const char *name)
291
// ----------------------------------------------------------------------------
292
// algorithms types
293
303
-int rrddim_algorithm_id(const char *name)
294
+RRDDIM_ALGORITHM rrddim_algorithm_id(const char *name)
295
{
305
- if(strcmp(name, RRDDIM_INCREMENTAL_NAME) == 0) return RRDDIM_INCREMENTAL;
306
- if(strcmp(name, RRDDIM_ABSOLUTE_NAME) == 0) return RRDDIM_ABSOLUTE;
307
- if(strcmp(name, RRDDIM_PCENT_OVER_ROW_TOTAL_NAME) == 0) return RRDDIM_PCENT_OVER_ROW_TOTAL;
308
- if(strcmp(name, RRDDIM_PCENT_OVER_DIFF_TOTAL_NAME) == 0) return RRDDIM_PCENT_OVER_DIFF_TOTAL;
309
- return RRDDIM_ABSOLUTE;
296
+ if(strcmp(name, RRDDIM_ALGORITHM_INCREMENTAL_NAME) == 0)
297
+ return RRDDIM_ALGORITHM_INCREMENTAL;
298
+
299
+ else if(strcmp(name, RRDDIM_ALGORITHM_ABSOLUTE_NAME) == 0)
300
+ return RRDDIM_ALGORITHM_ABSOLUTE;
301
+
302
+ else if(strcmp(name, RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL_NAME) == 0)
303
+ return RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL;
304
+
305
+ else if(strcmp(name, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL_NAME) == 0)
306
+ return RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL;
307
+
308
+ else
309
+ return RRDDIM_ALGORITHM_ABSOLUTE;
310
}
311
312
-const char *rrddim_algorithm_name(int chart_type)
312
+const char *rrddim_algorithm_name(RRDDIM_ALGORITHM algorithm)
313
{
314
- static char absolute[] = RRDDIM_ABSOLUTE_NAME;
315
- static char incremental[] = RRDDIM_INCREMENTAL_NAME;
316
- static char percentage_of_absolute_row[] = RRDDIM_PCENT_OVER_ROW_TOTAL_NAME;
317
- static char percentage_of_incremental_row[] = RRDDIM_PCENT_OVER_DIFF_TOTAL_NAME;
318
-
319
- switch(chart_type) {
320
- case RRDDIM_ABSOLUTE:
321
- return absolute;
314
+ switch(algorithm) {
315
+ case RRDDIM_ALGORITHM_ABSOLUTE:
316
+ default:
317
+ return RRDDIM_ALGORITHM_ABSOLUTE_NAME;
318
323
- case RRDDIM_INCREMENTAL:
324
- return incremental;
319
+ case RRDDIM_ALGORITHM_INCREMENTAL:
320
+ return RRDDIM_ALGORITHM_INCREMENTAL_NAME;
321
326
- case RRDDIM_PCENT_OVER_ROW_TOTAL:
327
- return percentage_of_absolute_row;
322
+ case RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL:
323
+ return RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL_NAME;
324
329
- case RRDDIM_PCENT_OVER_DIFF_TOTAL:
330
- return percentage_of_incremental_row;
325
+ case RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
326
+ return RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL_NAME;
327
}
332
- return absolute;
328
}
329
330
// ----------------------------------------------------------------------------
@@ -638,7 +633,7 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
633
return(st);
634
}
635
641
-RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier, long divisor, int algorithm)
636
+RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, collected_number multiplier, collected_number divisor, RRDDIM_ALGORITHM algorithm)
637
{
638
RRDDIM *rd = rrddim_find(st, id);
639
if(rd) {
@@ -657,79 +652,80 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
652
rrdset_strncpyz_name(filename, id, FILENAME_MAX);
653
snprintfz(fullfilename, FILENAME_MAX, "%s/%s.db", st->cache_dir, filename);
654
660
- if(rrd_memory_mode != RRD_MEMORY_MODE_RAM)
661
- rd = (RRDDIM *)mymmap(fullfilename, size, ((rrd_memory_mode == RRD_MEMORY_MODE_MAP)?MAP_SHARED:MAP_PRIVATE), 1);
662
-
663
- if(rd) {
664
- struct timeval now;
665
- now_realtime_timeval(&now);
655
+ if(rrd_memory_mode != RRD_MEMORY_MODE_RAM) {
656
+ rd = (RRDDIM *) mymmap(fullfilename, size, ((rrd_memory_mode == RRD_MEMORY_MODE_MAP) ? MAP_SHARED : MAP_PRIVATE), 1);
657
+ if(rd) {
658
+ // we have a file mapped for rd
659
+
660
+ rd->id = NULL;
661
+ rd->name = NULL;
662
+ rd->cache_filename = NULL;
663
+ rd->memory_mode = rrd_memory_mode;
664
+ rd->flags = 0x00000000;
665
+ rd->variables = NULL;
666
+ rd->next = NULL;
667
+ rd->rrdset = NULL;
668
+ memset(&rd->avl, 0, sizeof(avl));
669
+
670
+ struct timeval now;
671
+ now_realtime_timeval(&now);
672
+
673
+ if(strcmp(rd->magic, RRDDIMENSION_MAGIC) != 0) {
674
+ errno = 0;
675
+ info("Initializing file %s.", fullfilename);
676
+ memset(rd, 0, size);
677
+ }
678
+ else if(rd->memsize != size) {
679
+ errno = 0;
680
+ error("File %s does not have the desired size. Clearing it.", fullfilename);
681
+ memset(rd, 0, size);
682
+ }
683
+ else if(rd->multiplier != multiplier) {
684
+ errno = 0;
685
+ error("File %s does not have the same multiplier. Clearing it.", fullfilename);
686
+ memset(rd, 0, size);
687
+ }
688
+ else if(rd->divisor != divisor) {
689
+ errno = 0;
690
+ error("File %s does not have the same divisor. Clearing it.", fullfilename);
691
+ memset(rd, 0, size);
692
+ }
693
+ else if(rd->update_every != st->update_every) {
694
+ errno = 0;
695
+ error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);
696
+ memset(rd, 0, size);
697
+ }
698
+ else if(dt_usec(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * USEC_PER_SEC)) {
699
+ errno = 0;
700
+ error("File %s is too old. Clearing it.", fullfilename);
701
+ memset(rd, 0, size);
702
+ }
703
667
- if(strcmp(rd->magic, RRDDIMENSION_MAGIC) != 0) {
668
- errno = 0;
669
- info("Initializing file %s.", fullfilename);
670
- memset(rd, 0, size);
671
- }
672
- else if(rd->memsize != size) {
673
- errno = 0;
674
- error("File %s does not have the desired size. Clearing it.", fullfilename);
675
- memset(rd, 0, size);
676
- }
677
- else if(rd->multiplier != multiplier) {
678
- errno = 0;
679
- error("File %s does not have the same multiplier. Clearing it.", fullfilename);
680
- memset(rd, 0, size);
681
- }
682
- else if(rd->divisor != divisor) {
683
- errno = 0;
684
- error("File %s does not have the same divisor. Clearing it.", fullfilename);
685
- memset(rd, 0, size);
686
- }
687
- else if(rd->update_every != st->update_every) {
688
- errno = 0;
689
- error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);
690
- memset(rd, 0, size);
704
+ if(rd->algorithm && rd->algorithm != algorithm)
705
+ error("File %s does not have the expected algorithm (expected %u '%s', found %u '%s'). Previous values may be wrong."
706
+ , fullfilename, algorithm, rrddim_algorithm_name(algorithm), rd->algorithm,
707
+ rrddim_algorithm_name(rd->algorithm));
708
}
692
- else if(dt_usec(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * USEC_PER_SEC)) {
693
- errno = 0;
694
- error("File %s is too old. Clearing it.", fullfilename);
695
- memset(rd, 0, size);
696
- }
697
- else if(strcmp(rd->id, id) != 0) {
698
- errno = 0;
699
- error("File %s contents are not for dimension %s. Clearing it.", fullfilename, id);
700
- // munmap(rd, size);
701
- // rd = NULL;
702
- memset(rd, 0, size);
703
- }
704
-
705
- if(rd->algorithm && rd->algorithm != algorithm)
706
- error("File %s does not have the expected algorithm (expected %d '%s', found %d '%s'). Previous values may be wrong.", fullfilename, algorithm, rrddim_algorithm_name(algorithm), rd->algorithm, rrddim_algorithm_name(rd->algorithm));
709
}
710
709
- if(rd) {
710
- // we have a file mapped for rd
711
- rd->mapped = rrd_memory_mode;
712
- rd->flags = 0x00000000;
713
- rd->variables = NULL;
714
- rd->next = NULL;
715
- rd->name = NULL;
716
- memset(&rd->avl, 0, sizeof(avl));
717
- }
718
- else {
711
+ if(unlikely(!rd)) {
712
// if we didn't manage to get a mmap'd dimension, just create one
720
-
713
rd = callocz(1, size);
722
- rd->mapped = RRD_MEMORY_MODE_RAM;
714
+ rd->memory_mode = RRD_MEMORY_MODE_RAM;
715
}
716
+
717
rd->memsize = size;
718
719
strcpy(rd->magic, RRDDIMENSION_MAGIC);
727
- strcpy(rd->cache_filename, fullfilename);
728
- strncpyz(rd->id, id, RRD_ID_LENGTH_MAX);
720
+
721
+ rd->id = strdupz(id);
722
rd->hash = simple_hash(rd->id);
723
724
+ rd->cache_filename = strdupz(fullfilename);
725
+
726
snprintfz(varname, CONFIG_MAX_NAME, "dim %s name", rd->id);
727
rd->name = config_get(st->id, varname, (name && *name)?name:rd->id);
728
+ rd->hash_name = simple_hash(rd->name);
729
730
snprintfz(varname, CONFIG_MAX_NAME, "dim %s algorithm", rd->id);
731
rd->algorithm = rrddim_algorithm_id(config_get(st->id, varname, rrddim_algorithm_name(algorithm)));
@@ -746,7 +742,7 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
742
743
// prevent incremental calculation spikes
744
rd->counter = 0;
749
- rd->updated = 0;
745
+ rrddim_flag_clear(rd, RRDDIM_FLAG_UPDATED);
746
rd->calculated_value = 0;
747
rd->last_calculated_value = 0;
748
rd->collected_value = 0;
@@ -785,7 +781,7 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
781
782
void rrddim_set_name(RRDSET *st, RRDDIM *rd, const char *name)
783
{
788
- if(unlikely(rd->name && !strcmp(rd->name, name)))
784
+ if(unlikely(!strcmp(rd->name, name)))
785
return;
786
787
debug(D_RRD_CALLS, "rrddim_set_name() from %s.%s to %s.%s", st->name, rd->name, st->name, name);
@@ -793,6 +789,7 @@ void rrddim_set_name(RRDSET *st, RRDDIM *rd, const char *name)
789
char varname[CONFIG_MAX_NAME + 1];
790
snprintfz(varname, CONFIG_MAX_NAME, "dim %s name", rd->id);
791
rd->name = config_set_default(st->id, varname, name);
792
+ rd->hash_name = simple_hash(rd->name);
793
794
rrddimvar_rename_all(rd);
795
}
@@ -821,20 +818,26 @@ void rrddim_free(RRDSET *st, RRDDIM *rd)
818
error("RRDDIM: INTERNAL ERROR: attempt to remove from index dimension '%s' on chart '%s', removed a different dimension.", rd->id, st->id);
819
820
// free(rd->annotations);
824
- if(rd->mapped == RRD_MEMORY_MODE_SAVE) {
825
- debug(D_RRD_CALLS, "Saving dimension '%s' to '%s'.", rd->name, rd->cache_filename);
826
- savememory(rd->cache_filename, rd, rd->memsize);
821
828
- debug(D_RRD_CALLS, "Unmapping dimension '%s'.", rd->name);
829
- munmap(rd, rd->memsize);
830
- }
831
- else if(rd->mapped == RRD_MEMORY_MODE_MAP) {
832
- debug(D_RRD_CALLS, "Unmapping dimension '%s'.", rd->name);
833
- munmap(rd, rd->memsize);
834
- }
835
- else {
836
- debug(D_RRD_CALLS, "Removing dimension '%s'.", rd->name);
837
- freez(rd);
822
+ switch(rd->memory_mode) {
823
+ case RRD_MEMORY_MODE_SAVE:
824
+ debug(D_RRD_CALLS, "Saving dimension '%s' to '%s'.", rd->name, rd->cache_filename);
825
+ savememory(rd->cache_filename, rd, rd->memsize);
826
+ // continue to map mode - no break;
827
+
828
+ case RRD_MEMORY_MODE_MAP:
829
+ debug(D_RRD_CALLS, "Unmapping dimension '%s'.", rd->name);
830
+ freez((void *)rd->id);
831
+ freez(rd->cache_filename);
832
+ munmap(rd, rd->memsize);
833
+ break;
834
+
835
+ case RRD_MEMORY_MODE_RAM:
836
+ debug(D_RRD_CALLS, "Removing dimension '%s'.", rd->name);
837
+ freez((void *)rd->id);
838
+ freez(rd->cache_filename);
839
+ freez(rd);
840
+ break;
841
}
842
}
843
@@ -905,7 +908,7 @@ void rrdset_save_all(void) {
908
}
909
910
for(rd = st->dimensions; rd ; rd = rd->next) {
908
- if(likely(rd->mapped == RRD_MEMORY_MODE_SAVE)) {
911
+ if(likely(rd->memory_mode == RRD_MEMORY_MODE_SAVE)) {
912
debug(D_RRD_CALLS, "Saving dimension '%s' to '%s'.", rd->name, rd->cache_filename);
913
savememory(rd->cache_filename, rd, rd->memsize);
914
}
@@ -965,12 +968,11 @@ int rrddim_hide(RRDSET *st, const char *id)
968
return 1;
969
}
970
968
- rd->flags |= RRDDIM_FLAG_HIDDEN;
971
+ rrddim_flag_set(rd, RRDDIM_FLAG_HIDDEN);
972
return 0;
973
}
974
972
-int rrddim_unhide(RRDSET *st, const char *id)
973
-{
975
+int rrddim_unhide(RRDSET *st, const char *id) {
976
debug(D_RRD_CALLS, "rrddim_unhide() for chart %s, dimension %s", st->name, id);
977
978
RRDDIM *rd = rrddim_find(st, id);
@@ -979,7 +981,7 @@ int rrddim_unhide(RRDSET *st, const char *id)
981
return 1;
982
}
983
982
- if(rd->flags & RRDDIM_FLAG_HIDDEN) rd->flags ^= RRDDIM_FLAG_HIDDEN;
984
+ rrddim_flag_clear(rd, RRDDIM_FLAG_HIDDEN);
985
return 0;
986
}
987
@@ -989,7 +991,7 @@ collected_number rrddim_set_by_pointer(RRDSET *st, RRDDIM *rd, collected_number
991
992
now_realtime_timeval(&rd->last_collected_time);
993
rd->collected_value = value;
992
- rd->updated = 1;
994
+ rrddim_flag_set(rd, RRDDIM_FLAG_UPDATED);
995
rd->counter++;
996
997
// fprintf(stderr, "%s.%s %llu " COLLECTED_NUMBER_FORMAT " dt %0.6f" " rate " CALCULATED_NUMBER_FORMAT "\n", st->name, rd->name, st->usec_since_last_update, value, (float)((double)st->usec_since_last_update / (double)1000000), (calculated_number)((value - rd->last_collected_value) * (calculated_number)rd->multiplier / (calculated_number)rd->divisor * 1000000.0 / (calculated_number)st->usec_since_last_update));
@@ -1194,7 +1196,8 @@ usec_t rrdset_done(RRDSET *st)
1196
int dimensions;
1197
st->collected_total = 0;
1198
for( rd = st->dimensions, dimensions = 0 ; rd ; rd = rd->next, dimensions++ )
1197
- if(likely(rd->updated)) st->collected_total += rd->collected_value;
1199
+ if(likely(rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED)))
1200
+ st->collected_total += rd->collected_value;
1201
1202
uint32_t storage_flags = SN_EXISTS;
1203
@@ -1203,7 +1206,7 @@ usec_t rrdset_done(RRDSET *st)
1206
// at this stage we do not interpolate anything
1207
for( rd = st->dimensions ; rd ; rd = rd->next ) {
1208
1206
- if(unlikely(!rd->updated)) {
1209
+ if(unlikely(!rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED))) {
1210
rd->calculated_value = 0;
1211
continue;
1212
}
@@ -1221,7 +1224,7 @@ usec_t rrdset_done(RRDSET *st)
1224
);
1225
1226
switch(rd->algorithm) {
1224
- case RRDDIM_ABSOLUTE:
1227
+ case RRDDIM_ALGORITHM_ABSOLUTE:
1228
rd->calculated_value = (calculated_number)rd->collected_value
1229
* (calculated_number)rd->multiplier
1230
/ (calculated_number)rd->divisor;
@@ -1240,7 +1243,7 @@ usec_t rrdset_done(RRDSET *st)
1243
);
1244
break;
1245
1243
- case RRDDIM_PCENT_OVER_ROW_TOTAL:
1246
+ case RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL:
1247
if(unlikely(!st->collected_total))
1248
rd->calculated_value = 0;
1249
else
@@ -1263,7 +1266,7 @@ usec_t rrdset_done(RRDSET *st)
1266
);
1267
break;
1268
1266
- case RRDDIM_INCREMENTAL:
1269
+ case RRDDIM_ALGORITHM_INCREMENTAL:
1270
if(unlikely(rd->counter <= 1)) {
1271
rd->calculated_value = 0;
1272
continue;
@@ -1276,7 +1279,10 @@ usec_t rrdset_done(RRDSET *st)
1279
, st->name, rd->name
1280
, rd->last_collected_value
1281
, rd->collected_value);
1279
- if(!(rd->flags & RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)) storage_flags = SN_EXISTS_RESET;
1282
+
1283
+ if(!(rrddim_flag_check(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)))
1284
+ storage_flags = SN_EXISTS_RESET;
1285
+
1286
rd->last_collected_value = rd->collected_value;
1287
}
1288
@@ -1300,7 +1306,7 @@ usec_t rrdset_done(RRDSET *st)
1306
);
1307
break;
1308
1303
- case RRDDIM_PCENT_OVER_DIFF_TOTAL:
1309
+ case RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
1310
if(unlikely(rd->counter <= 1)) {
1311
rd->calculated_value = 0;
1312
continue;
@@ -1313,7 +1319,10 @@ usec_t rrdset_done(RRDSET *st)
1319
, st->name, rd->name
1320
, rd->last_collected_value
1321
, rd->collected_value);
1316
- if(!(rd->flags & RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)) storage_flags = SN_EXISTS_RESET;
1322
+
1323
+ if(!(rrddim_flag_check(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS)))
1324
+ storage_flags = SN_EXISTS_RESET;
1325
+
1326
rd->last_collected_value = rd->collected_value;
1327
}
1328
@@ -1399,7 +1408,7 @@ usec_t rrdset_done(RRDSET *st)
1408
calculated_number new_value;
1409
1410
switch(rd->algorithm) {
1402
- case RRDDIM_INCREMENTAL:
1411
+ case RRDDIM_ALGORITHM_INCREMENTAL:
1412
new_value = (calculated_number)
1413
( rd->calculated_value
1414
* (calculated_number)(next_store_ut - last_collect_ut)
@@ -1434,9 +1443,9 @@ usec_t rrdset_done(RRDSET *st)
1443
}
1444
break;
1445
1437
- case RRDDIM_ABSOLUTE:
1438
- case RRDDIM_PCENT_OVER_ROW_TOTAL:
1439
- case RRDDIM_PCENT_OVER_DIFF_TOTAL:
1446
+ case RRDDIM_ALGORITHM_ABSOLUTE:
1447
+ case RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL:
1448
+ case RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
1449
default:
1450
if(iterations == 1) {
1451
// this is the last iteration
@@ -1478,7 +1487,7 @@ usec_t rrdset_done(RRDSET *st)
1487
continue;
1488
}
1489
1481
- if(likely(rd->updated && rd->counter > 1 && iterations < st->gap_when_lost_iterations_above)) {
1490
+ if(likely(rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED) && rd->counter > 1 && iterations < st->gap_when_lost_iterations_above)) {
1491
rd->values[st->current_entry] = pack_storage_number(new_value, storage_flags );
1492
rd->last_stored_value = new_value;
1493
@@ -1540,13 +1549,14 @@ usec_t rrdset_done(RRDSET *st)
1549
st->last_collected_total = st->collected_total;
1550
1551
for( rd = st->dimensions; rd ; rd = rd->next ) {
1543
- if(unlikely(!rd->updated)) continue;
1552
+ if(unlikely(!rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED)))
1553
+ continue;
1554
1555
if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_collected_value (old: " COLLECTED_NUMBER_FORMAT ") to last_collected_value (new: " COLLECTED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_collected_value, rd->collected_value);
1556
rd->last_collected_value = rd->collected_value;
1557
1558
switch(rd->algorithm) {
1549
- case RRDDIM_INCREMENTAL:
1559
+ case RRDDIM_ALGORITHM_INCREMENTAL:
1560
if(unlikely(!first_entry)) {
1561
if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value + rd->calculated_value, rd->calculated_value);
1562
rd->last_calculated_value += rd->calculated_value;
@@ -1556,9 +1566,9 @@ usec_t rrdset_done(RRDSET *st)
1566
}
1567
break;
1568
1559
- case RRDDIM_ABSOLUTE:
1560
- case RRDDIM_PCENT_OVER_ROW_TOTAL:
1561
- case RRDDIM_PCENT_OVER_DIFF_TOTAL:
1569
+ case RRDDIM_ALGORITHM_ABSOLUTE:
1570
+ case RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL:
1571
+ case RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
1572
if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value, rd->calculated_value);
1573
rd->last_calculated_value = rd->calculated_value;
1574
break;
@@ -1566,7 +1576,7 @@ usec_t rrdset_done(RRDSET *st)
1576
1577
rd->calculated_value = 0;
1578
rd->collected_value = 0;
1569
- rd->updated = 0;
1579
+ rrddim_flag_clear(rd, RRDDIM_FLAG_UPDATED);
1580
1581
if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: END "
1582
" last_collected_value = " COLLECTED_NUMBER_FORMAT
src/rrd.h
+59
-53
@@ -9,14 +9,10 @@ extern int rrd_update_every;
9
#define RRD_HISTORY_ENTRIES_MAX (86400*10)
10
extern int rrd_default_history_entries;
11
12
-// time in seconds to delete unupdated dimensions
13
-// set to zero to disable this feature
14
-extern int rrd_delete_unupdated_dimensions;
12
+#define RRD_ID_LENGTH_MAX 200
13
16
-#define RRD_ID_LENGTH_MAX 400
17
-
18
-#define RRDSET_MAGIC "NETDATA RRD SET FILE V018"
19
-#define RRDDIMENSION_MAGIC "NETDATA RRD DIMENSION FILE V018"
14
+#define RRDSET_MAGIC "NETDATA RRD SET FILE V019"
15
+#define RRDDIMENSION_MAGIC "NETDATA RRD DIMENSION FILE V019"
16
17
typedef long long total_number;
18
#define TOTAL_NUMBER_FORMAT "%lld"
@@ -24,59 +20,73 @@ typedef long long total_number;
20
// ----------------------------------------------------------------------------
21
// chart types
22
23
+typedef enum rrdset_type {
24
+ RRDSET_TYPE_LINE = 0,
25
+ RRDSET_TYPE_AREA = 1,
26
+ RRDSET_TYPE_STACKED = 2
27
+} RRDSET_TYPE;
28
+
29
#define RRDSET_TYPE_LINE_NAME "line"
30
#define RRDSET_TYPE_AREA_NAME "area"
31
#define RRDSET_TYPE_STACKED_NAME "stacked"
32
31
-#define RRDSET_TYPE_LINE 0
32
-#define RRDSET_TYPE_AREA 1
33
-#define RRDSET_TYPE_STACKED 2
34
-
35
-int rrdset_type_id(const char *name);
36
-const char *rrdset_type_name(int chart_type);
33
+RRDSET_TYPE rrdset_type_id(const char *name);
34
+const char *rrdset_type_name(RRDSET_TYPE chart_type);
35
36
37
// ----------------------------------------------------------------------------
38
// memory mode
39
40
+typedef enum rrd_memory_mode {
41
+ RRD_MEMORY_MODE_RAM = 0,
42
+ RRD_MEMORY_MODE_MAP = 1,
43
+ RRD_MEMORY_MODE_SAVE = 2
44
+} RRD_MEMORY_MODE;
45
+
46
#define RRD_MEMORY_MODE_RAM_NAME "ram"
47
#define RRD_MEMORY_MODE_MAP_NAME "map"
48
#define RRD_MEMORY_MODE_SAVE_NAME "save"
49
46
-#define RRD_MEMORY_MODE_RAM 0
47
-#define RRD_MEMORY_MODE_MAP 1
48
-#define RRD_MEMORY_MODE_SAVE 2
49
-
50
-extern int rrd_memory_mode;
50
+RRD_MEMORY_MODE rrd_memory_mode;
51
52
-extern const char *rrd_memory_mode_name(int id);
52
+extern const char *rrd_memory_mode_name(RRD_MEMORY_MODE id);
53
extern int rrd_memory_mode_id(const char *name);
54
55
56
// ----------------------------------------------------------------------------
57
// algorithms types
58
59
-#define RRDDIM_ABSOLUTE_NAME "absolute"
60
-#define RRDDIM_INCREMENTAL_NAME "incremental"
61
-#define RRDDIM_PCENT_OVER_DIFF_TOTAL_NAME "percentage-of-incremental-row"
62
-#define RRDDIM_PCENT_OVER_ROW_TOTAL_NAME "percentage-of-absolute-row"
59
+typedef enum rrddim_algorithm {
60
+ RRDDIM_ALGORITHM_ABSOLUTE = 0,
61
+ RRDDIM_ALGORITHM_INCREMENTAL = 1,
62
+ RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL = 2,
63
+ RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL = 3
64
+} RRDDIM_ALGORITHM;
65
64
-#define RRDDIM_ABSOLUTE 0
65
-#define RRDDIM_INCREMENTAL 1
66
-#define RRDDIM_PCENT_OVER_DIFF_TOTAL 2
67
-#define RRDDIM_PCENT_OVER_ROW_TOTAL 3
66
+#define RRDDIM_ALGORITHM_ABSOLUTE_NAME "absolute"
67
+#define RRDDIM_ALGORITHM_INCREMENTAL_NAME "incremental"
68
+#define RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL_NAME "percentage-of-incremental-row"
69
+#define RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL_NAME "percentage-of-absolute-row"
70
69
-extern int rrddim_algorithm_id(const char *name);
70
-extern const char *rrddim_algorithm_name(int chart_type);
71
+extern RRDDIM_ALGORITHM rrddim_algorithm_id(const char *name);
72
+extern const char *rrddim_algorithm_name(RRDDIM_ALGORITHM algorithm);
73
74
// ----------------------------------------------------------------------------
75
// flags
76
75
-#define RRDDIM_FLAG_HIDDEN 0x00000001 // this dimension will not be offered to callers
76
-#define RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS 0x00000002 // do not offer RESET or OVERFLOW info to callers
77
+typedef enum rrddim_flags {
78
+ RRDDIM_FLAG_HIDDEN = 1 << 0, // this dimension will not be offered to callers
79
+ RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS = 1 << 1, // do not offer RESET or OVERFLOW info to callers
80
+ RRDDIM_FLAG_UPDATED = 1 << 31 // the dimension has been updated since the last processing
81
+} RRDDIM_FLAGS;
82
+
83
+#define rrddim_flag_check(rd, flag) ((rd)->flags & flag)
84
+#define rrddim_flag_set(rd, flag) (rd)->flags |= flag
85
+#define rrddim_flag_clear(rd, flag) (rd)->flags &= ~flag
86
+
87
88
// ----------------------------------------------------------------------------
79
-// RRD CONTEXT
89
+// RRD FAMILY
90
91
struct rrdfamily {
92
avl avl;
@@ -90,8 +100,9 @@ struct rrdfamily {
100
};
101
typedef struct rrdfamily RRDFAMILY;
102
103
+
104
// ----------------------------------------------------------------------------
94
-// RRD DIMENSION
105
+// RRD DIMENSION - this is a metric
106
107
struct rrddim {
108
// ------------------------------------------------------------------------
@@ -102,18 +113,20 @@ struct rrddim {
113
// ------------------------------------------------------------------------
114
// the dimension definition
115
105
- char id[RRD_ID_LENGTH_MAX + 1]; // the id of this dimension (for internal identification)
106
-
116
+ const char *id; // the id of this dimension (for internal identification)
117
const char *name; // the name of this dimension (as presented to user)
118
// this is a pointer to the config structure
119
// since the config always has a higher priority
120
// (the user overwrites the name of the charts)
121
+ // DO NOT FREE THIS - IT IS ALLOCATED IN CONFIG
122
112
- int algorithm; // the algorithm that is applied to add new collected values
113
- long multiplier; // the multiplier of the collected values
114
- long divisor; // the divider of the collected values
123
+ RRDDIM_ALGORITHM algorithm; // the algorithm that is applied to add new collected values
124
+ RRD_MEMORY_MODE memory_mode; // the memory mode for this dimension
125
116
- int mapped; // if set to non zero, this dimension is mapped to a file
126
+ collected_number multiplier; // the multiplier of the collected values
127
+ collected_number divisor; // the divider of the collected values
128
+
129
+ uint32_t flags; // options and status options for the dimension
130
131
// ------------------------------------------------------------------------
132
// members for temporary data we need for calculations
@@ -122,18 +135,11 @@ struct rrddim {
135
// instead of strcmp() every item in the binary index
136
// we first compare the hashes
137
125
- // FIXME
126
- // we need the hash_name too!
127
- // needed at rrdr_disable_not_selected_dimensions()
128
-
129
- uint32_t flags;
130
-
131
- char cache_filename[FILENAME_MAX+1]; // the filename we load/save from/to this set
138
+ uint32_t hash_name; // a simple hash of the name
139
133
- unsigned long counter; // the number of times we added values to this rrdim
140
+ char *cache_filename; // the filename we load/save from/to this set
141
135
- int updated; // set to 0 after each calculation, to 1 after each collected value
136
- // we use this to detect that a dimension is not updated
142
+ size_t counter; // the number of times we added values to this rrdim
143
144
struct timeval last_collected_time; // when was this dimension last updated
145
// this is actual date time we updated the last_collected_value
@@ -164,7 +170,7 @@ struct rrddim {
170
171
int update_every; // every how many seconds is this updated
172
167
- unsigned long memsize; // the memory allocated for this dimension
173
+ size_t memsize; // the memory allocated for this dimension
174
175
char magic[sizeof(RRDDIMENSION_MAGIC) + 1]; // a string to be saved, used to identify our data file
176
@@ -179,7 +185,7 @@ typedef struct rrddim RRDDIM;
185
186
187
// ----------------------------------------------------------------------------
182
-// RRDSET
188
+// RRDSET - this is a chart
189
190
struct rrdset {
191
// ------------------------------------------------------------------------
@@ -206,7 +212,7 @@ struct rrdset {
212
char *context; // the template of this data set
213
uint32_t hash_context;
214
209
- int chart_type;
215
+ RRDSET_TYPE chart_type;
216
217
int update_every; // every how many seconds is this updated?
218
@@ -398,7 +404,7 @@ extern usec_t rrdset_done(RRDSET *st);
404
// ----------------------------------------------------------------------------
405
// RRD DIMENSION functions
406
401
-extern RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier, long divisor, int algorithm);
407
+extern RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, collected_number multiplier, collected_number divisor, RRDDIM_ALGORITHM algorithm);
408
409
extern void rrddim_set_name(RRDSET *st, RRDDIM *rd, const char *name);
410
extern void rrddim_free(RRDSET *st, RRDDIM *rd);
src/rrd2json.c
+14
-13
@@ -44,7 +44,7 @@ void rrd_stats_api_v1_chart_with_data(RRDSET *st, BUFFER *wb, size_t *dimensions
44
size_t dimensions = 0;
45
RRDDIM *rd;
46
for(rd = st->dimensions; rd ; rd = rd->next) {
47
- if(rd->flags & RRDDIM_FLAG_HIDDEN) continue;
47
+ if(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)) continue;
48
49
memory += rd->memsize;
50
@@ -176,8 +176,8 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus(BUFFER *wb)
176
// buffer_sprintf(wb, "# HELP %s.%s %s\n", st->id, rd->id, st->units);
177
178
switch(rd->algorithm) {
179
- case RRDDIM_INCREMENTAL:
180
- case RRDDIM_PCENT_OVER_DIFF_TOTAL:
179
+ case RRDDIM_ALGORITHM_INCREMENTAL:
180
+ case RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
181
buffer_sprintf(wb, "# TYPE %s_%s counter\n", chart, dimension);
182
break;
183
@@ -256,7 +256,7 @@ void rrd_stats_api_v1_charts_allmetrics_shell(BUFFER *wb)
256
else {
257
if(rd->multiplier < 0 || rd->divisor < 0) n = -n;
258
n = roundl(n);
259
- if(!(rd->flags & RRDDIM_FLAG_HIDDEN)) total += n;
259
+ if(!rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)) total += n;
260
buffer_sprintf(wb, "NETDATA_%s_%s=\"%0.0Lf\" # %s\n", chart, dimension, n, st->units);
261
}
262
}
@@ -366,8 +366,8 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
366
"\t\t\t\t\t\"entries\": %ld,\n"
367
"\t\t\t\t\t\"isHidden\": %d,\n"
368
"\t\t\t\t\t\"algorithm\": \"%s\",\n"
369
- "\t\t\t\t\t\"multiplier\": %ld,\n"
370
- "\t\t\t\t\t\"divisor\": %ld,\n"
369
+ "\t\t\t\t\t\"multiplier\": " COLLECTED_NUMBER_FORMAT ",\n"
370
+ "\t\t\t\t\t\"divisor\": " COLLECTED_NUMBER_FORMAT ",\n"
371
"\t\t\t\t\t\"last_entry_t\": %ld,\n"
372
"\t\t\t\t\t\"collected_value\": " COLLECTED_NUMBER_FORMAT ",\n"
373
"\t\t\t\t\t\"calculated_value\": " CALCULATED_NUMBER_FORMAT ",\n"
@@ -378,7 +378,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
378
, rd->id
379
, rd->name
380
, rd->entries
381
- , (rd->flags & RRDDIM_FLAG_HIDDEN)?1:0
381
+ , rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)?1:0
382
, rrddim_algorithm_name(rd->algorithm)
383
, rd->multiplier
384
, rd->divisor
@@ -546,8 +546,7 @@ static void rrdr_dump(RRDR *r)
546
}
547
*/
548
549
-void rrdr_disable_not_selected_dimensions(RRDR *r, uint32_t options, const char *dims)
550
-{
549
+void rrdr_disable_not_selected_dimensions(RRDR *r, uint32_t options, const char *dims) {
550
if(unlikely(!dims || !*dims)) return;
551
552
char b[strlen(dims) + 1];
@@ -568,7 +567,7 @@ void rrdr_disable_not_selected_dimensions(RRDR *r, uint32_t options, const char
567
568
// find it and enable it
569
for(c = 0, d = r->st->dimensions; d ;c++, d = d->next) {
571
- if(unlikely((hash == d->hash && !strcmp(d->id, tok)) || !strcmp(d->name, tok))) {
570
+ if(unlikely((hash == d->hash && !strcmp(d->id, tok)) || (hash == d->hash_name && !strcmp(d->name, tok)))) {
571
572
if(likely(r->od[c] & RRDR_HIDDEN)) {
573
r->od[c] |= RRDR_SELECTED;
@@ -1412,8 +1411,10 @@ static RRDR *rrdr_create(RRDSET *st, long n)
1411
// set the hidden flag on hidden dimensions
1412
int c;
1413
for(c = 0, rd = st->dimensions ; rd ; c++, rd = rd->next) {
1415
- if(unlikely(rd->flags & RRDDIM_FLAG_HIDDEN)) r->od[c] = RRDR_HIDDEN;
1416
- else r->od[c] = 0;
1414
+ if(unlikely(rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)))
1415
+ r->od[c] = RRDR_HIDDEN;
1416
+ else
1417
+ r->od[c] = 0;
1418
}
1419
1420
r->c = -1;
@@ -2092,7 +2093,7 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
2093
// initialize them
2094
for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
2095
group_values[c] = 0;
2095
- print_hidden[c] = (rd->flags & RRDDIM_FLAG_HIDDEN)?1:0;
2096
+ print_hidden[c] = rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN)?1:0;
2097
found_non_zero[c] = 0;
2098
found_non_existing[c] = 0;
2099
}
src/sys_devices_system_edac_mc.c
+2
-2
@@ -139,7 +139,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
139
140
for(m = mc_root; m; m = m->next)
141
if(m->ce_count_filename)
142
- m->ce_rd = rrddim_add(ce_st, m->name, NULL, 1, 1, RRDDIM_INCREMENTAL);
142
+ m->ce_rd = rrddim_add(ce_st, m->name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
143
}
144
else
145
rrdset_next(ce_st);
@@ -167,7 +167,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
167
168
for(m = mc_root; m; m = m->next)
169
if(m->ue_count_filename)
170
- m->ue_rd = rrddim_add(ue_st, m->name, NULL, 1, 1, RRDDIM_INCREMENTAL);
170
+ m->ue_rd = rrddim_add(ue_st, m->name, NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
171
}
172
else
173
rrdset_next(ue_st);
src/sys_devices_system_node.c
+4
-4
@@ -95,10 +95,10 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
95
st = rrdset_create("mem", m->name, NULL, "numa", NULL, "NUMA events", "events/s", 1000, update_every, RRDSET_TYPE_LINE);
96
st->isdetail = 1;
97
98
- rrddim_add(st, "local_node", "local", 1, 1, RRDDIM_INCREMENTAL);
99
- rrddim_add(st, "numa_foreign", "foreign", 1, 1, RRDDIM_INCREMENTAL);
100
- rrddim_add(st, "interleave_hit", "interleave", 1, 1, RRDDIM_INCREMENTAL);
101
- rrddim_add(st, "other_node", "other", 1, 1, RRDDIM_INCREMENTAL);
98
+ rrddim_add(st, "local_node", "local", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
99
+ rrddim_add(st, "numa_foreign", "foreign", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
100
+ rrddim_add(st, "interleave_hit", "interleave", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
101
+ rrddim_add(st, "other_node", "other", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
102
103
m->numastat_st = st;
104
}
src/sys_fs_cgroup.c
+55
-55
@@ -1536,134 +1536,134 @@ void update_services_charts(int update_every,
1536
1537
if(likely(do_cpu && cg->cpuacct_stat.updated)) {
1538
if(unlikely(!cg->rd_cpu))
1539
- cg->rd_cpu = rrddim_add(st_cpu, cg->chart_id, cg->chart_title, 100, hz, RRDDIM_INCREMENTAL);
1539
+ cg->rd_cpu = rrddim_add(st_cpu, cg->chart_id, cg->chart_title, 100, hz, RRDDIM_ALGORITHM_INCREMENTAL);
1540
1541
rrddim_set_by_pointer(st_cpu, cg->rd_cpu, cg->cpuacct_stat.user + cg->cpuacct_stat.system);
1542
}
1543
1544
if(likely(do_mem_usage && cg->memory.updated_usage_in_bytes)) {
1545
if(unlikely(!cg->rd_mem_usage))
1546
- cg->rd_mem_usage = rrddim_add(st_mem_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1546
+ cg->rd_mem_usage = rrddim_add(st_mem_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1547
1548
rrddim_set_by_pointer(st_mem_usage, cg->rd_mem_usage, cg->memory.usage_in_bytes - ((cgroup_used_memory_without_cache)?cg->memory.cache:0));
1549
}
1550
1551
if(likely(do_mem_detailed && cg->memory.updated_detailed)) {
1552
if(unlikely(!cg->rd_mem_detailed_rss))
1553
- cg->rd_mem_detailed_rss = rrddim_add(st_mem_detailed_rss, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1553
+ cg->rd_mem_detailed_rss = rrddim_add(st_mem_detailed_rss, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1554
rrddim_set_by_pointer(st_mem_detailed_rss, cg->rd_mem_detailed_rss, cg->memory.rss + cg->memory.rss_huge);
1555
1556
if(unlikely(!cg->rd_mem_detailed_mapped))
1557
- cg->rd_mem_detailed_mapped = rrddim_add(st_mem_detailed_mapped, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1557
+ cg->rd_mem_detailed_mapped = rrddim_add(st_mem_detailed_mapped, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1558
rrddim_set_by_pointer(st_mem_detailed_mapped, cg->rd_mem_detailed_mapped, cg->memory.mapped_file);
1559
1560
if(unlikely(!cg->rd_mem_detailed_cache))
1561
- cg->rd_mem_detailed_cache = rrddim_add(st_mem_detailed_cache, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1561
+ cg->rd_mem_detailed_cache = rrddim_add(st_mem_detailed_cache, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1562
rrddim_set_by_pointer(st_mem_detailed_cache, cg->rd_mem_detailed_cache, cg->memory.cache);
1563
1564
if(unlikely(!cg->rd_mem_detailed_writeback))
1565
- cg->rd_mem_detailed_writeback = rrddim_add(st_mem_detailed_writeback, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1565
+ cg->rd_mem_detailed_writeback = rrddim_add(st_mem_detailed_writeback, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1566
rrddim_set_by_pointer(st_mem_detailed_writeback, cg->rd_mem_detailed_writeback, cg->memory.writeback);
1567
1568
if(unlikely(!cg->rd_mem_detailed_pgfault))
1569
- cg->rd_mem_detailed_pgfault = rrddim_add(st_mem_detailed_pgfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1569
+ cg->rd_mem_detailed_pgfault = rrddim_add(st_mem_detailed_pgfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1570
rrddim_set_by_pointer(st_mem_detailed_pgfault, cg->rd_mem_detailed_pgfault, cg->memory.pgfault);
1571
1572
if(unlikely(!cg->rd_mem_detailed_pgmajfault))
1573
- cg->rd_mem_detailed_pgmajfault = rrddim_add(st_mem_detailed_pgmajfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1573
+ cg->rd_mem_detailed_pgmajfault = rrddim_add(st_mem_detailed_pgmajfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1574
rrddim_set_by_pointer(st_mem_detailed_pgmajfault, cg->rd_mem_detailed_pgmajfault, cg->memory.pgmajfault);
1575
1576
if(unlikely(!cg->rd_mem_detailed_pgpgin))
1577
- cg->rd_mem_detailed_pgpgin = rrddim_add(st_mem_detailed_pgpgin, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1577
+ cg->rd_mem_detailed_pgpgin = rrddim_add(st_mem_detailed_pgpgin, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1578
rrddim_set_by_pointer(st_mem_detailed_pgpgin, cg->rd_mem_detailed_pgpgin, cg->memory.pgpgin);
1579
1580
if(unlikely(!cg->rd_mem_detailed_pgpgout))
1581
- cg->rd_mem_detailed_pgpgout = rrddim_add(st_mem_detailed_pgpgout, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1581
+ cg->rd_mem_detailed_pgpgout = rrddim_add(st_mem_detailed_pgpgout, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1582
rrddim_set_by_pointer(st_mem_detailed_pgpgout, cg->rd_mem_detailed_pgpgout, cg->memory.pgpgout);
1583
}
1584
1585
if(likely(do_mem_failcnt && cg->memory.updated_failcnt)) {
1586
if(unlikely(!cg->rd_mem_failcnt))
1587
- cg->rd_mem_failcnt = rrddim_add(st_mem_failcnt, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1587
+ cg->rd_mem_failcnt = rrddim_add(st_mem_failcnt, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1588
1589
rrddim_set_by_pointer(st_mem_failcnt, cg->rd_mem_failcnt, cg->memory.failcnt);
1590
}
1591
1592
if(likely(do_swap_usage && cg->memory.updated_msw_usage_in_bytes)) {
1593
if(unlikely(!cg->rd_swap_usage))
1594
- cg->rd_swap_usage = rrddim_add(st_swap_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1594
+ cg->rd_swap_usage = rrddim_add(st_swap_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1595
1596
rrddim_set_by_pointer(st_swap_usage, cg->rd_swap_usage, cg->memory.msw_usage_in_bytes);
1597
}
1598
1599
if(likely(do_io && cg->io_service_bytes.updated)) {
1600
if(unlikely(!cg->rd_io_service_bytes_read))
1601
- cg->rd_io_service_bytes_read = rrddim_add(st_io_read, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_INCREMENTAL);
1601
+ cg->rd_io_service_bytes_read = rrddim_add(st_io_read, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1602
1603
rrddim_set_by_pointer(st_io_read, cg->rd_io_service_bytes_read, cg->io_service_bytes.Read);
1604
1605
if(unlikely(!cg->rd_io_service_bytes_write))
1606
- cg->rd_io_service_bytes_write = rrddim_add(st_io_write, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_INCREMENTAL);
1606
+ cg->rd_io_service_bytes_write = rrddim_add(st_io_write, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1607
1608
rrddim_set_by_pointer(st_io_write, cg->rd_io_service_bytes_write, cg->io_service_bytes.Write);
1609
}
1610
1611
if(likely(do_io_ops && cg->io_serviced.updated)) {
1612
if(unlikely(!cg->rd_io_serviced_read))
1613
- cg->rd_io_serviced_read = rrddim_add(st_io_serviced_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1613
+ cg->rd_io_serviced_read = rrddim_add(st_io_serviced_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1614
1615
rrddim_set_by_pointer(st_io_serviced_read, cg->rd_io_serviced_read, cg->io_serviced.Read);
1616
1617
if(unlikely(!cg->rd_io_serviced_write))
1618
- cg->rd_io_serviced_write = rrddim_add(st_io_serviced_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1618
+ cg->rd_io_serviced_write = rrddim_add(st_io_serviced_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1619
1620
rrddim_set_by_pointer(st_io_serviced_write, cg->rd_io_serviced_write, cg->io_serviced.Write);
1621
}
1622
1623
if(likely(do_throttle_io && cg->throttle_io_service_bytes.updated)) {
1624
if(unlikely(!cg->rd_throttle_io_read))
1625
- cg->rd_throttle_io_read = rrddim_add(st_throttle_io_read, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_INCREMENTAL);
1625
+ cg->rd_throttle_io_read = rrddim_add(st_throttle_io_read, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1626
1627
rrddim_set_by_pointer(st_throttle_io_read, cg->rd_throttle_io_read, cg->throttle_io_service_bytes.Read);
1628
1629
if(unlikely(!cg->rd_throttle_io_write))
1630
- cg->rd_throttle_io_write = rrddim_add(st_throttle_io_write, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_INCREMENTAL);
1630
+ cg->rd_throttle_io_write = rrddim_add(st_throttle_io_write, cg->chart_id, cg->chart_title, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1631
1632
rrddim_set_by_pointer(st_throttle_io_write, cg->rd_throttle_io_write, cg->throttle_io_service_bytes.Write);
1633
}
1634
1635
if(likely(do_throttle_ops && cg->throttle_io_serviced.updated)) {
1636
if(unlikely(!cg->rd_throttle_io_serviced_read))
1637
- cg->rd_throttle_io_serviced_read = rrddim_add(st_throttle_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1637
+ cg->rd_throttle_io_serviced_read = rrddim_add(st_throttle_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1638
1639
rrddim_set_by_pointer(st_throttle_ops_read, cg->rd_throttle_io_serviced_read, cg->throttle_io_serviced.Read);
1640
1641
if(unlikely(!cg->rd_throttle_io_serviced_write))
1642
- cg->rd_throttle_io_serviced_write = rrddim_add(st_throttle_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1642
+ cg->rd_throttle_io_serviced_write = rrddim_add(st_throttle_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1643
1644
rrddim_set_by_pointer(st_throttle_ops_write, cg->rd_throttle_io_serviced_write, cg->throttle_io_serviced.Write);
1645
}
1646
1647
if(likely(do_queued_ops && cg->io_queued.updated)) {
1648
if(unlikely(!cg->rd_io_queued_read))
1649
- cg->rd_io_queued_read = rrddim_add(st_queued_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1649
+ cg->rd_io_queued_read = rrddim_add(st_queued_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1650
1651
rrddim_set_by_pointer(st_queued_ops_read, cg->rd_io_queued_read, cg->io_queued.Read);
1652
1653
if(unlikely(!cg->rd_io_queued_write))
1654
- cg->rd_io_queued_write = rrddim_add(st_queued_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1654
+ cg->rd_io_queued_write = rrddim_add(st_queued_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1655
1656
rrddim_set_by_pointer(st_queued_ops_write, cg->rd_io_queued_write, cg->io_queued.Write);
1657
}
1658
1659
if(likely(do_merged_ops && cg->io_merged.updated)) {
1660
if(unlikely(!cg->rd_io_merged_read))
1661
- cg->rd_io_merged_read = rrddim_add(st_merged_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1661
+ cg->rd_io_merged_read = rrddim_add(st_merged_ops_read, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1662
1663
rrddim_set_by_pointer(st_merged_ops_read, cg->rd_io_merged_read, cg->io_merged.Read);
1664
1665
if(unlikely(!cg->rd_io_merged_write))
1666
- cg->rd_io_merged_write = rrddim_add(st_merged_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1666
+ cg->rd_io_merged_write = rrddim_add(st_merged_ops_write, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1667
1668
rrddim_set_by_pointer(st_merged_ops_write, cg->rd_io_merged_write, cg->io_merged.Write);
1669
}
@@ -1785,8 +1785,8 @@ void update_cgroup_charts(int update_every) {
1785
snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1786
cg->st_cpu = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", CHART_PRIORITY_CONTAINERS, update_every, RRDSET_TYPE_STACKED);
1787
}
1788
- rrddim_add(cg->st_cpu, "user", NULL, 100, hz, RRDDIM_INCREMENTAL);
1789
- rrddim_add(cg->st_cpu, "system", NULL, 100, hz, RRDDIM_INCREMENTAL);
1788
+ rrddim_add(cg->st_cpu, "user", NULL, 100, hz, RRDDIM_ALGORITHM_INCREMENTAL);
1789
+ rrddim_add(cg->st_cpu, "system", NULL, 100, hz, RRDDIM_ALGORITHM_INCREMENTAL);
1790
}
1791
else
1792
rrdset_next(cg->st_cpu);
@@ -1808,7 +1808,7 @@ void update_cgroup_charts(int update_every) {
1808
}
1809
for(i = 0; i < cg->cpuacct_usage.cpus; i++) {
1810
snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
1811
- rrddim_add(cg->st_cpu_per_core, id, NULL, 100, 1000000000, RRDDIM_INCREMENTAL);
1811
+ rrddim_add(cg->st_cpu_per_core, id, NULL, 100, 1000000000, RRDDIM_ALGORITHM_INCREMENTAL);
1812
}
1813
}
1814
else
@@ -1829,12 +1829,12 @@ void update_cgroup_charts(int update_every) {
1829
cg->st_mem = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", CHART_PRIORITY_CONTAINERS + 210, update_every, RRDSET_TYPE_STACKED);
1830
}
1831
1832
- rrddim_add(cg->st_mem, "cache", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1833
- rrddim_add(cg->st_mem, "rss", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1832
+ rrddim_add(cg->st_mem, "cache", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1833
+ rrddim_add(cg->st_mem, "rss", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1834
if(cg->memory.detailed_has_swap)
1835
- rrddim_add(cg->st_mem, "swap", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1836
- rrddim_add(cg->st_mem, "rss_huge", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1837
- rrddim_add(cg->st_mem, "mapped_file", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1835
+ rrddim_add(cg->st_mem, "swap", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1836
+ rrddim_add(cg->st_mem, "rss_huge", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1837
+ rrddim_add(cg->st_mem, "mapped_file", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1838
}
1839
else
1840
rrdset_next(cg->st_mem);
@@ -1855,8 +1855,8 @@ void update_cgroup_charts(int update_every) {
1855
}
1856
1857
if(cg->memory.detailed_has_dirty)
1858
- rrddim_add(cg->st_writeback, "dirty", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1859
- rrddim_add(cg->st_writeback, "writeback", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1858
+ rrddim_add(cg->st_writeback, "dirty", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1859
+ rrddim_add(cg->st_writeback, "writeback", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1860
}
1861
else
1862
rrdset_next(cg->st_writeback);
@@ -1872,8 +1872,8 @@ void update_cgroup_charts(int update_every) {
1872
snprintfz(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_title);
1873
cg->st_mem_activity = rrdset_create(type, "mem_activity", NULL, "mem", "cgroup.mem_activity", title, "MB/s", CHART_PRIORITY_CONTAINERS + 400, update_every, RRDSET_TYPE_LINE);
1874
}
1875
- rrddim_add(cg->st_mem_activity, "pgpgin", "in", system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1876
- rrddim_add(cg->st_mem_activity, "pgpgout", "out", -system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1875
+ rrddim_add(cg->st_mem_activity, "pgpgin", "in", system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1876
+ rrddim_add(cg->st_mem_activity, "pgpgout", "out", -system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1877
}
1878
else
1879
rrdset_next(cg->st_mem_activity);
@@ -1888,8 +1888,8 @@ void update_cgroup_charts(int update_every) {
1888
snprintfz(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_title);
1889
cg->st_pgfaults = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", CHART_PRIORITY_CONTAINERS + 500, update_every, RRDSET_TYPE_LINE);
1890
}
1891
- rrddim_add(cg->st_pgfaults, "pgfault", NULL, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1892
- rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1891
+ rrddim_add(cg->st_pgfaults, "pgfault", NULL, system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1892
+ rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -system_page_size, 1024 * 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1893
}
1894
else
1895
rrdset_next(cg->st_pgfaults);
@@ -1906,8 +1906,8 @@ void update_cgroup_charts(int update_every) {
1906
snprintfz(title, CHART_TITLE_MAX, "Used Memory %sfor cgroup %s", (cgroup_used_memory_without_cache && cg->memory.updated_detailed)?"without Cache ":"", cg->chart_title);
1907
cg->st_mem_usage = rrdset_create(type, "mem_usage", NULL, "mem", "cgroup.mem_usage", title, "MB", CHART_PRIORITY_CONTAINERS + 200, update_every, RRDSET_TYPE_STACKED);
1908
}
1909
- rrddim_add(cg->st_mem_usage, "ram", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1910
- rrddim_add(cg->st_mem_usage, "swap", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1909
+ rrddim_add(cg->st_mem_usage, "ram", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1910
+ rrddim_add(cg->st_mem_usage, "swap", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
1911
}
1912
else
1913
rrdset_next(cg->st_mem_usage);
@@ -1924,7 +1924,7 @@ void update_cgroup_charts(int update_every) {
1924
snprintfz(title, CHART_TITLE_MAX, "Memory Limit Failures for cgroup %s", cg->chart_title);
1925
cg->st_mem_failcnt = rrdset_create(type, "mem_failcnt", NULL, "mem", "cgroup.mem_failcnt", title, "count", CHART_PRIORITY_CONTAINERS + 250, update_every, RRDSET_TYPE_LINE);
1926
}
1927
- rrddim_add(cg->st_mem_failcnt, "failures", NULL, 1, 1, RRDDIM_INCREMENTAL);
1927
+ rrddim_add(cg->st_mem_failcnt, "failures", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1928
}
1929
else
1930
rrdset_next(cg->st_mem_failcnt);
@@ -1940,8 +1940,8 @@ void update_cgroup_charts(int update_every) {
1940
snprintfz(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1941
cg->st_io = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
1942
}
1943
- rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
1944
- rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
1943
+ rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1944
+ rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1945
}
1946
else
1947
rrdset_next(cg->st_io);
@@ -1958,8 +1958,8 @@ void update_cgroup_charts(int update_every) {
1958
snprintfz(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
1959
cg->st_serviced_ops = rrdset_create(type, "serviced_ops", NULL, "disk", "cgroup.serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
1960
}
1961
- rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRDDIM_INCREMENTAL);
1962
- rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRDDIM_INCREMENTAL);
1961
+ rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1962
+ rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1963
}
1964
else
1965
rrdset_next(cg->st_serviced_ops);
@@ -1976,8 +1976,8 @@ void update_cgroup_charts(int update_every) {
1976
snprintfz(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1977
cg->st_throttle_io = rrdset_create(type, "throttle_io", NULL, "disk", "cgroup.throttle_io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
1978
}
1979
- rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
1980
- rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
1979
+ rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1980
+ rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
1981
}
1982
else
1983
rrdset_next(cg->st_throttle_io);
@@ -1994,8 +1994,8 @@ void update_cgroup_charts(int update_every) {
1994
snprintfz(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
1995
cg->st_throttle_serviced_ops = rrdset_create(type, "throttle_serviced_ops", NULL, "disk", "cgroup.throttle_serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
1996
}
1997
- rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRDDIM_INCREMENTAL);
1998
- rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRDDIM_INCREMENTAL);
1997
+ rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1998
+ rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1999
}
2000
else
2001
rrdset_next(cg->st_throttle_serviced_ops);
@@ -2012,8 +2012,8 @@ void update_cgroup_charts(int update_every) {
2012
snprintfz(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_title);
2013
cg->st_queued_ops = rrdset_create(type, "queued_ops", NULL, "disk", "cgroup.queued_ops", title, "operations", CHART_PRIORITY_CONTAINERS + 2000, update_every, RRDSET_TYPE_LINE);
2014
}
2015
- rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRDDIM_ABSOLUTE);
2016
- rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRDDIM_ABSOLUTE);
2015
+ rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
2016
+ rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
2017
}
2018
else
2019
rrdset_next(cg->st_queued_ops);
@@ -2030,8 +2030,8 @@ void update_cgroup_charts(int update_every) {
2030
snprintfz(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_title);
2031
cg->st_merged_ops = rrdset_create(type, "merged_ops", NULL, "disk", "cgroup.merged_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 2100, update_every, RRDSET_TYPE_LINE);
2032
}
2033
- rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
2034
- rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
2033
+ rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
2034
+ rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1024, RRDDIM_ALGORITHM_INCREMENTAL);
2035
}
2036
else
2037
rrdset_next(cg->st_merged_ops);
@@ -2114,8 +2114,8 @@ void *cgroups_main(void *ptr) {
2114
if(unlikely(!stcpu_thread))
2115
stcpu_thread = rrdset_create("netdata", "plugin_cgroups_cpu", NULL, "cgroups", NULL, "NetData CGroups Plugin CPU usage", "milliseconds/s", 132000, cgroup_update_every, RRDSET_TYPE_STACKED);
2116
2117
- rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
2118
- rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
2117
+ rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
2118
+ rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_ALGORITHM_INCREMENTAL);
2119
}
2120
else
2121
rrdset_next(stcpu_thread);
src/sys_kernel_mm_ksm.c
+8
-8
@@ -94,11 +94,11 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
94
if(!st) {
95
st = rrdset_create("mem", "ksm", NULL, "ksm", NULL, "Kernel Same Page Merging", "MB", 5000, update_every, RRDSET_TYPE_AREA);
96
97
- rrddim_add(st, "shared", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
98
- rrddim_add(st, "unshared", NULL, -1, 1024 * 1024, RRDDIM_ABSOLUTE);
99
- rrddim_add(st, "sharing", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
100
- rrddim_add(st, "volatile", NULL, -1, 1024 * 1024, RRDDIM_ABSOLUTE);
101
- rrddim_add(st, "to_scan", "to scan", -1, 1024 * 1024, RRDDIM_ABSOLUTE);
97
+ rrddim_add(st, "shared", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
98
+ rrddim_add(st, "unshared", NULL, -1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
99
+ rrddim_add(st, "sharing", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
100
+ rrddim_add(st, "volatile", NULL, -1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
101
+ rrddim_add(st, "to_scan", "to scan", -1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
102
}
103
else rrdset_next(st);
104
@@ -113,8 +113,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
113
if(!st) {
114
st = rrdset_create("mem", "ksm_savings", NULL, "ksm", NULL, "Kernel Same Page Merging Savings", "MB", 5001, update_every, RRDSET_TYPE_AREA);
115
116
- rrddim_add(st, "savings", NULL, -1, 1024 * 1024, RRDDIM_ABSOLUTE);
117
- rrddim_add(st, "offered", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
116
+ rrddim_add(st, "savings", NULL, -1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
117
+ rrddim_add(st, "offered", NULL, 1, 1024 * 1024, RRDDIM_ALGORITHM_ABSOLUTE);
118
}
119
else rrdset_next(st);
120
@@ -126,7 +126,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
126
if(!st) {
127
st = rrdset_create("mem", "ksm_ratios", NULL, "ksm", NULL, "Kernel Same Page Merging Effectiveness", "percentage", 5002, update_every, RRDSET_TYPE_LINE);
128
129
- rrddim_add(st, "savings", NULL, 1, 10000, RRDDIM_ABSOLUTE);
129
+ rrddim_add(st, "savings", NULL, 1, 10000, RRDDIM_ALGORITHM_ABSOLUTE);
130
}
131
else rrdset_next(st);
132
src/unit_test.c
+23
-23
@@ -282,7 +282,7 @@ struct test test1 = {
282
1, // update_every
283
1, // multiplier
284
1, // divisor
285
- RRDDIM_ABSOLUTE, // algorithm
285
+ RRDDIM_ALGORITHM_ABSOLUTE, // algorithm
286
10, // feed entries
287
9, // result entries
288
test1_feed, // feed
@@ -318,7 +318,7 @@ struct test test2 = {
318
1, // update_every
319
1, // multiplier
320
1, // divisor
321
- RRDDIM_ABSOLUTE, // algorithm
321
+ RRDDIM_ALGORITHM_ABSOLUTE, // algorithm
322
10, // feed entries
323
9, // result entries
324
test2_feed, // feed
@@ -353,7 +353,7 @@ struct test test3 = {
353
1, // update_every
354
1, // multiplier
355
1, // divisor
356
- RRDDIM_INCREMENTAL, // algorithm
356
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
357
10, // feed entries
358
9, // result entries
359
test3_feed, // feed
@@ -388,7 +388,7 @@ struct test test4 = {
388
1, // update_every
389
1, // multiplier
390
1, // divisor
391
- RRDDIM_INCREMENTAL, // algorithm
391
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
392
10, // feed entries
393
9, // result entries
394
test4_feed, // feed
@@ -423,7 +423,7 @@ struct test test5 = {
423
1, // update_every
424
1, // multiplier
425
1, // divisor
426
- RRDDIM_INCREMENTAL, // algorithm
426
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
427
10, // feed entries
428
9, // result entries
429
test5_feed, // feed
@@ -464,7 +464,7 @@ struct test test6 = {
464
1, // update_every
465
1, // multiplier
466
1, // divisor
467
- RRDDIM_INCREMENTAL, // algorithm
467
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
468
16, // feed entries
469
4, // result entries
470
test6_feed, // feed
@@ -499,7 +499,7 @@ struct test test7 = {
499
1, // update_every
500
1, // multiplier
501
1, // divisor
502
- RRDDIM_INCREMENTAL, // algorithm
502
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
503
10, // feed entries
504
18, // result entries
505
test7_feed, // feed
@@ -530,7 +530,7 @@ struct test test8 = {
530
1, // update_every
531
1, // multiplier
532
1, // divisor
533
- RRDDIM_ABSOLUTE, // algorithm
533
+ RRDDIM_ALGORITHM_ABSOLUTE, // algorithm
534
6, // feed entries
535
10, // result entries
536
test8_feed, // feed
@@ -571,7 +571,7 @@ struct test test9 = {
571
1, // update_every
572
1, // multiplier
573
1, // divisor
574
- RRDDIM_ABSOLUTE, // algorithm
574
+ RRDDIM_ALGORITHM_ABSOLUTE, // algorithm
575
16, // feed entries
576
4, // result entries
577
test9_feed, // feed
@@ -606,7 +606,7 @@ struct test test10 = {
606
1, // update_every
607
1, // multiplier
608
1, // divisor
609
- RRDDIM_INCREMENTAL, // algorithm
609
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
610
10, // feed entries
611
7, // result entries
612
test10_feed, // feed
@@ -649,7 +649,7 @@ struct test test11 = {
649
1, // update_every
650
1, // multiplier
651
1, // divisor
652
- RRDDIM_PCENT_OVER_DIFF_TOTAL, // algorithm
652
+ RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL, // algorithm
653
10, // feed entries
654
9, // result entries
655
test11_feed, // feed
@@ -692,7 +692,7 @@ struct test test12 = {
692
1, // update_every
693
1, // multiplier
694
1, // divisor
695
- RRDDIM_PCENT_OVER_DIFF_TOTAL, // algorithm
695
+ RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL, // algorithm
696
10, // feed entries
697
9, // result entries
698
test12_feed, // feed
@@ -727,7 +727,7 @@ struct test test13 = {
727
1, // update_every
728
1, // multiplier
729
1, // divisor
730
- RRDDIM_PCENT_OVER_DIFF_TOTAL, // algorithm
730
+ RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL, // algorithm
731
10, // feed entries
732
7, // result entries
733
test13_feed, // feed
@@ -762,7 +762,7 @@ struct test test14 = {
762
30, // update_every
763
8, // multiplier
764
1000000000, // divisor
765
- RRDDIM_INCREMENTAL, // algorithm
765
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
766
10, // feed entries
767
8, // result entries
768
test14_feed, // feed
@@ -794,7 +794,7 @@ struct test test14b = {
794
30, // update_every
795
1, // multiplier
796
1, // divisor
797
- RRDDIM_INCREMENTAL, // algorithm
797
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
798
10, // feed entries
799
8, // result entries
800
test14b_feed, // feed
@@ -826,7 +826,7 @@ struct test test14c = {
826
30, // update_every
827
1, // multiplier
828
1, // divisor
829
- RRDDIM_INCREMENTAL, // algorithm
829
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
830
10, // feed entries
831
9, // result entries
832
test14c_feed, // feed
@@ -869,7 +869,7 @@ struct test test15 = {
869
1, // update_every
870
8, // multiplier
871
1024, // divisor
872
- RRDDIM_INCREMENTAL, // algorithm
872
+ RRDDIM_ALGORITHM_INCREMENTAL, // algorithm
873
10, // feed entries
874
9, // result entries
875
test15_feed, // feed
@@ -981,11 +981,11 @@ static int test_variable_renames(void) {
981
fprintf(stderr, "Created chart with id '%s', name '%s'\n", st->id, st->name);
982
983
fprintf(stderr, "Creating dimension DIM1\n");
984
- RRDDIM *rd1 = rrddim_add(st, "DIM1", NULL, 1, 1, RRDDIM_INCREMENTAL);
984
+ RRDDIM *rd1 = rrddim_add(st, "DIM1", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
985
fprintf(stderr, "Created dimension with id '%s', name '%s'\n", rd1->id, rd1->name);
986
987
fprintf(stderr, "Creating dimension DIM2\n");
988
- RRDDIM *rd2 = rrddim_add(st, "DIM2", NULL, 1, 1, RRDDIM_INCREMENTAL);
988
+ RRDDIM *rd2 = rrddim_add(st, "DIM2", NULL, 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
989
fprintf(stderr, "Created dimension with id '%s', name '%s'\n", rd2->id, rd2->name);
990
991
fprintf(stderr, "Renaming chart to CHARTNAME1\n");
@@ -1105,10 +1105,10 @@ int unit_test(long delay, long shift)
1105
RRDDIM *rdabst = NULL;
1106
RRDDIM *rdabsi = NULL;
1107
1108
- if(do_abs) rdabs = rrddim_add(st, "absolute", "absolute", 1, 1, RRDDIM_ABSOLUTE);
1109
- if(do_inc) rdinc = rrddim_add(st, "incremental", "incremental", 1, 1, RRDDIM_INCREMENTAL);
1110
- if(do_abst) rdabst = rrddim_add(st, "percentage-of-absolute-row", "percentage-of-absolute-row", 1, 1, RRDDIM_PCENT_OVER_ROW_TOTAL);
1111
- if(do_absi) rdabsi = rrddim_add(st, "percentage-of-incremental-row", "percentage-of-incremental-row", 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
1108
+ if(do_abs) rdabs = rrddim_add(st, "absolute", "absolute", 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
1109
+ if(do_inc) rdinc = rrddim_add(st, "incremental", "incremental", 1, 1, RRDDIM_ALGORITHM_INCREMENTAL);
1110
+ if(do_abst) rdabst = rrddim_add(st, "percentage-of-absolute-row", "percentage-of-absolute-row", 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_ROW_TOTAL);
1111
+ if(do_absi) rdabsi = rrddim_add(st, "percentage-of-incremental-row", "percentage-of-incremental-row", 1, 1, RRDDIM_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
1112
1113
long increment = 1000;
1114
collected_number i = 0;