@cryptotaxi247 / netdata-1 / commits / 3a21933ff

multi-host rrdset and rrdfamily operations

Costa Tsaousis (ktsaou) committed Feb 17, 2017 at 23:14 UTC 3a21933ff4dbb05df94cf5e3fa221949e178450b
37 files changed +306 -288
src/backends.c
+5 -5
@@ -237,7 +237,7 @@ void *backends_main(void *ptr) {
237 chart_backend_reconnects = 0,
238 chart_backend_latency = 0;
239
240 - RRDSET *chart_metrics = rrdset_find("netdata.backend_metrics");
240 + RRDSET *chart_metrics = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
@@ -245,7 +245,7 @@ void *backends_main(void *ptr) {
245 rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRDDIM_ALGORITHM_ABSOLUTE);
246 }
247
248 - RRDSET *chart_bytes = rrdset_find("netdata.backend_bytes");
248 + RRDSET *chart_bytes = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
@@ -254,7 +254,7 @@ void *backends_main(void *ptr) {
254 rrddim_add(chart_bytes, "received", NULL, 1, 1024, RRDDIM_ALGORITHM_ABSOLUTE);
255 }
256
257 - RRDSET *chart_ops = rrdset_find("netdata.backend_ops");
257 + RRDSET *chart_ops = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
@@ -271,14 +271,14 @@ void *backends_main(void *ptr) {
271 *
272 * issue #1432 and https://www.softlab.ntua.gr/facilities/documentation/unix/unix-socket-faq/unix-socket-faq-2.html
273 *
274 - RRDSET *chart_latency = rrdset_find("netdata.backend_latency");
274 + RRDSET *chart_latency = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
278 }
279 */
280
281 - RRDSET *chart_rusage = rrdset_find("netdata.backend_thread_cpu");
281 + RRDSET *chart_rusage = rrdset_find_localhost("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_ALGORITHM_INCREMENTAL);
src/global_statistics.c
+7 -7
@@ -129,7 +129,7 @@ void global_statistics_charts(void) {
129 getrusage(RUSAGE_THREAD, &thread);
130 getrusage(RUSAGE_SELF, &me);
131
132 - if (!stcpu_thread) stcpu_thread = rrdset_find("netdata.plugin_proc_cpu");
132 + if (!stcpu_thread) stcpu_thread = rrdset_find_localhost("netdata.plugin_proc_cpu");
133 if (!stcpu_thread) {
134 stcpu_thread = rrdset_create("netdata", "plugin_proc_cpu", NULL, "proc", NULL,
135 "NetData Proc Plugin CPU usage", "milliseconds/s", 132000, rrd_update_every,
@@ -145,7 +145,7 @@ void global_statistics_charts(void) {
145
146 // ----------------------------------------------------------------
147
148 - if (!stcpu) stcpu = rrdset_find("netdata.server_cpu");
148 + if (!stcpu) stcpu = rrdset_find_localhost("netdata.server_cpu");
149 if (!stcpu) {
150 stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage", "milliseconds/s",
151 130000, rrd_update_every, RRDSET_TYPE_STACKED);
@@ -160,7 +160,7 @@ void global_statistics_charts(void) {
160
161 // ----------------------------------------------------------------
162
163 - if (!stclients) stclients = rrdset_find("netdata.clients");
163 + if (!stclients) stclients = rrdset_find_localhost("netdata.clients");
164 if (!stclients) {
165 stclients = rrdset_create("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients",
166 "connected clients", 130200, rrd_update_every, RRDSET_TYPE_LINE);
@@ -173,7 +173,7 @@ void global_statistics_charts(void) {
173
174 // ----------------------------------------------------------------
175
176 - if (!streqs) streqs = rrdset_find("netdata.requests");
176 + if (!streqs) streqs = rrdset_find_localhost("netdata.requests");
177 if (!streqs) {
178 streqs = rrdset_create("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests", "requests/s",
179 130300, rrd_update_every, RRDSET_TYPE_LINE);
@@ -186,7 +186,7 @@ void global_statistics_charts(void) {
186
187 // ----------------------------------------------------------------
188
189 - if (!stbytes) stbytes = rrdset_find("netdata.net");
189 + if (!stbytes) stbytes = rrdset_find_localhost("netdata.net");
190 if (!stbytes) {
191 stbytes = rrdset_create("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic", "kilobits/s",
192 130000, rrd_update_every, RRDSET_TYPE_AREA);
@@ -201,7 +201,7 @@ void global_statistics_charts(void) {
201
202 // ----------------------------------------------------------------
203
204 - if (!stduration) stduration = rrdset_find("netdata.response_time");
204 + if (!stduration) stduration = rrdset_find_localhost("netdata.response_time");
205 if (!stduration) {
206 stduration = rrdset_create("netdata", "response_time", NULL, "netdata", NULL, "NetData API Response Time",
207 "ms/request", 130400, rrd_update_every, RRDSET_TYPE_LINE);
@@ -232,7 +232,7 @@ void global_statistics_charts(void) {
232
233 // ----------------------------------------------------------------
234
235 - if (!stcompression) stcompression = rrdset_find("netdata.compression_ratio");
235 + if (!stcompression) stcompression = rrdset_find_localhost("netdata.compression_ratio");
236 if (!stcompression) {
237 stcompression = rrdset_create("netdata", "compression_ratio", NULL, "netdata", NULL,
238 "NetData API Responses Compression Savings Ratio", "percentage", 130500,
src/ipc.c
+2 -2
@@ -191,13 +191,13 @@ int do_ipc(int update_every, usec_t dt) {
191 if(semaphores_max) rrdvar_custom_host_variable_set(semaphores_max, limits.semmns);
192
193 // create the charts
194 - semaphores = rrdset_find("system.ipc_semaphores");
194 + semaphores = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
198 }
199
200 - arrays = rrdset_find("system.ipc_semaphore_arrays");
200 + arrays = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
src/macos_fw.c
+15 -15
@@ -136,7 +136,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
136 total_disk_writes += diskstat.bytes_write;
137 }
138
139 - st = rrdset_find_bytype("disk", diskstat.name);
139 + st = rrdset_find_bytype_localhost("disk", diskstat.name);
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
@@ -161,7 +161,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
161 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.writes);
162 }
163
164 - st = rrdset_find_bytype("disk_ops", diskstat.name);
164 + st = rrdset_find_bytype_localhost("disk_ops", diskstat.name);
165 if (unlikely(!st)) {
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;
@@ -187,7 +187,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
187 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.time_write);
188 }
189
190 - st = rrdset_find_bytype("disk_util", diskstat.name);
190 + st = rrdset_find_bytype_localhost("disk_util", diskstat.name);
191 if (unlikely(!st)) {
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;
@@ -212,7 +212,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
212 CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.latency_write);
213 }
214
215 - st = rrdset_find_bytype("disk_iotime", diskstat.name);
215 + st = rrdset_find_bytype_localhost("disk_iotime", diskstat.name);
216 if (unlikely(!st)) {
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;
@@ -236,7 +236,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
236
237 // --------------------------------------------------------------------
238
239 - st = rrdset_find_bytype("disk_await", diskstat.name);
239 + st = rrdset_find_bytype_localhost("disk_await", diskstat.name);
240 if (unlikely(!st)) {
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;
@@ -254,7 +254,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
254
255 // --------------------------------------------------------------------
256
257 - st = rrdset_find_bytype("disk_avgsz", diskstat.name);
257 + st = rrdset_find_bytype_localhost("disk_avgsz", diskstat.name);
258 if (unlikely(!st)) {
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;
@@ -272,7 +272,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
272
273 // --------------------------------------------------------------------
274
275 - st = rrdset_find_bytype("disk_svctm", diskstat.name);
275 + st = rrdset_find_bytype_localhost("disk_svctm", diskstat.name);
276 if (unlikely(!st)) {
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;
@@ -301,7 +301,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
301 }
302
303 if (likely(do_io)) {
304 - st = rrdset_find_bytype("system", "io");
304 + st = rrdset_find_bytype_localhost("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_ALGORITHM_INCREMENTAL);
@@ -340,7 +340,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
340 // --------------------------------------------------------------------------
341
342 if (likely(do_space)) {
343 - st = rrdset_find_bytype("disk_space", mntbuf[i].f_mntonname);
343 + st = rrdset_find_bytype_localhost("disk_space", mntbuf[i].f_mntonname);
344 if (unlikely(!st)) {
345 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
346 st = rrdset_create("disk_space", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.space", title, "GB", 2023,
@@ -363,7 +363,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
363 // --------------------------------------------------------------------------
364
365 if (likely(do_inodes)) {
366 - st = rrdset_find_bytype("disk_inodes", mntbuf[i].f_mntonname);
366 + st = rrdset_find_bytype_localhost("disk_inodes", mntbuf[i].f_mntonname);
367 if (unlikely(!st)) {
368 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
369 st = rrdset_create("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.inodes", title, "Inodes", 2024,
@@ -398,7 +398,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
398
399 // --------------------------------------------------------------------
400
401 - st = rrdset_find_bytype("net", ifa->ifa_name);
401 + st = rrdset_find_bytype_localhost("net", ifa->ifa_name);
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
@@ -413,7 +413,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
413
414 // --------------------------------------------------------------------
415
416 - st = rrdset_find_bytype("net_packets", ifa->ifa_name);
416 + st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
417 if (unlikely(!st)) {
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;
@@ -433,7 +433,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
433
434 // --------------------------------------------------------------------
435
436 - st = rrdset_find_bytype("net_errors", ifa->ifa_name);
436 + st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
437 if (unlikely(!st)) {
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;
@@ -449,7 +449,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
449
450 // --------------------------------------------------------------------
451
452 - st = rrdset_find_bytype("net_drops", ifa->ifa_name);
452 + st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
453 if (unlikely(!st)) {
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;
@@ -463,7 +463,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
463
464 // --------------------------------------------------------------------
465
466 - st = rrdset_find_bytype("net_events", ifa->ifa_name);
466 + st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
467 if (unlikely(!st)) {
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;
src/macos_mach_smi.c
+4 -4
@@ -48,7 +48,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
48 error("DISABLED: system.cpu");
49 } else {
50
51 - st = rrdset_find_bytype("system", "cpu");
51 + st = rrdset_find_bytype_localhost("system", "cpu");
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
@@ -84,7 +84,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
84 error("DISABLED: mem.pgfaults");
85 } else {
86 if (likely(do_ram)) {
87 - st = rrdset_find("system.ram");
87 + st = rrdset_find_localhost("system.ram");
88 if (unlikely(!st)) {
89 st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
90
@@ -113,7 +113,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
113 // --------------------------------------------------------------------
114
115 if (likely(do_swapio)) {
116 - st = rrdset_find("system.swapio");
116 + st = rrdset_find_localhost("system.swapio");
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
@@ -130,7 +130,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
130 // --------------------------------------------------------------------
131
132 if (likely(do_pgfaults)) {
133 - st = rrdset_find("mem.pgfaults");
133 + st = rrdset_find_localhost("mem.pgfaults");
134 if (unlikely(!st)) {
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;
src/macos_sysctl.c
+31 -31
@@ -215,7 +215,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
215 error("DISABLED: system.load");
216 } else {
217
218 - st = rrdset_find_bytype("system", "load");
218 + st = rrdset_find_bytype_localhost("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_ALGORITHM_ABSOLUTE);
@@ -242,7 +242,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
242 do_swap = 0;
243 error("DISABLED: system.swap");
244 } else {
245 - st = rrdset_find("system.swap");
245 + st = rrdset_find_localhost("system.swap");
246 if (unlikely(!st)) {
247 st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
248 st->isdetail = 1;
@@ -291,7 +291,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
291 iftot.ift_obytes += if2m->ifm_data.ifi_obytes;
292 }
293 }
294 - st = rrdset_find("system.ipv4");
294 + st = rrdset_find_localhost("system.ipv4");
295 if (unlikely(!st)) {
296 st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
297
@@ -328,7 +328,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
328 error("DISABLED: ipv4.ecnpkts");
329 } else {
330 if (likely(do_tcp_packets)) {
331 - st = rrdset_find("ipv4.tcppackets");
331 + st = rrdset_find_localhost("ipv4.tcppackets");
332 if (unlikely(!st)) {
333 st = rrdset_create("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets",
334 "packets/s",
@@ -347,7 +347,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
347 // --------------------------------------------------------------------
348
349 if (likely(do_tcp_errors)) {
350 - st = rrdset_find("ipv4.tcperrors");
350 + st = rrdset_find_localhost("ipv4.tcperrors");
351 if (unlikely(!st)) {
352 st = rrdset_create("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
353 "packets/s",
@@ -369,7 +369,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
369 // --------------------------------------------------------------------
370
371 if (likely(do_tcp_handshake)) {
372 - st = rrdset_find("ipv4.tcphandshake");
372 + st = rrdset_find_localhost("ipv4.tcphandshake");
373 if (unlikely(!st)) {
374 st = rrdset_create("ipv4", "tcphandshake", NULL, "tcp", NULL,
375 "IPv4 TCP Handshake Issues",
@@ -394,7 +394,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
394
395 if (do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop))) {
396 do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
397 - st = rrdset_find("ipv4.tcpconnaborts");
397 + st = rrdset_find_localhost("ipv4.tcpconnaborts");
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
@@ -416,7 +416,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
416
417 if (do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && tcpstat.tcps_rcvoopack)) {
418 do_tcpext_ofo = CONFIG_ONDEMAND_YES;
419 - st = rrdset_find("ipv4.tcpofo");
419 + st = rrdset_find_localhost("ipv4.tcpofo");
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
@@ -433,7 +433,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
433 if (do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
434 do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
435
436 - st = rrdset_find("ipv4.tcpsyncookies");
436 + st = rrdset_find_localhost("ipv4.tcpsyncookies");
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
@@ -453,7 +453,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
453
454 if (do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_ecn_recv_ce || tcpstat.tcps_ecn_not_supported))) {
455 do_ecn = CONFIG_ONDEMAND_YES;
456 - st = rrdset_find("ipv4.ecnpkts");
456 + st = rrdset_find_localhost("ipv4.ecnpkts");
457 if (unlikely(!st)) {
458 st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
459 st->isdetail = 1;
@@ -482,7 +482,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
482 error("DISABLED: ipv4.udperrors");
483 } else {
484 if (likely(do_udp_packets)) {
485 - st = rrdset_find("ipv4.udppackets");
485 + st = rrdset_find_localhost("ipv4.udppackets");
486 if (unlikely(!st)) {
487 st = rrdset_create("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets",
488 "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
@@ -500,7 +500,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
500 // --------------------------------------------------------------------
501
502 if (likely(do_udp_errors)) {
503 - st = rrdset_find("ipv4.udperrors");
503 + st = rrdset_find_localhost("ipv4.udperrors");
504 if (unlikely(!st)) {
505 st = rrdset_create("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
506 2701, update_every, RRDSET_TYPE_LINE);
@@ -543,7 +543,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
543 // --------------------------------------------------------------------
544
545 if (likely(do_icmp_packets)) {
546 - st = rrdset_find("ipv4.icmp");
546 + st = rrdset_find_localhost("ipv4.icmp");
547 if (unlikely(!st)) {
548 st = rrdset_create("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s",
549 2602,
@@ -561,7 +561,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
561
562 // --------------------------------------------------------------------
563
564 - st = rrdset_find("ipv4.icmp_errors");
564 + st = rrdset_find_localhost("ipv4.icmp_errors");
565 if (unlikely(!st)) {
566 st = rrdset_create("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors",
567 "packets/s",
@@ -583,7 +583,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
583 // --------------------------------------------------------------------
584
585 if (likely(do_icmpmsg)) {
586 - st = rrdset_find("ipv4.icmpmsg");
586 + st = rrdset_find_localhost("ipv4.icmpmsg");
587 if (unlikely(!st)) {
588 st = rrdset_create("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages",
589 "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
@@ -620,7 +620,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
620 error("DISABLED: ipv4.errors");
621 } else {
622 if (likely(do_ip_packets)) {
623 - st = rrdset_find("ipv4.packets");
623 + st = rrdset_find_localhost("ipv4.packets");
624 if (unlikely(!st)) {
625 st = rrdset_create("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s",
626 3000, update_every, RRDSET_TYPE_LINE);
@@ -642,7 +642,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
642 // --------------------------------------------------------------------
643
644 if (likely(do_ip_fragsout)) {
645 - st = rrdset_find("ipv4.fragsout");
645 + st = rrdset_find_localhost("ipv4.fragsout");
646 if (unlikely(!st)) {
647 st = rrdset_create("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
648 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
@@ -663,7 +663,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
663 // --------------------------------------------------------------------
664
665 if (likely(do_ip_fragsin)) {
666 - st = rrdset_find("ipv4.fragsin");
666 + st = rrdset_find_localhost("ipv4.fragsin");
667 if (unlikely(!st)) {
668 st = rrdset_create("ipv4", "fragsin", NULL, "fragments", NULL,
669 "IPv4 Fragments Reassembly",
@@ -685,7 +685,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
685 // --------------------------------------------------------------------
686
687 if (likely(do_ip_errors)) {
688 - st = rrdset_find("ipv4.errors");
688 + st = rrdset_find_localhost("ipv4.errors");
689 if (unlikely(!st)) {
690 st = rrdset_create("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
691 3002,
@@ -731,7 +731,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
731 (ip6stat.ip6s_localout || ip6stat.ip6s_total ||
732 ip6stat.ip6s_forward || ip6stat.ip6s_delivered))) {
733 do_ip6_packets = CONFIG_ONDEMAND_YES;
734 - st = rrdset_find("ipv6.packets");
734 + st = rrdset_find_localhost("ipv6.packets");
735 if (unlikely(!st)) {
736 st = rrdset_create("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
737 update_every, RRDSET_TYPE_LINE);
@@ -756,7 +756,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
756 (ip6stat.ip6s_fragmented || ip6stat.ip6s_cantfrag ||
757 ip6stat.ip6s_ofragments))) {
758 do_ip6_fragsout = CONFIG_ONDEMAND_YES;
759 - st = rrdset_find("ipv6.fragsout");
759 + st = rrdset_find_localhost("ipv6.fragsout");
760 if (unlikely(!st)) {
761 st = rrdset_create("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
762 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
@@ -780,7 +780,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
780 (ip6stat.ip6s_reassembled || ip6stat.ip6s_fragdropped ||
781 ip6stat.ip6s_fragtimeout || ip6stat.ip6s_fragments))) {
782 do_ip6_fragsin = CONFIG_ONDEMAND_YES;
783 - st = rrdset_find("ipv6.fragsin");
783 + st = rrdset_find_localhost("ipv6.fragsin");
784 if (unlikely(!st)) {
785 st = rrdset_create("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
786 "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
@@ -813,7 +813,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
813 ip6stat.ip6s_cantforward ||
814 ip6stat.ip6s_noroute))) {
815 do_ip6_errors = CONFIG_ONDEMAND_YES;
816 - st = rrdset_find("ipv6.errors");
816 + st = rrdset_find_localhost("ipv6.errors");
817 if (unlikely(!st)) {
818 st = rrdset_create("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
819 update_every, RRDSET_TYPE_LINE);
@@ -860,7 +860,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
860 icmp6_total.msgs_in += icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort;
861 if (do_icmp6 == CONFIG_ONDEMAND_YES || (do_icmp6 == CONFIG_ONDEMAND_ONDEMAND && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
862 do_icmp6 = CONFIG_ONDEMAND_YES;
863 - st = rrdset_find("ipv6.icmp");
863 + st = rrdset_find_localhost("ipv6.icmp");
864 if (unlikely(!st)) {
865 st = rrdset_create("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
866 "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
@@ -879,7 +879,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
879
880 if (do_icmp6_redir == CONFIG_ONDEMAND_YES || (do_icmp6_redir == CONFIG_ONDEMAND_ONDEMAND && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
881 do_icmp6_redir = CONFIG_ONDEMAND_YES;
882 - st = rrdset_find("ipv6.icmpredir");
882 + st = rrdset_find_localhost("ipv6.icmpredir");
883 if (unlikely(!st)) {
884 st = rrdset_create("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
885 "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
@@ -909,7 +909,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
909 icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
910 icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB]))) {
911 do_icmp6_errors = CONFIG_ONDEMAND_YES;
912 - st = rrdset_find("ipv6.icmperrors");
912 + st = rrdset_find_localhost("ipv6.icmperrors");
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
@@ -948,7 +948,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
948 icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
949 icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY]))) {
950 do_icmp6_echos = CONFIG_ONDEMAND_YES;
951 - st = rrdset_find("ipv6.icmpechos");
951 + st = rrdset_find_localhost("ipv6.icmpechos");
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
@@ -974,7 +974,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
974 icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
975 icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT]))) {
976 do_icmp6_router = CONFIG_ONDEMAND_YES;
977 - st = rrdset_find("ipv6.icmprouter");
977 + st = rrdset_find_localhost("ipv6.icmprouter");
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
@@ -1000,7 +1000,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1000 icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
1001 icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]))) {
1002 do_icmp6_neighbor = CONFIG_ONDEMAND_YES;
1003 - st = rrdset_find("ipv6.icmpneighbor");
1003 + st = rrdset_find_localhost("ipv6.icmpneighbor");
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
@@ -1032,7 +1032,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1032 icmp6stat.icp6s_outhist[135] ||
1033 icmp6stat.icp6s_outhist[136]))) {
1034 do_icmp6_types = CONFIG_ONDEMAND_YES;
1035 - st = rrdset_find("ipv6.icmptypes");
1035 + st = rrdset_find_localhost("ipv6.icmptypes");
1036 if (unlikely(!st)) {
1037 st = rrdset_create("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
1038 "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
@@ -1073,7 +1073,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1073 error("DISABLED: system.uptime");
1074 } else {
1075 clock_gettime(CLOCK_REALTIME, &cur_time);
1076 - st = rrdset_find("system.uptime");
1076 + st = rrdset_find_localhost("system.uptime");
1077
1078 if(unlikely(!st)) {
1079 st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
src/plugin_checks.c
+1 -1
@@ -68,7 +68,7 @@ void *checks_main(void *ptr) {
68 // --------------------------------------------------------------------
69 // check chart 3
70
71 - if(!apps_cpu) apps_cpu = rrdset_find("apps.cpu");
71 + if(!apps_cpu) apps_cpu = rrdset_find_localhost("apps.cpu");
72 if(check3->counter_done) rrdset_next_usec(check3, loop_usec);
73 now_realtime_timeval(&loop);
74 rrddim_set(check3, "caller", (long long) dt_usec(&loop, &check1->last_collected_time));
src/plugin_idlejitter.c
+1 -1
@@ -19,7 +19,7 @@ void *cpuidlejitter_main(void *ptr) {
19 sleep_ms = CPU_IDLEJITTER_SLEEP_TIME_MS;
20 }
21
22 - RRDSET *st = rrdset_find("system.idlejitter");
22 + RRDSET *st = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
src/plugin_proc.c
+1 -1
@@ -112,7 +112,7 @@ void *proc_main(void *ptr) {
112 static RRDSET *st = NULL;
113
114 if(unlikely(!st)) {
115 - st = rrdset_find_bytype("netdata", "plugin_proc_modules");
115 + st = rrdset_find_bytype_localhost("netdata", "plugin_proc_modules");
116
117 if(!st) {
118 st = rrdset_create("netdata", "plugin_proc_modules", NULL, "proc", NULL, "NetData Proc Plugin Modules Durations", "milliseconds/run", 132001, rrd_update_every, RRDSET_TYPE_STACKED);
src/plugin_proc_diskspace.c
+4 -4
@@ -153,7 +153,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
153 if(do_space == CONFIG_ONDEMAND_YES || (do_space == CONFIG_ONDEMAND_ONDEMAND && (bavail || breserved_root || bused))) {
154 if(unlikely(!m->st_space)) {
155 m->do_space = CONFIG_ONDEMAND_YES;
156 - m->st_space = rrdset_find_bytype("disk_space", disk);
156 + m->st_space = rrdset_find_bytype_localhost("disk_space", disk);
157 if(unlikely(!m->st_space)) {
158 char title[4096 + 1];
159 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", family, mi->mount_source);
@@ -180,7 +180,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
180 if(do_inodes == CONFIG_ONDEMAND_YES || (do_inodes == CONFIG_ONDEMAND_ONDEMAND && (favail || freserved_root || fused))) {
181 if(unlikely(!m->st_inodes)) {
182 m->do_inodes = CONFIG_ONDEMAND_YES;
183 - m->st_inodes = rrdset_find_bytype("disk_inodes", disk);
183 + m->st_inodes = rrdset_find_bytype_localhost("disk_inodes", disk);
184 if(unlikely(!m->st_inodes)) {
185 char title[4096 + 1];
186 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", family, mi->mount_source);
@@ -272,7 +272,7 @@ void *proc_diskspace_main(void *ptr) {
272 getrusage(RUSAGE_THREAD, &thread);
273
274 if(!stcpu_thread) {
275 - stcpu_thread = rrdset_find("netdata.plugin_diskspace");
275 + stcpu_thread = rrdset_find_localhost("netdata.plugin_diskspace");
276 if(!stcpu_thread) stcpu_thread = rrdset_create("netdata", "plugin_diskspace", NULL, "diskspace", NULL
277 , "NetData Disk Space Plugin CPU usage", "milliseconds/s", 132020
278 , update_every, RRDSET_TYPE_STACKED);
@@ -290,7 +290,7 @@ void *proc_diskspace_main(void *ptr) {
290 // ----------------------------------------------------------------
291
292 if(!st_duration) {
293 - st_duration = rrdset_find("netdata.plugin_diskspace_dt");
293 + st_duration = rrdset_find_localhost("netdata.plugin_diskspace_dt");
294 if(!st_duration) st_duration = rrdset_create("netdata", "plugin_diskspace_dt", NULL, "diskspace", NULL
295 , "NetData Disk Space Plugin Duration", "milliseconds/run", 132021
296 , update_every, RRDSET_TYPE_AREA);
src/plugin_tc.c
+2 -2
@@ -974,7 +974,7 @@ void *tc_main(void *ptr) {
974 // debug(D_TC_LOOP, "WORKTIME line '%s' '%s'", words[1], words[2]);
975 getrusage(RUSAGE_THREAD, &thread);
976
977 - if(unlikely(!stcpu)) stcpu = rrdset_find("netdata.plugin_tc_cpu");
977 + if(unlikely(!stcpu)) stcpu = rrdset_find_localhost("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_ALGORITHM_INCREMENTAL);
@@ -986,7 +986,7 @@ void *tc_main(void *ptr) {
986 rrddim_set(stcpu, "system", thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
987 rrdset_done(stcpu);
988
989 - if(unlikely(!sttime)) stcpu = rrdset_find("netdata.plugin_tc_time");
989 + if(unlikely(!sttime)) stcpu = rrdset_find_localhost("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_ALGORITHM_ABSOLUTE);
src/plugins_d.c
+2 -2
@@ -175,7 +175,7 @@ void *pluginsd_worker_thread(void *arg)
175 break;
176 }
177
178 - st = rrdset_find(id);
178 + st = rrdset_find_localhost(id);
179 if(unlikely(!st)) {
180 error("PLUGINSD: '%s' is requesting a BEGIN on chart '%s', which does not exist. Disabling it.", cd->fullfilename, id);
181 cd->enabled = 0;
@@ -252,7 +252,7 @@ void *pluginsd_worker_thread(void *arg)
252 if(unlikely(!family || !*family)) family = NULL;
253 if(unlikely(!context || !*context)) context = NULL;
254
255 - st = rrdset_find_bytype(type, id);
255 + st = rrdset_find_bytype_localhost(type, id);
256 if(unlikely(!st)) {
257 debug(D_PLUGINSD, "PLUGINSD: Creating chart type='%s', id='%s', name='%s', family='%s', context='%s', chart='%s', priority=%d, update_every=%d"
258 , type, id
src/proc_diskstats.c
+10 -10
@@ -417,7 +417,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
417 if(d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) {
418 d->do_io = CONFIG_ONDEMAND_YES;
419
420 - st = rrdset_find_bytype(RRD_TYPE_DISK, disk);
420 + st = rrdset_find_bytype_localhost(RRD_TYPE_DISK, disk);
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
@@ -436,7 +436,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
436 if(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes))) {
437 d->do_ops = CONFIG_ONDEMAND_YES;
438
439 - st = rrdset_find_bytype("disk_ops", disk);
439 + st = rrdset_find_bytype_localhost("disk_ops", disk);
440 if(unlikely(!st)) {
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;
@@ -456,7 +456,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
456 if(d->do_qops == CONFIG_ONDEMAND_YES || (d->do_qops == CONFIG_ONDEMAND_ONDEMAND && queued_ios)) {
457 d->do_qops = CONFIG_ONDEMAND_YES;
458
459 - st = rrdset_find_bytype("disk_qops", disk);
459 + st = rrdset_find_bytype_localhost("disk_qops", disk);
460 if(unlikely(!st)) {
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;
@@ -474,7 +474,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
474 if(d->do_backlog == CONFIG_ONDEMAND_YES || (d->do_backlog == CONFIG_ONDEMAND_ONDEMAND && backlog_ms)) {
475 d->do_backlog = CONFIG_ONDEMAND_YES;
476
477 - st = rrdset_find_bytype("disk_backlog", disk);
477 + st = rrdset_find_bytype_localhost("disk_backlog", disk);
478 if(unlikely(!st)) {
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;
@@ -492,7 +492,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
492 if(d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) {
493 d->do_util = CONFIG_ONDEMAND_YES;
494
495 - st = rrdset_find_bytype("disk_util", disk);
495 + st = rrdset_find_bytype_localhost("disk_util", disk);
496 if(unlikely(!st)) {
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;
@@ -510,7 +510,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
510 if(d->do_mops == CONFIG_ONDEMAND_YES || (d->do_mops == CONFIG_ONDEMAND_ONDEMAND && (mreads || mwrites))) {
511 d->do_mops = CONFIG_ONDEMAND_YES;
512
513 - st = rrdset_find_bytype("disk_mops", disk);
513 + st = rrdset_find_bytype_localhost("disk_mops", disk);
514 if(unlikely(!st)) {
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;
@@ -530,7 +530,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
530 if(d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) {
531 d->do_iotime = CONFIG_ONDEMAND_YES;
532
533 - st = rrdset_find_bytype("disk_iotime", disk);
533 + st = rrdset_find_bytype_localhost("disk_iotime", disk);
534 if(unlikely(!st)) {
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;
@@ -552,7 +552,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
552 if(likely(dt)) {
553 if( (d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) &&
554 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
555 - st = rrdset_find_bytype("disk_await", disk);
555 + st = rrdset_find_bytype_localhost("disk_await", disk);
556 if(unlikely(!st)) {
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;
@@ -569,7 +569,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
569
570 if( (d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) &&
571 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
572 - st = rrdset_find_bytype("disk_avgsz", disk);
572 + st = rrdset_find_bytype_localhost("disk_avgsz", disk);
573 if(unlikely(!st)) {
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;
@@ -586,7 +586,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
586
587 if( (d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) &&
588 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
589 - st = rrdset_find_bytype("disk_svctm", disk);
589 + st = rrdset_find_bytype_localhost("disk_svctm", disk);
590 if(unlikely(!st)) {
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;
src/proc_interrupts.c
+2 -2
@@ -146,7 +146,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {
146
147 // --------------------------------------------------------------------
148
149 - st = rrdset_find_bytype("system", "interrupts");
149 + st = rrdset_find_bytype_localhost("system", "interrupts");
150 if(unlikely(!st)) st = rrdset_create("system", "interrupts", NULL, "interrupts", NULL, "System interrupts", "interrupts/s", 1000, update_every, RRDSET_TYPE_STACKED);
151 else rrdset_next(st);
152
@@ -181,7 +181,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {
181 char id[50+1];
182 snprintfz(id, 50, "cpu%d_interrupts", c);
183
184 - st = rrdset_find_bytype("cpu", id);
184 + st = rrdset_find_bytype_localhost("cpu", id);
185 if(unlikely(!st)) {
186 char title[100+1];
187 snprintfz(title, 100, "CPU%d Interrupts", c);
src/proc_loadavg.c
+2 -2
@@ -50,7 +50,7 @@ int do_proc_loadavg(int update_every, usec_t dt) {
50 if(next_loadavg_dt <= dt) {
51 if(likely(do_loadavg)) {
52 if(unlikely(!load_chart)) {
53 - load_chart = rrdset_find_byname("system.load");
53 + load_chart = rrdset_find_byname_localhost("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_ALGORITHM_ABSOLUTE);
@@ -75,7 +75,7 @@ int do_proc_loadavg(int update_every, usec_t dt) {
75
76 if(likely(do_all_processes)) {
77 if(unlikely(!processes_chart)) {
78 - processes_chart = rrdset_find_byname("system.active_processes");
78 + processes_chart = rrdset_find_byname_localhost("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_ALGORITHM_ABSOLUTE);
src/proc_meminfo.c
+7 -7
@@ -140,7 +140,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
140 unsigned long long MemUsed = MemTotal - MemFree - Cached - Buffers;
141
142 if(do_ram) {
143 - st = rrdset_find("system.ram");
143 + st = rrdset_find_localhost("system.ram");
144 if(!st) {
145 st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
146
@@ -165,7 +165,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
165 if(SwapTotal || SwapUsed || SwapFree || do_swap == CONFIG_ONDEMAND_YES) {
166 do_swap = CONFIG_ONDEMAND_YES;
167
168 - st = rrdset_find("system.swap");
168 + st = rrdset_find_localhost("system.swap");
169 if(!st) {
170 st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
171 st->isdetail = 1;
@@ -185,7 +185,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
185 if(arl_hwcorrupted->flags & ARL_ENTRY_FLAG_FOUND && (do_hwcorrupt == CONFIG_ONDEMAND_YES || (do_hwcorrupt == CONFIG_ONDEMAND_ONDEMAND && HardwareCorrupted > 0))) {
186 do_hwcorrupt = CONFIG_ONDEMAND_YES;
187
188 - st = rrdset_find("mem.hwcorrupt");
188 + st = rrdset_find_localhost("mem.hwcorrupt");
189 if(!st) {
190 st = rrdset_create("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000, update_every, RRDSET_TYPE_LINE);
191 st->isdetail = 1;
@@ -201,7 +201,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
201 // --------------------------------------------------------------------
202
203 if(do_committed) {
204 - st = rrdset_find("mem.committed");
204 + st = rrdset_find_localhost("mem.committed");
205 if(!st) {
206 st = rrdset_create("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
207 st->isdetail = 1;
@@ -217,7 +217,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
217 // --------------------------------------------------------------------
218
219 if(do_writeback) {
220 - st = rrdset_find("mem.writeback");
220 + st = rrdset_find_localhost("mem.writeback");
221 if(!st) {
222 st = rrdset_create("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000, update_every, RRDSET_TYPE_LINE);
223 st->isdetail = 1;
@@ -241,7 +241,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
241 // --------------------------------------------------------------------
242
243 if(do_kernel) {
244 - st = rrdset_find("mem.kernel");
244 + st = rrdset_find_localhost("mem.kernel");
245 if(!st) {
246 st = rrdset_create("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000, update_every, RRDSET_TYPE_STACKED);
247 st->isdetail = 1;
@@ -263,7 +263,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
263 // --------------------------------------------------------------------
264
265 if(do_slab) {
266 - st = rrdset_find("mem.slab");
266 + st = rrdset_find_localhost("mem.slab");
267 if(!st) {
268 st = rrdset_create("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500, update_every, RRDSET_TYPE_STACKED);
269 st->isdetail = 1;
src/proc_net_dev.c
+7 -7
@@ -223,7 +223,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
223
224 if(d->do_bandwidth == CONFIG_ONDEMAND_YES) {
225 if(unlikely(!d->st_bandwidth)) {
226 - d->st_bandwidth = rrdset_find_bytype("net", d->name);
226 + d->st_bandwidth = rrdset_find_bytype_localhost("net", d->name);
227
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);
@@ -245,7 +245,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
245
246 if(d->do_packets == CONFIG_ONDEMAND_YES) {
247 if(unlikely(!d->st_packets)) {
248 - d->st_packets = rrdset_find_bytype("net_packets", d->name);
248 + d->st_packets = rrdset_find_bytype_localhost("net_packets", d->name);
249
250 if(!d->st_packets)
251 d->st_packets = rrdset_create("net_packets", d->name, NULL, d->name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
@@ -271,7 +271,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
271
272 if(d->do_errors == CONFIG_ONDEMAND_YES) {
273 if(unlikely(!d->st_errors)) {
274 - d->st_errors = rrdset_find_bytype("net_errors", d->name);
274 + d->st_errors = rrdset_find_bytype_localhost("net_errors", d->name);
275
276 if(!d->st_errors)
277 d->st_errors = rrdset_create("net_errors", d->name, NULL, d->name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
@@ -295,7 +295,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
295
296 if(d->do_drops == CONFIG_ONDEMAND_YES) {
297 if(unlikely(!d->st_drops)) {
298 - d->st_drops = rrdset_find_bytype("net_drops", d->name);
298 + d->st_drops = rrdset_find_bytype_localhost("net_drops", d->name);
299
300 if(!d->st_drops)
301 d->st_drops = rrdset_create("net_drops", d->name, NULL, d->name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
@@ -319,7 +319,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
319
320 if(d->do_fifo == CONFIG_ONDEMAND_YES) {
321 if(unlikely(!d->st_fifo)) {
322 - d->st_fifo = rrdset_find_bytype("net_fifo", d->name);
322 + d->st_fifo = rrdset_find_bytype_localhost("net_fifo", d->name);
323
324 if(!d->st_fifo)
325 d->st_fifo = rrdset_create("net_fifo", d->name, NULL, d->name, "net.fifo", "Interface FIFO Buffer Errors", "errors", 7004, update_every, RRDSET_TYPE_LINE);
@@ -343,7 +343,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
343
344 if(d->do_compressed == CONFIG_ONDEMAND_YES) {
345 if(unlikely(!d->st_compressed)) {
346 - d->st_compressed = rrdset_find_bytype("net_compressed", d->name);
346 + d->st_compressed = rrdset_find_bytype_localhost("net_compressed", d->name);
347 if(!d->st_compressed)
348 d->st_compressed = rrdset_create("net_compressed", d->name, NULL, d->name, "net.compressed", "Compressed Packets", "packets/s", 7005, update_every, RRDSET_TYPE_LINE);
349
@@ -366,7 +366,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
366
367 if(d->do_events == CONFIG_ONDEMAND_YES) {
368 if(unlikely(!d->st_events)) {
369 - d->st_events = rrdset_find_bytype("net_events", d->name);
369 + d->st_events = rrdset_find_bytype_localhost("net_events", d->name);
370 if(!d->st_events)
371 d->st_events = rrdset_create("net_events", d->name, NULL, d->name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
372
src/proc_net_ip_vs_stats.c
+3 -3
@@ -40,7 +40,7 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
40 // --------------------------------------------------------------------
41
42 if(do_sockets) {
43 - st = rrdset_find(RRD_TYPE_NET_IPVS ".sockets");
43 + st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".sockets");
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
@@ -55,7 +55,7 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
55 // --------------------------------------------------------------------
56
57 if(do_packets) {
58 - st = rrdset_find(RRD_TYPE_NET_IPVS ".packets");
58 + st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".packets");
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
@@ -72,7 +72,7 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
72 // --------------------------------------------------------------------
73
74 if(do_bandwidth) {
75 - st = rrdset_find(RRD_TYPE_NET_IPVS ".net");
75 + st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".net");
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
src/proc_net_netstat.c
+12 -12
@@ -230,7 +230,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
230
231 if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (ipext_InOctets || ipext_OutOctets))) {
232 do_bandwidth = CONFIG_ONDEMAND_YES;
233 - st = rrdset_find("system.ipv4");
233 + st = rrdset_find_localhost("system.ipv4");
234 if(unlikely(!st)) {
235 st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
236
@@ -248,7 +248,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
248
249 if(do_inerrors == CONFIG_ONDEMAND_YES || (do_inerrors == CONFIG_ONDEMAND_ONDEMAND && (ipext_InNoRoutes || ipext_InTruncatedPkts))) {
250 do_inerrors = CONFIG_ONDEMAND_YES;
251 - st = rrdset_find("ipv4.inerrors");
251 + st = rrdset_find_localhost("ipv4.inerrors");
252 if(unlikely(!st)) {
253 st = rrdset_create("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors", "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
254 st->isdetail = 1;
@@ -269,7 +269,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
269
270 if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (ipext_InMcastOctets || ipext_OutMcastOctets))) {
271 do_mcast = CONFIG_ONDEMAND_YES;
272 - st = rrdset_find("ipv4.mcast");
272 + st = rrdset_find_localhost("ipv4.mcast");
273 if(unlikely(!st)) {
274 st = rrdset_create("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
275 st->isdetail = 1;
@@ -288,7 +288,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
288
289 if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (ipext_InBcastOctets || ipext_OutBcastOctets))) {
290 do_bcast = CONFIG_ONDEMAND_YES;
291 - st = rrdset_find("ipv4.bcast");
291 + st = rrdset_find_localhost("ipv4.bcast");
292 if(unlikely(!st)) {
293 st = rrdset_create("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
294 st->isdetail = 1;
@@ -307,7 +307,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
307
308 if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (ipext_InMcastPkts || ipext_OutMcastPkts))) {
309 do_mcast_p = CONFIG_ONDEMAND_YES;
310 - st = rrdset_find("ipv4.mcastpkts");
310 + st = rrdset_find_localhost("ipv4.mcastpkts");
311 if(unlikely(!st)) {
312 st = rrdset_create("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets", "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
313 st->isdetail = 1;
@@ -326,7 +326,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
326
327 if(do_bcast_p == CONFIG_ONDEMAND_YES || (do_bcast_p == CONFIG_ONDEMAND_ONDEMAND && (ipext_InBcastPkts || ipext_OutBcastPkts))) {
328 do_bcast_p = CONFIG_ONDEMAND_YES;
329 - st = rrdset_find("ipv4.bcastpkts");
329 + st = rrdset_find_localhost("ipv4.bcastpkts");
330 if(unlikely(!st)) {
331 st = rrdset_create("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets", "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
332 st->isdetail = 1;
@@ -345,7 +345,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
345
346 if(do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (ipext_InCEPkts || ipext_InECT0Pkts || ipext_InECT1Pkts || ipext_InNoECTPkts))) {
347 do_ecn = CONFIG_ONDEMAND_YES;
348 - st = rrdset_find("ipv4.ecnpkts");
348 + st = rrdset_find_localhost("ipv4.ecnpkts");
349 if(unlikely(!st)) {
350 st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
351 st->isdetail = 1;
@@ -381,7 +381,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
381
382 if(do_tcpext_memory == CONFIG_ONDEMAND_YES || (do_tcpext_memory == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPMemoryPressures))) {
383 do_tcpext_memory = CONFIG_ONDEMAND_YES;
384 - st = rrdset_find("ipv4.tcpmemorypressures");
384 + st = rrdset_find_localhost("ipv4.tcpmemorypressures");
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
@@ -397,7 +397,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
397
398 if(do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPAbortOnData || tcpext_TCPAbortOnClose || tcpext_TCPAbortOnMemory || tcpext_TCPAbortOnTimeout || tcpext_TCPAbortOnLinger || tcpext_TCPAbortFailed))) {
399 do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
400 - st = rrdset_find("ipv4.tcpconnaborts");
400 + st = rrdset_find_localhost("ipv4.tcpconnaborts");
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
@@ -422,7 +422,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
422
423 if(do_tcpext_reorder == CONFIG_ONDEMAND_YES || (do_tcpext_reorder == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPRenoReorder || tcpext_TCPFACKReorder || tcpext_TCPSACKReorder || tcpext_TCPTSReorder))) {
424 do_tcpext_reorder = CONFIG_ONDEMAND_YES;
425 - st = rrdset_find("ipv4.tcpreorders");
425 + st = rrdset_find_localhost("ipv4.tcpreorders");
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
@@ -444,7 +444,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
444
445 if(do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPOFOQueue || tcpext_TCPOFODrop || tcpext_TCPOFOMerge))) {
446 do_tcpext_ofo = CONFIG_ONDEMAND_YES;
447 - st = rrdset_find("ipv4.tcpofo");
447 + st = rrdset_find_localhost("ipv4.tcpofo");
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
@@ -466,7 +466,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
466
467 if(do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpext_SyncookiesSent || tcpext_SyncookiesRecv || tcpext_SyncookiesFailed))) {
468 do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
469 - st = rrdset_find("ipv4.tcpsyncookies");
469 + st = rrdset_find_localhost("ipv4.tcpsyncookies");
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
src/proc_net_rpc_nfs.c
+5 -5
@@ -269,7 +269,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
269 // --------------------------------------------------------------------
270
271 if(do_net == 2) {
272 - st = rrdset_find_bytype("nfs", "net");
272 + st = rrdset_find_bytype_localhost("nfs", "net");
273 if(!st) {
274 st = rrdset_create("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007, update_every, RRDSET_TYPE_STACKED);
275 st->isdetail = 1;
@@ -291,7 +291,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
291 // --------------------------------------------------------------------
292
293 if(do_rpc == 2) {
294 - st = rrdset_find_bytype("nfs", "rpc");
294 + st = rrdset_find_bytype_localhost("nfs", "rpc");
295 if(!st) {
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;
@@ -312,7 +312,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
312
313 if(do_proc2 == 2) {
314 unsigned int i;
315 - st = rrdset_find_bytype("nfs", "proc2");
315 + st = rrdset_find_bytype_localhost("nfs", "proc2");
316 if(!st) {
317 st = rrdset_create("nfs", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Client Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
318
@@ -331,7 +331,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
331
332 if(do_proc3 == 2) {
333 unsigned int i;
334 - st = rrdset_find_bytype("nfs", "proc3");
334 + st = rrdset_find_bytype_localhost("nfs", "proc3");
335 if(!st) {
336 st = rrdset_create("nfs", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Client Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
337
@@ -350,7 +350,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
350
351 if(do_proc4 == 2) {
352 unsigned int i;
353 - st = rrdset_find_bytype("nfs", "proc4");
353 + st = rrdset_find_bytype_localhost("nfs", "proc4");
354 if(!st) {
355 st = rrdset_create("nfs", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Client Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
356
src/proc_net_rpc_nfsd.c
+13 -13
@@ -492,7 +492,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
492 // --------------------------------------------------------------------
493
494 if(do_rc == 2) {
495 - st = rrdset_find_bytype("nfsd", "readcache");
495 + st = rrdset_find_bytype_localhost("nfsd", "readcache");
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
@@ -511,7 +511,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
511 // --------------------------------------------------------------------
512
513 if(do_fh == 2) {
514 - st = rrdset_find_bytype("nfsd", "filehandles");
514 + st = rrdset_find_bytype_localhost("nfsd", "filehandles");
515 if(!st) {
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;
@@ -535,7 +535,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
535 // --------------------------------------------------------------------
536
537 if(do_io == 2) {
538 - st = rrdset_find_bytype("nfsd", "io");
538 + st = rrdset_find_bytype_localhost("nfsd", "io");
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
@@ -552,7 +552,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
552 // --------------------------------------------------------------------
553
554 if(do_th == 2) {
555 - st = rrdset_find_bytype("nfsd", "threads");
555 + st = rrdset_find_bytype_localhost("nfsd", "threads");
556 if(!st) {
557 st = rrdset_create("nfsd", "threads", NULL, "threads", NULL, "NFS Server Threads", "threads", 5003, update_every, RRDSET_TYPE_LINE);
558
@@ -563,7 +563,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
563 rrddim_set(st, "threads", th_threads);
564 rrdset_done(st);
565
566 - st = rrdset_find_bytype("nfsd", "threads_fullcnt");
566 + st = rrdset_find_bytype_localhost("nfsd", "threads_fullcnt");
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
@@ -574,7 +574,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
574 rrddim_set(st, "full_count", th_fullcnt);
575 rrdset_done(st);
576
577 - st = rrdset_find_bytype("nfsd", "threads_histogram");
577 + st = rrdset_find_bytype_localhost("nfsd", "threads_histogram");
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
@@ -607,7 +607,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
607 // --------------------------------------------------------------------
608
609 if(do_ra == 2) {
610 - st = rrdset_find_bytype("nfsd", "readahead");
610 + st = rrdset_find_bytype_localhost("nfsd", "readahead");
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
@@ -645,7 +645,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
645 // --------------------------------------------------------------------
646
647 if(do_net == 2) {
648 - st = rrdset_find_bytype("nfsd", "net");
648 + st = rrdset_find_bytype_localhost("nfsd", "net");
649 if(!st) {
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;
@@ -667,7 +667,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
667 // --------------------------------------------------------------------
668
669 if(do_rpc == 2) {
670 - st = rrdset_find_bytype("nfsd", "rpc");
670 + st = rrdset_find_bytype_localhost("nfsd", "rpc");
671 if(!st) {
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;
@@ -691,7 +691,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
691
692 if(do_proc2 == 2) {
693 unsigned int i;
694 - st = rrdset_find_bytype("nfsd", "proc2");
694 + st = rrdset_find_bytype_localhost("nfsd", "proc2");
695 if(!st) {
696 st = rrdset_create("nfsd", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Server Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
697
@@ -710,7 +710,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
710
711 if(do_proc3 == 2) {
712 unsigned int i;
713 - st = rrdset_find_bytype("nfsd", "proc3");
713 + st = rrdset_find_bytype_localhost("nfsd", "proc3");
714 if(!st) {
715 st = rrdset_create("nfsd", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Server Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
716
@@ -729,7 +729,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
729
730 if(do_proc4 == 2) {
731 unsigned int i;
732 - st = rrdset_find_bytype("nfsd", "proc4");
732 + st = rrdset_find_bytype_localhost("nfsd", "proc4");
733 if(!st) {
734 st = rrdset_create("nfsd", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Server Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
735
@@ -748,7 +748,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
748
749 if(do_proc4ops == 2) {
750 unsigned int i;
751 - st = rrdset_find_bytype("nfsd", "proc4ops");
751 + st = rrdset_find_bytype_localhost("nfsd", "proc4ops");
752 if(!st) {
753 st = rrdset_create("nfsd", "proc4ops", NULL, "nfsv2ops", NULL, "NFS v4 Server Operations", "operations/s", 5012, update_every, RRDSET_TYPE_STACKED);
754
src/proc_net_snmp.c
+15 -15
@@ -392,7 +392,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
392 // --------------------------------------------------------------------
393
394 if(do_ip_packets) {
395 - st = rrdset_find(RRD_TYPE_NET_SNMP ".packets");
395 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".packets");
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
@@ -413,7 +413,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
413 // --------------------------------------------------------------------
414
415 if(do_ip_fragsout) {
416 - st = rrdset_find(RRD_TYPE_NET_SNMP ".fragsout");
416 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsout");
417 if(!st) {
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;
@@ -433,7 +433,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
433 // --------------------------------------------------------------------
434
435 if(do_ip_fragsin) {
436 - st = rrdset_find(RRD_TYPE_NET_SNMP ".fragsin");
436 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsin");
437 if(!st) {
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;
@@ -453,7 +453,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
453 // --------------------------------------------------------------------
454
455 if(do_ip_errors) {
456 - st = rrdset_find(RRD_TYPE_NET_SNMP ".errors");
456 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".errors");
457 if(!st) {
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;
@@ -497,7 +497,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
497 // --------------------------------------------------------------------
498
499 if(do_icmp_packets) {
500 - st = rrdset_find(RRD_TYPE_NET_SNMP ".icmp");
500 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp");
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
@@ -511,7 +511,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
511
512 rrdset_done(st);
513
514 - st = rrdset_find(RRD_TYPE_NET_SNMP ".icmp_errors");
514 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp_errors");
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
@@ -543,7 +543,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
543 if(do_icmpmsg) {
544 int i;
545
546 - st = rrdset_find(RRD_TYPE_NET_SNMP ".icmpmsg");
546 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmpmsg");
547 if(!st) {
548 st = rrdset_create(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
549
@@ -578,7 +578,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
578
579 // see http://net-snmp.sourceforge.net/docs/mibs/tcp.html
580 if(do_tcp_sockets) {
581 - st = rrdset_find(RRD_TYPE_NET_SNMP ".tcpsock");
581 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcpsock");
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
@@ -593,7 +593,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
593 // --------------------------------------------------------------------
594
595 if(do_tcp_packets) {
596 - st = rrdset_find(RRD_TYPE_NET_SNMP ".tcppackets");
596 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcppackets");
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
@@ -610,7 +610,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
610 // --------------------------------------------------------------------
611
612 if(do_tcp_errors) {
613 - st = rrdset_find(RRD_TYPE_NET_SNMP ".tcperrors");
613 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcperrors");
614 if(!st) {
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;
@@ -630,7 +630,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
630 // --------------------------------------------------------------------
631
632 if(do_tcp_handshake) {
633 - st = rrdset_find(RRD_TYPE_NET_SNMP ".tcphandshake");
633 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcphandshake");
634 if(!st) {
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;
@@ -671,7 +671,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
671
672 // see http://net-snmp.sourceforge.net/docs/mibs/udp.html
673 if(do_udp_packets) {
674 - st = rrdset_find(RRD_TYPE_NET_SNMP ".udppackets");
674 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udppackets");
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
@@ -688,7 +688,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
688 // --------------------------------------------------------------------
689
690 if(do_udp_errors) {
691 - st = rrdset_find(RRD_TYPE_NET_SNMP ".udperrors");
691 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udperrors");
692 if(!st) {
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;
@@ -730,7 +730,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
730 // --------------------------------------------------------------------
731
732 if(do_udplite_packets) {
733 - st = rrdset_find(RRD_TYPE_NET_SNMP ".udplite");
733 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite");
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
@@ -743,7 +743,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
743 rrddim_set(st, "OutDatagrams", *udplite_OutDatagrams);
744 rrdset_done(st);
745
746 - st = rrdset_find(RRD_TYPE_NET_SNMP ".udplite_errors");
746 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite_errors");
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
src/proc_net_snmp6.c
+22 -22
@@ -278,7 +278,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
278
279 if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (Ip6InOctets || Ip6OutOctets))) {
280 do_bandwidth = CONFIG_ONDEMAND_YES;
281 - st = rrdset_find("system.ipv6");
281 + st = rrdset_find_localhost("system.ipv6");
282 if(unlikely(!st)) {
283 st = rrdset_create("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
284
@@ -296,7 +296,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
296
297 if(do_ip_packets == CONFIG_ONDEMAND_YES || (do_ip_packets == CONFIG_ONDEMAND_ONDEMAND && (Ip6InReceives || Ip6OutRequests || Ip6InDelivers || Ip6OutForwDatagrams))) {
298 do_ip_packets = CONFIG_ONDEMAND_YES;
299 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".packets");
299 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".packets");
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
@@ -318,7 +318,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
318
319 if(do_ip_fragsout == CONFIG_ONDEMAND_YES || (do_ip_fragsout == CONFIG_ONDEMAND_ONDEMAND && (Ip6FragOKs || Ip6FragFails || Ip6FragCreates))) {
320 do_ip_fragsout = CONFIG_ONDEMAND_YES;
321 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".fragsout");
321 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsout");
322 if(unlikely(!st)) {
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;
@@ -345,7 +345,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
345 || Ip6ReasmReqds
346 ))) {
347 do_ip_fragsin = CONFIG_ONDEMAND_YES;
348 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".fragsin");
348 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsin");
349 if(unlikely(!st)) {
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;
@@ -378,7 +378,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
378 || Ip6InNoRoutes
379 ))) {
380 do_ip_errors = CONFIG_ONDEMAND_YES;
381 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".errors");
381 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".errors");
382 if(unlikely(!st)) {
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;
@@ -415,7 +415,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
415
416 if(do_udp_packets == CONFIG_ONDEMAND_YES || (do_udp_packets == CONFIG_ONDEMAND_ONDEMAND && (Udp6InDatagrams || Udp6OutDatagrams))) {
417 do_udp_packets = CONFIG_ONDEMAND_YES;
418 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udppackets");
418 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udppackets");
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
@@ -441,7 +441,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
441 || Udp6IgnoredMulti
442 ))) {
443 do_udp_errors = CONFIG_ONDEMAND_YES;
444 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udperrors");
444 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udperrors");
445 if(unlikely(!st)) {
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;
@@ -468,7 +468,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
468
469 if(do_udplite_packets == CONFIG_ONDEMAND_YES || (do_udplite_packets == CONFIG_ONDEMAND_ONDEMAND && (UdpLite6InDatagrams || UdpLite6OutDatagrams))) {
470 do_udplite_packets = CONFIG_ONDEMAND_YES;
471 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udplitepackets");
471 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udplitepackets");
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
@@ -494,7 +494,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
494 || UdpLite6InCsumErrors
495 ))) {
496 do_udplite_errors = CONFIG_ONDEMAND_YES;
497 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
497 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
498 if(unlikely(!st)) {
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;
@@ -519,7 +519,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
519
520 if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastOctets || Ip6InMcastOctets))) {
521 do_mcast = CONFIG_ONDEMAND_YES;
522 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".mcast");
522 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcast");
523 if(unlikely(!st)) {
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;
@@ -538,7 +538,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
538
539 if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutBcastOctets || Ip6InBcastOctets))) {
540 do_bcast = CONFIG_ONDEMAND_YES;
541 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".bcast");
541 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".bcast");
542 if(unlikely(!st)) {
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;
@@ -557,7 +557,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
557
558 if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastPkts || Ip6InMcastPkts))) {
559 do_mcast_p = CONFIG_ONDEMAND_YES;
560 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".mcastpkts");
560 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcastpkts");
561 if(unlikely(!st)) {
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;
@@ -576,7 +576,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
576
577 if(do_icmp == CONFIG_ONDEMAND_YES || (do_icmp == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMsgs || Icmp6OutMsgs))) {
578 do_icmp = CONFIG_ONDEMAND_YES;
579 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmp");
579 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmp");
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
@@ -594,7 +594,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
594
595 if(do_icmp_redir == CONFIG_ONDEMAND_YES || (do_icmp_redir == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InRedirects || Icmp6OutRedirects))) {
596 do_icmp_redir = CONFIG_ONDEMAND_YES;
597 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpredir");
597 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpredir");
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
@@ -625,7 +625,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
625 || Icmp6OutParmProblems
626 ))) {
627 do_icmp_errors = CONFIG_ONDEMAND_YES;
628 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmperrors");
628 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmperrors");
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
@@ -668,7 +668,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
668 || Icmp6OutEchoReplies
669 ))) {
670 do_icmp_echos = CONFIG_ONDEMAND_YES;
671 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpechos");
671 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpechos");
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
@@ -698,7 +698,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
698 || Icmp6OutGroupMembReductions
699 ))) {
700 do_icmp_groupmemb = CONFIG_ONDEMAND_YES;
701 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".groupmemb");
701 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".groupmemb");
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
@@ -730,7 +730,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
730 || Icmp6OutRouterAdvertisements
731 ))) {
732 do_icmp_router = CONFIG_ONDEMAND_YES;
733 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmprouter");
733 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmprouter");
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
@@ -758,7 +758,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
758 || Icmp6OutNeighborAdvertisements
759 ))) {
760 do_icmp_neighbor = CONFIG_ONDEMAND_YES;
761 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
761 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
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
@@ -780,7 +780,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
780
781 if(do_icmp_mldv2 == CONFIG_ONDEMAND_YES || (do_icmp_mldv2 == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMLDv2Reports || Icmp6OutMLDv2Reports))) {
782 do_icmp_mldv2 = CONFIG_ONDEMAND_YES;
783 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
783 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
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
@@ -810,7 +810,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
810 || Icmp6OutType143
811 ))) {
812 do_icmp_types = CONFIG_ONDEMAND_YES;
813 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmptypes");
813 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmptypes");
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
@@ -850,7 +850,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
850 || Ip6InCEPkts
851 ))) {
852 do_ect = CONFIG_ONDEMAND_YES;
853 - st = rrdset_find(RRD_TYPE_NET_SNMP6 ".ect");
853 + st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".ect");
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
src/proc_net_softnet_stat.c
+2 -2
@@ -77,7 +77,7 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
77
78 // --------------------------------------------------------------------
79
80 - st = rrdset_find_bytype("system", "softnet_stat");
80 + st = rrdset_find_bytype_localhost("system", "softnet_stat");
81 if(unlikely(!st)) {
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++)
@@ -97,7 +97,7 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
97 char id[50+1];
98 snprintfz(id, 50, "cpu%zu_softnet_stat", l);
99
100 - st = rrdset_find_bytype("cpu", id);
100 + st = rrdset_find_bytype_localhost("cpu", id);
101 if(unlikely(!st)) {
102 char title[100+1];
103 snprintfz(title, 100, "CPU%zu softnet_stat", l);
src/proc_net_stat_conntrack.c
+6 -6
@@ -130,7 +130,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
130 // --------------------------------------------------------------------
131
132 if(do_sockets) {
133 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_sockets");
133 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_sockets");
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
@@ -145,7 +145,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
145 // --------------------------------------------------------------------
146
147 if(do_new) {
148 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_new");
148 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_new");
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
@@ -164,7 +164,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
164 // --------------------------------------------------------------------
165
166 if(do_changes) {
167 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_changes");
167 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_changes");
168 if(unlikely(!st)) {
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;
@@ -184,7 +184,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
184 // --------------------------------------------------------------------
185
186 if(do_expect) {
187 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_expect");
187 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_expect");
188 if(unlikely(!st)) {
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;
@@ -204,7 +204,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
204 // --------------------------------------------------------------------
205
206 if(do_search) {
207 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_search");
207 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_search");
208 if(unlikely(!st)) {
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;
@@ -224,7 +224,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
224 // --------------------------------------------------------------------
225
226 if(do_errors) {
227 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_errors");
227 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_errors");
228 if(unlikely(!st)) {
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;
src/proc_net_stat_synproxy.c
+4 -4
@@ -60,7 +60,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
60 if((do_entries == CONFIG_ONDEMAND_ONDEMAND && events) || do_entries == CONFIG_ONDEMAND_YES) {
61 do_entries = CONFIG_ONDEMAND_YES;
62
63 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_entries");
63 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_entries");
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
@@ -77,7 +77,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
77 if((do_syns == CONFIG_ONDEMAND_ONDEMAND && events) || do_syns == CONFIG_ONDEMAND_YES) {
78 do_syns = CONFIG_ONDEMAND_YES;
79
80 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
80 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
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
@@ -94,7 +94,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
94 if((do_reopened == CONFIG_ONDEMAND_ONDEMAND && events) || do_reopened == CONFIG_ONDEMAND_YES) {
95 do_reopened = CONFIG_ONDEMAND_YES;
96
97 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
97 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
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
@@ -111,7 +111,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
111 if((do_cookies == CONFIG_ONDEMAND_ONDEMAND && events) || do_cookies == CONFIG_ONDEMAND_YES) {
112 do_cookies = CONFIG_ONDEMAND_YES;
113
114 - st = rrdset_find(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
114 + st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
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
src/proc_softirqs.c
+2 -2
@@ -128,7 +128,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
128
129 // --------------------------------------------------------------------
130
131 - st = rrdset_find_bytype("system", "softirqs");
131 + st = rrdset_find_bytype_localhost("system", "softirqs");
132 if(unlikely(!st)) st = rrdset_create("system", "softirqs", NULL, "softirqs", NULL, "System softirqs", "softirqs/s", 950, update_every, RRDSET_TYPE_STACKED);
133 else rrdset_next(st);
134
@@ -163,7 +163,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {
163 char id[50+1];
164 snprintfz(id, 50, "cpu%d_softirqs", c);
165
166 - st = rrdset_find_bytype("cpu", id);
166 + st = rrdset_find_bytype_localhost("cpu", id);
167 if(unlikely(!st)) {
168 // find if everything is zero
169 unsigned long long core_sum = 0 ;
src/proc_stat.c
+5 -5
@@ -91,7 +91,7 @@ int do_proc_stat(int update_every, usec_t dt) {
91 }
92
93 if(likely((isthistotal && do_cpu) || (!isthistotal && do_cpu_cores))) {
94 - st = rrdset_find_bytype(type, id);
94 + st = rrdset_find_bytype_localhost(type, id);
95 if(unlikely(!st)) {
96 st = rrdset_create(type, id, NULL, family, context, title, "percentage", priority, update_every, RRDSET_TYPE_STACKED);
97
@@ -132,7 +132,7 @@ int do_proc_stat(int update_every, usec_t dt) {
132 // --------------------------------------------------------------------
133
134 if(likely(do_interrupts)) {
135 - st = rrdset_find_bytype("system", "intr");
135 + st = rrdset_find_bytype_localhost("system", "intr");
136 if(unlikely(!st)) {
137 st = rrdset_create("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
138 st->isdetail = 1;
@@ -151,7 +151,7 @@ int do_proc_stat(int update_every, usec_t dt) {
151 // --------------------------------------------------------------------
152
153 if(likely(do_context)) {
154 - st = rrdset_find_bytype("system", "ctxt");
154 + st = rrdset_find_bytype_localhost("system", "ctxt");
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
@@ -177,7 +177,7 @@ int do_proc_stat(int update_every, usec_t dt) {
177 // --------------------------------------------------------------------
178
179 if(likely(do_forks)) {
180 - st = rrdset_find_bytype("system", "forks");
180 + st = rrdset_find_bytype_localhost("system", "forks");
181 if(unlikely(!st)) {
182 st = rrdset_create("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
183 st->isdetail = 1;
@@ -193,7 +193,7 @@ int do_proc_stat(int update_every, usec_t dt) {
193 // --------------------------------------------------------------------
194
195 if(likely(do_processes)) {
196 - st = rrdset_find_bytype("system", "processes");
196 + st = rrdset_find_bytype_localhost("system", "processes");
197 if(unlikely(!st)) {
198 st = rrdset_create("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
199
src/proc_sys_kernel_random_entropy_avail.c
+1 -1
@@ -17,7 +17,7 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
17
18 unsigned long long entropy = str2ull(procfile_lineword(ff, 0, 0));
19
20 - RRDSET *st = rrdset_find_bytype("system", "entropy");
20 + RRDSET *st = rrdset_find_bytype_localhost("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_ALGORITHM_ABSOLUTE);
src/proc_uptime.c
+1 -1
@@ -39,7 +39,7 @@ int do_proc_uptime(int update_every, usec_t dt) {
39 // --------------------------------------------------------------------
40
41 if(unlikely(!st))
42 - st = rrdset_find("system.uptime");
42 + st = rrdset_find_localhost("system.uptime");
43
44 if(unlikely(!st)) {
45 st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
src/registry.c
+3 -3
@@ -323,7 +323,7 @@ void registry_statistics(void) {
323
324 static RRDSET *sts = NULL, *stc = NULL, *stm = NULL;
325
326 - if(!sts) sts = rrdset_find("netdata.registry_sessions");
326 + if(!sts) sts = rrdset_find_localhost("netdata.registry_sessions");
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
@@ -336,7 +336,7 @@ void registry_statistics(void) {
336
337 // ------------------------------------------------------------------------
338
339 - if(!stc) stc = rrdset_find("netdata.registry_entries");
339 + if(!stc) stc = rrdset_find_localhost("netdata.registry_entries");
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
@@ -357,7 +357,7 @@ void registry_statistics(void) {
357
358 // ------------------------------------------------------------------------
359
360 - if(!stm) stm = rrdset_find("netdata.registry_mem");
360 + if(!stm) stm = rrdset_find_localhost("netdata.registry_mem");
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
src/rrd.c
+28 -32
@@ -105,8 +105,8 @@ static RRDFAMILY *rrdfamily_index_find(RRDHOST *host, const char *id, uint32_t h
105 return (RRDFAMILY *)avl_search_lock(&(host->rrdfamily_root_index), (avl *) &tmp);
106 }
107
108 -RRDFAMILY *rrdfamily_create(const char *id) {
109 - RRDFAMILY *rc = rrdfamily_index_find(&localhost, id, 0);
108 +RRDFAMILY *rrdfamily_create(RRDHOST *host, const char *id) {
109 + RRDFAMILY *rc = rrdfamily_index_find(host, id, 0);
110 if(!rc) {
111 rc = callocz(1, sizeof(RRDFAMILY));
112
@@ -116,7 +116,7 @@ RRDFAMILY *rrdfamily_create(const char *id) {
116 // initialize the variables index
117 avl_init_lock(&rc->variables_root_index, rrdvar_compare);
118
119 - RRDFAMILY *ret = rrdfamily_index_add(&localhost, rc);
119 + RRDFAMILY *ret = rrdfamily_index_add(host, rc);
120 if(ret != rc)
121 fatal("RRDFAMILY: INTERNAL ERROR: Expected to INSERT RRDFAMILY '%s' into index, but inserted '%s'.", rc->family, (ret)?ret->family:"NONE");
122 }
@@ -125,10 +125,10 @@ RRDFAMILY *rrdfamily_create(const char *id) {
125 return rc;
126 }
127
128 -void rrdfamily_free(RRDFAMILY *rc) {
128 +void rrdfamily_free(RRDHOST *host, RRDFAMILY *rc) {
129 rc->use_count--;
130 if(!rc->use_count) {
131 - RRDFAMILY *ret = rrdfamily_index_del(&localhost, rc);
131 + RRDFAMILY *ret = rrdfamily_index_del(host, rc);
132 if(ret != rc)
133 fatal("RRDFAMILY: INTERNAL ERROR: Expected to DELETE RRDFAMILY '%s' from index, but deleted '%s'.", rc->family, (ret)?ret->family:"NONE");
134
@@ -360,7 +360,7 @@ void rrdset_set_name(RRDSET *st, const char *name)
360 rrdset_strncpyz_name(b, n, CONFIG_MAX_VALUE);
361
362 if(st->name) {
363 - rrdset_index_del_name(&localhost, st);
363 + rrdset_index_del_name(st->rrdhost, st);
364 st->name = config_set_default(st->id, "name", b);
365 st->hash_name = simple_hash(st->name);
366 rrdsetvar_rename_all(st);
@@ -376,7 +376,7 @@ void rrdset_set_name(RRDSET *st, const char *name)
376 rrddimvar_rename_all(rd);
377 pthread_rwlock_unlock(&st->rwlock);
378
379 - if(unlikely(rrdset_index_add_name(&localhost, st) != st))
379 + if(unlikely(rrdset_index_add_name(st->rrdhost, st) != st))
380 error("RRDSET: INTERNAL ERROR: attempted to index duplicate chart name '%s'", st->name);
381 }
382
@@ -453,8 +453,9 @@ static inline void timeval_align(struct timeval *tv, int update_every) {
453 tv->tv_usec = 500000;
454 }
455
456 -RRDSET *rrdset_create(const char *type, const char *id, const char *name, const char *family, const char *context, const char *title, const char *units, long priority, int update_every, int chart_type)
457 -{
456 +RRDSET *rrdset_create(const char *type, const char *id, const char *name, const char *family, const char *context, const char *title, const char *units, long priority, int update_every, int chart_type) {
457 + RRDHOST *host = &localhost;
458 +
459 if(!type || !type[0]) {
460 fatal("Cannot create rrd stats without a type.");
461 return NULL;
@@ -470,7 +471,7 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
471
472 snprintfz(fullid, RRD_ID_LENGTH_MAX, "%s.%s", type, id);
473
473 - RRDSET *st = rrdset_find(fullid);
474 + RRDSET *st = rrdset_find(host, fullid);
475 if(st) {
476 debug(D_RRD_CALLS, "RRDSET '%s', already exists.", fullid);
477 return st;
@@ -547,6 +548,7 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
548 st->mapped = RRD_MEMORY_MODE_RAM;
549 }
550
551 + st->rrdhost = host;
552 st->memsize = size;
553 st->entries = entries;
554 st->update_every = update_every;
@@ -595,7 +597,7 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
597 avl_init_lock(&st->variables_root_index, rrdvar_compare);
598
599 pthread_rwlock_init(&st->rwlock, NULL);
598 - rrdhost_rwlock(&localhost);
600 + rrdhost_rwlock(host);
601
602 if(name && *name) rrdset_set_name(st, name);
603 else rrdset_set_name(st, id);
@@ -608,11 +610,10 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
610 st->title = config_get(st->id, "title", varvalue2);
611 }
612
611 - st->rrdfamily = rrdfamily_create(st->family);
612 - st->rrdhost = &localhost;
613 + st->rrdfamily = rrdfamily_create(host, st->family);
614
614 - st->next = localhost.rrdset_root;
615 - localhost.rrdset_root = st;
615 + st->next = host->rrdset_root;
616 + host->rrdset_root = st;
617
618 if(health_enabled) {
619 rrdsetvar_create(st, "last_collected_t", RRDVAR_TYPE_TIME_T, &st->last_collected_time.tv_sec, 0);
@@ -622,13 +623,13 @@ RRDSET *rrdset_create(const char *type, const char *id, const char *name, const
623 rrdsetvar_create(st, "update_every", RRDVAR_TYPE_INT, &st->update_every, 0);
624 }
625
625 - if(unlikely(rrdset_index_add(&localhost, st) != st))
626 + if(unlikely(rrdset_index_add(host, st) != st))
627 error("RRDSET: INTERNAL ERROR: attempt to index duplicate chart '%s'", st->id);
628
629 rrdsetcalc_link_matching(st);
630 rrdcalctemplate_link_matching(st);
631
631 - rrdhost_unlock(&localhost);
632 + rrdhost_unlock(host);
633
634 return(st);
635 }
@@ -869,7 +870,7 @@ void rrdset_free_all(void)
870
871 st->rrdfamily->use_count--;
872 if(!st->rrdfamily->use_count)
872 - rrdfamily_free(st->rrdfamily);
873 + rrdfamily_free(&localhost, st->rrdfamily);
874
875 pthread_rwlock_unlock(&st->rwlock);
876
@@ -921,33 +922,28 @@ void rrdset_save_all(void) {
922 }
923
924
924 -RRDSET *rrdset_find(const char *id)
925 -{
926 - debug(D_RRD_CALLS, "rrdset_find() for chart %s", id);
927 -
928 - RRDSET *st = rrdset_index_find(&localhost, id, 0);
925 +RRDSET *rrdset_find(RRDHOST *host, const char *id) {
926 + debug(D_RRD_CALLS, "rrdset_find() for chart '%s' in host '%s'", id, host->hostname);
927 + RRDSET *st = rrdset_index_find(host, id, 0);
928 return(st);
929 }
930
932 -RRDSET *rrdset_find_bytype(const char *type, const char *id)
931 +RRDSET *rrdset_find_bytype(RRDHOST *host, const char *type, const char *id)
932 {
934 - debug(D_RRD_CALLS, "rrdset_find_bytype() for chart %s.%s", type, id);
933 + debug(D_RRD_CALLS, "rrdset_find_bytype() for chart '%s.%s' in host '%s'", type, id, host->hostname);
934
935 char buf[RRD_ID_LENGTH_MAX + 1];
937 -
936 strncpyz(buf, type, RRD_ID_LENGTH_MAX - 1);
937 strcat(buf, ".");
938 int len = (int) strlen(buf);
939 strncpyz(&buf[len], id, (size_t) (RRD_ID_LENGTH_MAX - len));
940
943 - return(rrdset_find(buf));
941 + return(rrdset_find(host, buf));
942 }
943
946 -RRDSET *rrdset_find_byname(const char *name)
947 -{
948 - debug(D_RRD_CALLS, "rrdset_find_byname() for chart %s", name);
949 -
950 - RRDSET *st = rrdset_index_find_name(&localhost, name, 0);
944 +RRDSET *rrdset_find_byname(RRDHOST *host, const char *name) {
945 + debug(D_RRD_CALLS, "rrdset_find_byname() for chart '%s' in host '%s'", name, host->hostname);
946 + RRDSET *st = rrdset_index_find_name(host, name, 0);
947 return(st);
948 }
949
src/rrd.h
+12 -3
@@ -315,6 +315,10 @@ struct rrdhost {
315 ALARM_LOG health_log;
316
317 RRDCALCTEMPLATE *templates;
318 +
319 + uint32_t flags;
320 +
321 + struct rrdhost *next;
322 };
323 typedef struct rrdhost RRDHOST;
324 extern RRDHOST localhost;
@@ -359,9 +363,14 @@ extern RRDSET *rrdset_create(const char *type
363 extern void rrdset_free_all(void);
364 extern void rrdset_save_all(void);
365
362 -extern RRDSET *rrdset_find(const char *id);
363 -extern RRDSET *rrdset_find_bytype(const char *type, const char *id);
364 -extern RRDSET *rrdset_find_byname(const char *name);
366 +extern RRDSET *rrdset_find(RRDHOST *host, const char *id);
367 +#define rrdset_find_localhost(id) rrdset_find(&localhost, id)
368 +
369 +extern RRDSET *rrdset_find_bytype(RRDHOST *host, const char *type, const char *id);
370 +#define rrdset_find_bytype_localhost(type, id) rrdset_find_bytype(&localhost, type, id)
371 +
372 +extern RRDSET *rrdset_find_byname(RRDHOST *host, const char *name);
373 +#define rrdset_find_byname_localhost(name) rrdset_find_byname(&localhost, name)
374
375 extern void rrdset_next_usec_unfiltered(RRDSET *st, usec_t microseconds);
376 extern void rrdset_next_usec(RRDSET *st, usec_t microseconds);
src/sys_devices_system_edac_mc.c
+2 -2
@@ -132,7 +132,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
132 static RRDSET *ce_st = NULL;
133
134 if(unlikely(!ce_st)) {
135 - ce_st = rrdset_find("mem.ecc_ce");
135 + ce_st = rrdset_find_localhost("mem.ecc_ce");
136 if(unlikely(!ce_st))
137 ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors",
138 6600, update_every, RRDSET_TYPE_LINE);
@@ -159,7 +159,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
159 static RRDSET *ue_st = NULL;
160
161 if(unlikely(!ue_st)) {
162 - ue_st = rrdset_find("mem.ecc_ue");
162 + ue_st = rrdset_find_localhost("mem.ecc_ue");
163
164 if(unlikely(!ue_st))
165 ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors",
src/sys_fs_cgroup.c
+52 -39
@@ -1314,7 +1314,7 @@ void update_services_charts(int update_every,
1314 if(unlikely(!st_cpu)) {
1315 char title[CHART_TITLE_MAX + 1];
1316
1317 - st_cpu = rrdset_find_bytype("services", "cpu");
1317 + st_cpu = rrdset_find_bytype_localhost("services", "cpu");
1318 if(likely(!st_cpu)) {
1319 snprintfz(title, CHART_TITLE_MAX, "Systemd Services CPU utilization (%d%% = %d core%s)", (processors * 100), processors, (processors > 1) ? "s" : "");
1320 st_cpu = rrdset_create("services", "cpu", NULL, "cpu", "services.cpu", title, "%", CHART_PRIORITY_SYSTEMD_SERVICES, update_every, RRDSET_TYPE_STACKED);
@@ -1326,7 +1326,7 @@ void update_services_charts(int update_every,
1326
1327 if(likely(do_mem_usage)) {
1328 if(unlikely(!st_mem_usage)) {
1329 - st_mem_usage = rrdset_find_bytype("services", "mem_usage");
1329 + st_mem_usage = rrdset_find_bytype_localhost("services", "mem_usage");
1330 if(likely(!st_mem_usage))
1331 st_mem_usage = rrdset_create("services", "mem_usage", NULL, "mem", "services.mem_usage", (cgroup_used_memory_without_cache)?"Systemd Services Used Memory without Cache":"Systemd Services Used Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 10, update_every, RRDSET_TYPE_STACKED);
1332 }
@@ -1336,7 +1336,7 @@ void update_services_charts(int update_every,
1336
1337 if(likely(do_mem_detailed)) {
1338 if(unlikely(!st_mem_detailed_rss)) {
1339 - st_mem_detailed_rss = rrdset_find_bytype("services", "mem_rss");
1339 + st_mem_detailed_rss = rrdset_find_bytype_localhost("services", "mem_rss");
1340 if(likely(!st_mem_detailed_rss))
1341 st_mem_detailed_rss = rrdset_create("services", "mem_rss", NULL, "mem", "services.mem_rss", "Systemd Services RSS Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 20, update_every, RRDSET_TYPE_STACKED);
1342 }
@@ -1344,7 +1344,7 @@ void update_services_charts(int update_every,
1344 rrdset_next(st_mem_detailed_rss);
1345
1346 if(unlikely(!st_mem_detailed_mapped)) {
1347 - st_mem_detailed_mapped = rrdset_find_bytype("services", "mem_mapped");
1347 + st_mem_detailed_mapped = rrdset_find_bytype_localhost("services", "mem_mapped");
1348 if(likely(!st_mem_detailed_mapped))
1349 st_mem_detailed_mapped = rrdset_create("services", "mem_mapped", NULL, "mem", "services.mem_mapped", "Systemd Services Mapped Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 30, update_every, RRDSET_TYPE_STACKED);
1350 }
@@ -1352,7 +1352,7 @@ void update_services_charts(int update_every,
1352 rrdset_next(st_mem_detailed_mapped);
1353
1354 if(unlikely(!st_mem_detailed_cache)) {
1355 - st_mem_detailed_cache = rrdset_find_bytype("services", "mem_cache");
1355 + st_mem_detailed_cache = rrdset_find_bytype_localhost("services", "mem_cache");
1356 if(likely(!st_mem_detailed_cache))
1357 st_mem_detailed_cache = rrdset_create("services", "mem_cache", NULL, "mem", "services.mem_cache", "Systemd Services Cache Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 40, update_every, RRDSET_TYPE_STACKED);
1358 }
@@ -1360,7 +1360,7 @@ void update_services_charts(int update_every,
1360 rrdset_next(st_mem_detailed_cache);
1361
1362 if(unlikely(!st_mem_detailed_writeback)) {
1363 - st_mem_detailed_writeback = rrdset_find_bytype("services", "mem_writeback");
1363 + st_mem_detailed_writeback = rrdset_find_bytype_localhost("services", "mem_writeback");
1364 if(likely(!st_mem_detailed_writeback))
1365 st_mem_detailed_writeback = rrdset_create("services", "mem_writeback", NULL, "mem", "services.mem_writeback", "Systemd Services Writeback Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 50, update_every, RRDSET_TYPE_STACKED);
1366 }
@@ -1368,7 +1368,7 @@ void update_services_charts(int update_every,
1368 rrdset_next(st_mem_detailed_writeback);
1369
1370 if(unlikely(!st_mem_detailed_pgfault)) {
1371 - st_mem_detailed_pgfault = rrdset_find_bytype("services", "mem_pgfault");
1371 + st_mem_detailed_pgfault = rrdset_find_bytype_localhost("services", "mem_pgfault");
1372 if(likely(!st_mem_detailed_pgfault))
1373 st_mem_detailed_pgfault = rrdset_create("services", "mem_pgfault", NULL, "mem", "services.mem_pgfault", "Systemd Services Memory Minor Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 60, update_every, RRDSET_TYPE_STACKED);
1374 }
@@ -1376,7 +1376,7 @@ void update_services_charts(int update_every,
1376 rrdset_next(st_mem_detailed_pgfault);
1377
1378 if(unlikely(!st_mem_detailed_pgmajfault)) {
1379 - st_mem_detailed_pgmajfault = rrdset_find_bytype("services", "mem_pgmajfault");
1379 + st_mem_detailed_pgmajfault = rrdset_find_bytype_localhost("services", "mem_pgmajfault");
1380 if(likely(!st_mem_detailed_pgmajfault))
1381 st_mem_detailed_pgmajfault = rrdset_create("services", "mem_pgmajfault", NULL, "mem", "services.mem_pgmajfault", "Systemd Services Memory Major Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 70, update_every, RRDSET_TYPE_STACKED);
1382 }
@@ -1384,7 +1384,7 @@ void update_services_charts(int update_every,
1384 rrdset_next(st_mem_detailed_pgmajfault);
1385
1386 if(unlikely(!st_mem_detailed_pgpgin)) {
1387 - st_mem_detailed_pgpgin = rrdset_find_bytype("services", "mem_pgpgin");
1387 + st_mem_detailed_pgpgin = rrdset_find_bytype_localhost("services", "mem_pgpgin");
1388 if(likely(!st_mem_detailed_pgpgin))
1389 st_mem_detailed_pgpgin = rrdset_create("services", "mem_pgpgin", NULL, "mem", "services.mem_pgpgin", "Systemd Services Memory Charging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 80, update_every, RRDSET_TYPE_STACKED);
1390 }
@@ -1392,7 +1392,7 @@ void update_services_charts(int update_every,
1392 rrdset_next(st_mem_detailed_pgpgin);
1393
1394 if(unlikely(!st_mem_detailed_pgpgout)) {
1395 - st_mem_detailed_pgpgout = rrdset_find_bytype("services", "mem_pgpgout");
1395 + st_mem_detailed_pgpgout = rrdset_find_bytype_localhost("services", "mem_pgpgout");
1396 if(likely(!st_mem_detailed_pgpgout))
1397 st_mem_detailed_pgpgout = rrdset_create("services", "mem_pgpgout", NULL, "mem", "services.mem_pgpgout", "Systemd Services Memory Uncharging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 90, update_every, RRDSET_TYPE_STACKED);
1398 }
@@ -1402,7 +1402,7 @@ void update_services_charts(int update_every,
1402
1403 if(likely(do_mem_failcnt)) {
1404 if(unlikely(!st_mem_failcnt)) {
1405 - st_mem_failcnt = rrdset_find_bytype("services", "mem_failcnt");
1405 + st_mem_failcnt = rrdset_find_bytype_localhost("services", "mem_failcnt");
1406 if(likely(!st_mem_failcnt))
1407 st_mem_failcnt = rrdset_create("services", "mem_failcnt", NULL, "mem", "services.mem_failcnt", "Systemd Services Memory Limit Failures", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 110, update_every, RRDSET_TYPE_STACKED);
1408 }
@@ -1412,7 +1412,7 @@ void update_services_charts(int update_every,
1412
1413 if(likely(do_swap_usage)) {
1414 if(unlikely(!st_swap_usage)) {
1415 - st_swap_usage = rrdset_find_bytype("services", "swap_usage");
1415 + st_swap_usage = rrdset_find_bytype_localhost("services", "swap_usage");
1416 if(likely(!st_swap_usage))
1417 st_swap_usage = rrdset_create("services", "swap_usage", NULL, "swap", "services.swap_usage", "Systemd Services Swap Memory Used", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 100, update_every, RRDSET_TYPE_STACKED);
1418 }
@@ -1422,7 +1422,7 @@ void update_services_charts(int update_every,
1422
1423 if(likely(do_io)) {
1424 if(unlikely(!st_io_read)) {
1425 - st_io_read = rrdset_find_bytype("services", "io_read");
1425 + st_io_read = rrdset_find_bytype_localhost("services", "io_read");
1426 if(likely(!st_io_read))
1427 st_io_read = rrdset_create("services", "io_read", NULL, "disk", "services.io_read", "Systemd Services Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 120, update_every, RRDSET_TYPE_STACKED);
1428 }
@@ -1430,7 +1430,7 @@ void update_services_charts(int update_every,
1430 rrdset_next(st_io_read);
1431
1432 if(unlikely(!st_io_write)) {
1433 - st_io_write = rrdset_find_bytype("services", "io_write");
1433 + st_io_write = rrdset_find_bytype_localhost("services", "io_write");
1434 if(likely(!st_io_write))
1435 st_io_write = rrdset_create("services", "io_write", NULL, "disk", "services.io_write", "Systemd Services Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 130, update_every, RRDSET_TYPE_STACKED);
1436 }
@@ -1440,7 +1440,7 @@ void update_services_charts(int update_every,
1440
1441 if(likely(do_io_ops)) {
1442 if(unlikely(!st_io_serviced_read)) {
1443 - st_io_serviced_read = rrdset_find_bytype("services", "io_ops_read");
1443 + st_io_serviced_read = rrdset_find_bytype_localhost("services", "io_ops_read");
1444 if(likely(!st_io_serviced_read))
1445 st_io_serviced_read = rrdset_create("services", "io_ops_read", NULL, "disk", "services.io_ops_read", "Systemd Services Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 140, update_every, RRDSET_TYPE_STACKED);
1446 }
@@ -1448,7 +1448,7 @@ void update_services_charts(int update_every,
1448 rrdset_next(st_io_serviced_read);
1449
1450 if(unlikely(!st_io_serviced_write)) {
1451 - st_io_serviced_write = rrdset_find_bytype("services", "io_ops_write");
1451 + st_io_serviced_write = rrdset_find_bytype_localhost("services", "io_ops_write");
1452 if(likely(!st_io_serviced_write))
1453 st_io_serviced_write = rrdset_create("services", "io_ops_write", NULL, "disk", "services.io_ops_write", "Systemd Services Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 150, update_every, RRDSET_TYPE_STACKED);
1454 }
@@ -1458,7 +1458,7 @@ void update_services_charts(int update_every,
1458
1459 if(likely(do_throttle_io)) {
1460 if(unlikely(!st_throttle_io_read)) {
1461 - st_throttle_io_read = rrdset_find_bytype("services", "throttle_io_read");
1461 + st_throttle_io_read = rrdset_find_bytype_localhost("services", "throttle_io_read");
1462 if(likely(!st_throttle_io_read))
1463 st_throttle_io_read = rrdset_create("services", "throttle_io_read", NULL, "disk", "services.throttle_io_read", "Systemd Services Throttle Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 160, update_every, RRDSET_TYPE_STACKED);
1464 }
@@ -1466,7 +1466,7 @@ void update_services_charts(int update_every,
1466 rrdset_next(st_throttle_io_read);
1467
1468 if(unlikely(!st_throttle_io_write)) {
1469 - st_throttle_io_write = rrdset_find_bytype("services", "throttle_io_write");
1469 + st_throttle_io_write = rrdset_find_bytype_localhost("services", "throttle_io_write");
1470 if(likely(!st_throttle_io_write))
1471 st_throttle_io_write = rrdset_create("services", "throttle_io_write", NULL, "disk", "services.throttle_io_write", "Systemd Services Throttle Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 170, update_every, RRDSET_TYPE_STACKED);
1472 }
@@ -1476,7 +1476,7 @@ void update_services_charts(int update_every,
1476
1477 if(likely(do_throttle_ops)) {
1478 if(unlikely(!st_throttle_ops_read)) {
1479 - st_throttle_ops_read = rrdset_find_bytype("services", "throttle_io_ops_read");
1479 + st_throttle_ops_read = rrdset_find_bytype_localhost("services", "throttle_io_ops_read");
1480 if(likely(!st_throttle_ops_read))
1481 st_throttle_ops_read = rrdset_create("services", "throttle_io_ops_read", NULL, "disk", "services.throttle_io_ops_read", "Systemd Services Throttle Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 180, update_every, RRDSET_TYPE_STACKED);
1482 }
@@ -1484,7 +1484,7 @@ void update_services_charts(int update_every,
1484 rrdset_next(st_throttle_ops_read);
1485
1486 if(unlikely(!st_throttle_ops_write)) {
1487 - st_throttle_ops_write = rrdset_find_bytype("services", "throttle_io_ops_write");
1487 + st_throttle_ops_write = rrdset_find_bytype_localhost("services", "throttle_io_ops_write");
1488 if(likely(!st_throttle_ops_write))
1489 st_throttle_ops_write = rrdset_create("services", "throttle_io_ops_write", NULL, "disk", "services.throttle_io_ops_write", "Systemd Services Throttle Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 190, update_every, RRDSET_TYPE_STACKED);
1490 }
@@ -1494,7 +1494,7 @@ void update_services_charts(int update_every,
1494
1495 if(likely(do_queued_ops)) {
1496 if(unlikely(!st_queued_ops_read)) {
1497 - st_queued_ops_read = rrdset_find_bytype("services", "queued_io_ops_read");
1497 + st_queued_ops_read = rrdset_find_bytype_localhost("services", "queued_io_ops_read");
1498 if(likely(!st_queued_ops_read))
1499 st_queued_ops_read = rrdset_create("services", "queued_io_ops_read", NULL, "disk", "services.queued_io_ops_read", "Systemd Services Queued Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 200, update_every, RRDSET_TYPE_STACKED);
1500 }
@@ -1502,7 +1502,7 @@ void update_services_charts(int update_every,
1502 rrdset_next(st_queued_ops_read);
1503
1504 if(unlikely(!st_queued_ops_write)) {
1505 - st_queued_ops_write = rrdset_find_bytype("services", "queued_io_ops_write");
1505 + st_queued_ops_write = rrdset_find_bytype_localhost("services", "queued_io_ops_write");
1506 if(likely(!st_queued_ops_write))
1507 st_queued_ops_write = rrdset_create("services", "queued_io_ops_write", NULL, "disk", "services.queued_io_ops_write", "Systemd Services Queued Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 210, update_every, RRDSET_TYPE_STACKED);
1508 }
@@ -1512,7 +1512,7 @@ void update_services_charts(int update_every,
1512
1513 if(likely(do_merged_ops)) {
1514 if(unlikely(!st_merged_ops_read)) {
1515 - st_merged_ops_read = rrdset_find_bytype("services", "merged_io_ops_read");
1515 + st_merged_ops_read = rrdset_find_bytype_localhost("services", "merged_io_ops_read");
1516 if(likely(!st_merged_ops_read))
1517 st_merged_ops_read = rrdset_create("services", "merged_io_ops_read", NULL, "disk", "services.merged_io_ops_read", "Systemd Services Merged Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 220, update_every, RRDSET_TYPE_STACKED);
1518 }
@@ -1520,7 +1520,7 @@ void update_services_charts(int update_every,
1520 rrdset_next(st_merged_ops_read);
1521
1522 if(unlikely(!st_merged_ops_write)) {
1523 - st_merged_ops_write = rrdset_find_bytype("services", "merged_io_ops_write");
1523 + st_merged_ops_write = rrdset_find_bytype_localhost("services", "merged_io_ops_write");
1524 if(likely(!st_merged_ops_write))
1525 st_merged_ops_write = rrdset_create("services", "merged_io_ops_write", NULL, "disk", "services.merged_io_ops_write", "Systemd Services Merged Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 230, update_every, RRDSET_TYPE_STACKED);
1526 }
@@ -1780,7 +1780,8 @@ void update_cgroup_charts(int update_every) {
1780
1781 if(likely(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_ONDEMAND_YES)) {
1782 if(unlikely(!cg->st_cpu)) {
1783 - cg->st_cpu = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu");
1783 + cg->st_cpu = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1784 + , "cpu");
1785 if(likely(!cg->st_cpu)) {
1786 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1787 cg->st_cpu = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", CHART_PRIORITY_CONTAINERS, update_every, RRDSET_TYPE_STACKED);
@@ -1801,7 +1802,8 @@ void update_cgroup_charts(int update_every) {
1802 unsigned int i;
1803
1804 if(unlikely(!cg->st_cpu_per_core)) {
1804 - cg->st_cpu_per_core = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu_per_core");
1805 + cg->st_cpu_per_core = rrdset_find_bytype_localhost(
1806 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu_per_core");
1807 if(likely(!cg->st_cpu_per_core)) {
1808 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) Per Core for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1809 cg->st_cpu_per_core = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", CHART_PRIORITY_CONTAINERS + 100, update_every, RRDSET_TYPE_STACKED);
@@ -1823,7 +1825,8 @@ void update_cgroup_charts(int update_every) {
1825
1826 if(likely(cg->memory.updated_detailed && cg->memory.enabled_detailed == CONFIG_ONDEMAND_YES)) {
1827 if(unlikely(!cg->st_mem)) {
1826 - cg->st_mem = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem");
1828 + cg->st_mem = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1829 + , "mem");
1830 if(likely(!cg->st_mem)) {
1831 snprintfz(title, CHART_TITLE_MAX, "Memory Usage for cgroup %s", cg->chart_title);
1832 cg->st_mem = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", CHART_PRIORITY_CONTAINERS + 210, update_every, RRDSET_TYPE_STACKED);
@@ -1848,7 +1851,8 @@ void update_cgroup_charts(int update_every) {
1851 rrdset_done(cg->st_mem);
1852
1853 if(unlikely(!cg->st_writeback)) {
1851 - cg->st_writeback = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "writeback");
1854 + cg->st_writeback = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1855 + , "writeback");
1856 if(likely(!cg->st_writeback)) {
1857 snprintfz(title, CHART_TITLE_MAX, "Writeback Memory for cgroup %s", cg->chart_title);
1858 cg->st_writeback = rrdset_create(type, "writeback", NULL, "mem", "cgroup.writeback", title, "MB", CHART_PRIORITY_CONTAINERS + 300, update_every, RRDSET_TYPE_AREA);
@@ -1867,7 +1871,8 @@ void update_cgroup_charts(int update_every) {
1871 rrdset_done(cg->st_writeback);
1872
1873 if(unlikely(!cg->st_mem_activity)) {
1870 - cg->st_mem_activity = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_activity");
1874 + cg->st_mem_activity = rrdset_find_bytype_localhost(
1875 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_activity");
1876 if(likely(!cg->st_mem_activity)) {
1877 snprintfz(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_title);
1878 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);
@@ -1883,7 +1888,8 @@ void update_cgroup_charts(int update_every) {
1888 rrdset_done(cg->st_mem_activity);
1889
1890 if(unlikely(!cg->st_pgfaults)) {
1886 - cg->st_pgfaults = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "pgfaults");
1891 + cg->st_pgfaults = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1892 + , "pgfaults");
1893 if(likely(!cg->st_pgfaults)) {
1894 snprintfz(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_title);
1895 cg->st_pgfaults = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", CHART_PRIORITY_CONTAINERS + 500, update_every, RRDSET_TYPE_LINE);
@@ -1901,7 +1907,8 @@ void update_cgroup_charts(int update_every) {
1907
1908 if(likely(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES)) {
1909 if(unlikely(!cg->st_mem_usage)) {
1904 - cg->st_mem_usage = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_usage");
1910 + cg->st_mem_usage = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1911 + , "mem_usage");
1912 if(likely(!cg->st_mem_usage)) {
1913 snprintfz(title, CHART_TITLE_MAX, "Used Memory %sfor cgroup %s", (cgroup_used_memory_without_cache && cg->memory.updated_detailed)?"without Cache ":"", cg->chart_title);
1914 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);
@@ -1919,7 +1926,8 @@ void update_cgroup_charts(int update_every) {
1926
1927 if(likely(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES)) {
1928 if(unlikely(!cg->st_mem_failcnt)) {
1922 - cg->st_mem_failcnt = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_failcnt");
1929 + cg->st_mem_failcnt = rrdset_find_bytype_localhost(
1930 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_failcnt");
1931 if(likely(!cg->st_mem_failcnt)) {
1932 snprintfz(title, CHART_TITLE_MAX, "Memory Limit Failures for cgroup %s", cg->chart_title);
1933 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);
@@ -1935,7 +1943,7 @@ void update_cgroup_charts(int update_every) {
1943
1944 if(likely(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_ONDEMAND_YES)) {
1945 if(unlikely(!cg->st_io)) {
1938 - cg->st_io = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "io");
1946 + cg->st_io = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "io");
1947 if(likely(!cg->st_io)) {
1948 snprintfz(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1949 cg->st_io = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
@@ -1953,7 +1961,8 @@ void update_cgroup_charts(int update_every) {
1961
1962 if(likely(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_ONDEMAND_YES)) {
1963 if(unlikely(!cg->st_serviced_ops)) {
1956 - cg->st_serviced_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "serviced_ops");
1964 + cg->st_serviced_ops = rrdset_find_bytype_localhost(
1965 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "serviced_ops");
1966 if(likely(!cg->st_serviced_ops)) {
1967 snprintfz(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
1968 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);
@@ -1971,7 +1980,8 @@ void update_cgroup_charts(int update_every) {
1980
1981 if(likely(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.enabled == CONFIG_ONDEMAND_YES)) {
1982 if(unlikely(!cg->st_throttle_io)) {
1974 - cg->st_throttle_io = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_io");
1983 + cg->st_throttle_io = rrdset_find_bytype_localhost(
1984 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_io");
1985 if(likely(!cg->st_throttle_io)) {
1986 snprintfz(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1987 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);
@@ -1989,7 +1999,8 @@ void update_cgroup_charts(int update_every) {
1999
2000 if(likely(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.enabled == CONFIG_ONDEMAND_YES)) {
2001 if(unlikely(!cg->st_throttle_serviced_ops)) {
1992 - cg->st_throttle_serviced_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_serviced_ops");
2002 + cg->st_throttle_serviced_ops = rrdset_find_bytype_localhost(
2003 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_serviced_ops");
2004 if(likely(!cg->st_throttle_serviced_ops)) {
2005 snprintfz(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
2006 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);
@@ -2007,7 +2018,8 @@ void update_cgroup_charts(int update_every) {
2018
2019 if(likely(cg->io_queued.updated && cg->io_queued.enabled == CONFIG_ONDEMAND_YES)) {
2020 if(unlikely(!cg->st_queued_ops)) {
2010 - cg->st_queued_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "queued_ops");
2021 + cg->st_queued_ops = rrdset_find_bytype_localhost(
2022 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "queued_ops");
2023 if(likely(!cg->st_queued_ops)) {
2024 snprintfz(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_title);
2025 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);
@@ -2025,7 +2037,8 @@ void update_cgroup_charts(int update_every) {
2037
2038 if(likely(cg->io_merged.updated && cg->io_merged.enabled == CONFIG_ONDEMAND_YES)) {
2039 if(unlikely(!cg->st_merged_ops)) {
2028 - cg->st_merged_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "merged_ops");
2040 + cg->st_merged_ops = rrdset_find_bytype_localhost(
2041 + cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "merged_ops");
2042 if(likely(!cg->st_merged_ops)) {
2043 snprintfz(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_title);
2044 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);
@@ -2110,7 +2123,7 @@ void *cgroups_main(void *ptr) {
2123 getrusage(RUSAGE_THREAD, &thread);
2124
2125 if(unlikely(!stcpu_thread)) {
2113 - stcpu_thread = rrdset_find("netdata.plugin_cgroups_cpu");
2126 + stcpu_thread = rrdset_find_localhost("netdata.plugin_cgroups_cpu");
2127 if(unlikely(!stcpu_thread))
2128 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);
2129
src/sys_kernel_mm_ksm.c
+3 -3
@@ -90,7 +90,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
90
91 // --------------------------------------------------------------------
92
93 - st = rrdset_find("mem.ksm");
93 + st = rrdset_find_localhost("mem.ksm");
94 if(!st) {
95 st = rrdset_create("mem", "ksm", NULL, "ksm", NULL, "Kernel Same Page Merging", "MB", 5000, update_every, RRDSET_TYPE_AREA);
96
@@ -109,7 +109,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
109 rrddim_set(st, "to_scan", pages_to_scan * page_size);
110 rrdset_done(st);
111
112 - st = rrdset_find("mem.ksm_savings");
112 + st = rrdset_find_localhost("mem.ksm_savings");
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
@@ -122,7 +122,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
122 rrddim_set(st, "offered", offered * page_size);
123 rrdset_done(st);
124
125 - st = rrdset_find("mem.ksm_ratios");
125 + st = rrdset_find_localhost("mem.ksm_ratios");
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
src/web_client.c
+12 -12
@@ -738,8 +738,8 @@ int web_client_api_request_single_chart(struct web_client *w, char *url, void ca
738 goto cleanup;
739 }
740
741 - RRDSET *st = rrdset_find(chart);
742 - if(!st) st = rrdset_find_byname(chart);
741 + RRDSET *st = rrdset_find_localhost(chart);
742 + if(!st) st = rrdset_find_byname_localhost(chart);
743 if(!st) {
744 buffer_strcat(w->response.data, "Chart is not found: ");
745 buffer_strcat_htmlescape(w->response.data, chart);
@@ -888,8 +888,8 @@ int web_client_api_request_v1_badge(struct web_client *w, char *url) {
888 goto cleanup;
889 }
890
891 - RRDSET *st = rrdset_find(chart);
892 - if(!st) st = rrdset_find_byname(chart);
891 + RRDSET *st = rrdset_find_localhost(chart);
892 + if(!st) st = rrdset_find_byname_localhost(chart);
893 if(!st) {
894 buffer_no_cacheable(w->response.data);
895 buffer_svg(w->response.data, "chart not found", NAN, "", NULL, NULL, -1);
@@ -1174,8 +1174,8 @@ int web_client_api_request_v1_data(struct web_client *w, char *url)
1174 goto cleanup;
1175 }
1176
1177 - RRDSET *st = rrdset_find(chart);
1178 - if(!st) st = rrdset_find_byname(chart);
1177 + RRDSET *st = rrdset_find_localhost(chart);
1178 + if(!st) st = rrdset_find_byname_localhost(chart);
1179 if(!st) {
1180 buffer_strcat(w->response.data, "Chart is not found: ");
1181 buffer_strcat_htmlescape(w->response.data, chart);
@@ -1517,8 +1517,8 @@ int web_client_api_old_data_request(struct web_client *w, char *url, int datasou
1517 // do we have such a data set?
1518 if(*tok) {
1519 debug(D_WEB_CLIENT, "%llu: Searching for RRD data with name '%s'.", w->id, tok);
1520 - st = rrdset_find_byname(tok);
1521 - if(!st) st = rrdset_find(tok);
1520 + st = rrdset_find_byname_localhost(tok);
1521 + if(!st) st = rrdset_find_localhost(tok);
1522 }
1523
1524 if(!st) {
@@ -2173,8 +2173,8 @@ void web_client_process(struct web_client *w) {
2173 debug(D_WEB_CLIENT, "%llu: Searching for RRD data with name '%s'.", w->id, tok);
2174
2175 // do we have such a data set?
2176 - RRDSET *st = rrdset_find_byname(tok);
2177 - if(!st) st = rrdset_find(tok);
2176 + RRDSET *st = rrdset_find_byname_localhost(tok);
2177 + if(!st) st = rrdset_find_localhost(tok);
2178 if(!st) {
2179 // we don't have it
2180 // try to send a file with that name
@@ -2239,8 +2239,8 @@ void web_client_process(struct web_client *w) {
2239 debug(D_WEB_CLIENT, "%llu: Searching for RRD data with name '%s'.", w->id, tok);
2240
2241 // do we have such a data set?
2242 - RRDSET *st = rrdset_find_byname(tok);
2243 - if(!st) st = rrdset_find(tok);
2242 + RRDSET *st = rrdset_find_byname_localhost(tok);
2243 + if(!st) st = rrdset_find_localhost(tok);
2244 if(!st) {
2245 code = 404;
2246 buffer_strcat(w->response.data, "Chart is not found: ");