Adding upstream version 1.31.0.upstream/1.31.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 9 insertions, 4 deletions

diff --git a/backends/backends.c b/backends/backends.c
index bc718cb29..dca21ef1c 100644
--- a/backends/backends.c
+++ b/backends/backends.c
@@ -26,6 +26,7 @@
 //
 
 const char *global_backend_prefix = "netdata";
+const char *global_backend_send_charts_matching = "*";
 int global_backend_update_every = 10;
 BACKEND_OPTIONS global_backend_options = BACKEND_SOURCE_DATA_AVERAGE | BACKEND_OPTION_SEND_NAMES;
 const char *global_backend_source = NULL;
@@ -420,7 +421,7 @@ void backend_set_graphite_variables(int *default_port,
 /**
  * Select Type
  *
- * Select the backedn type based in the user input
+ * Select the backend type based in the user input
  *
  * @param type is the string that defines the backend type
  *
@@ -455,7 +456,7 @@ BACKEND_TYPE backend_select_type(const char *type) {
 /**
  * Backend main
  *
- * The main thread used to control the backedns.
+ * The main thread used to control the backends.
  *
  * @param ptr a pointer to netdata_static_structure.
  *
@@ -517,7 +518,10 @@ void *backends_main(void *ptr) {
     else
         global_backend_options &= ~BACKEND_OPTION_SEND_NAMES;
 
-    charts_pattern = simple_pattern_create(config_get(CONFIG_SECTION_BACKEND, "send charts matching", "*"), NULL, SIMPLE_PATTERN_EXACT);
+    charts_pattern = simple_pattern_create(
+        global_backend_send_charts_matching = config_get(CONFIG_SECTION_BACKEND, "send charts matching", "*"),
+        NULL,
+        SIMPLE_PATTERN_EXACT);
     hosts_pattern  = simple_pattern_create(config_get(CONFIG_SECTION_BACKEND, "send hosts matching", "localhost *"), NULL, SIMPLE_PATTERN_EXACT);
 
 #if ENABLE_PROMETHEUS_REMOTE_WRITE
@@ -690,7 +694,7 @@ void *backends_main(void *ptr) {
     rrddim_add(chart_latency, "latency",   NULL,  1, 1000, RRD_ALGORITHM_ABSOLUTE);
     */
 
-    RRDSET *chart_rusage = rrdset_create_localhost("netdata", "backend_thread_cpu", NULL, "backend", NULL, "NetData Backend Thread CPU usage", "milliseconds/s", "backends", NULL, 130630, global_backend_update_every, RRDSET_TYPE_STACKED);
+    RRDSET *chart_rusage = rrdset_create_localhost("netdata", "backend_thread_cpu", NULL, "backend", NULL, "Netdata Backend Thread CPU usage", "milliseconds/s", "backends", NULL, 130630, global_backend_update_every, RRDSET_TYPE_STACKED);
     rrddim_add(chart_rusage, "user",   NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
     rrddim_add(chart_rusage, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
 
diff --git a/backends/backends.h b/backends/backends.h
index 2f4efd90d..77c58c9e4 100644
--- a/backends/backends.h
+++ b/backends/backends.h
@@ -37,6 +37,7 @@ extern int global_backend_update_every;
 extern BACKEND_OPTIONS global_backend_options;
 extern const char *global_backend_source;
 extern const char *global_backend_prefix;
+extern const char *global_backend_send_charts_matching;
 
 extern void *backends_main(void *ptr);
 BACKEND_TYPE backend_select_type(const char *type);