dns_query_time plugin: replace "." with "_" in dimensions

[netdata.git] / src / proc_loadavg.c

diff --git a/src/proc_loadavg.c b/src/proc_loadavg.c
index aa1b2aebb651d1fa28004baaa1c463befe16e51b..a48801b378242b20138506731fd8c4ede9ac8ec2 100644 (file)
--- a/src/proc_loadavg.c
+++ b/src/proc_loadavg.c
@@ -11,7 +11,7 @@ int do_proc_loadavg(int update_every, usec_t dt) {
 
     if(unlikely(!ff)) {
         char filename[FILENAME_MAX + 1];
-        snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/loadavg");
+        snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/loadavg");
 
         ff = procfile_open(config_get("plugin:proc:/proc/loadavg", "filename to monitor", filename), " \t,:|/", PROCFILE_FLAG_DEFAULT);
         if(unlikely(!ff))
@@ -50,12 +50,15 @@ int do_proc_loadavg(int update_every, usec_t dt) {
     if(next_loadavg_dt <= dt) {
         if(likely(do_loadavg)) {
             if(unlikely(!load_chart)) {
-                load_chart = rrdset_find_byname("system.load");
+                load_chart = rrdset_find_byname_localhost("system.load");
                 if(unlikely(!load_chart)) {
-                    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);
-                    rrddim_add(load_chart, "load1", NULL, 1, 1000, RRDDIM_ABSOLUTE);
-                    rrddim_add(load_chart, "load5", NULL, 1, 1000, RRDDIM_ABSOLUTE);
-                    rrddim_add(load_chart, "load15", NULL, 1, 1000, RRDDIM_ABSOLUTE);
+                    load_chart = rrdset_create_localhost("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);
+                    rrddim_add(load_chart, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
+                    rrddim_add(load_chart, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
+                    rrddim_add(load_chart, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
                 }
             }
             else
@@ -65,9 +68,10 @@ int do_proc_loadavg(int update_every, usec_t dt) {
             rrddim_set(load_chart, "load5", (collected_number) (load5 * 1000));
             rrddim_set(load_chart, "load15", (collected_number) (load15 * 1000));
             rrdset_done(load_chart);
-        }
 
-        next_loadavg_dt = load_chart->update_every * USEC_PER_SEC;
+            next_loadavg_dt = load_chart->update_every * USEC_PER_SEC;
+        }
+        else next_loadavg_dt =  MIN_LOADAVG_UPDATE_EVERY * USEC_PER_SEC;
     }
     else next_loadavg_dt -= dt;
 
@@ -75,10 +79,12 @@ int do_proc_loadavg(int update_every, usec_t dt) {
 
     if(likely(do_all_processes)) {
         if(unlikely(!processes_chart)) {
-            processes_chart = rrdset_find_byname("system.active_processes");
+            processes_chart = rrdset_find_byname_localhost("system.active_processes");
             if(unlikely(!processes_chart)) {
-                processes_chart = rrdset_create("system", "active_processes", NULL, "processes", NULL, "System Active Processes", "processes", 750, update_every, RRDSET_TYPE_LINE);
-                rrddim_add(processes_chart, "active", NULL, 1, 1, RRDDIM_ABSOLUTE);
+                processes_chart = rrdset_create_localhost("system", "active_processes", NULL, "processes", NULL
+                                                          , "System Active Processes", "processes", 750, update_every
+                                                          , RRDSET_TYPE_LINE);
+                rrddim_add(processes_chart, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
             }
         }
         else rrdset_next(processes_chart);