Merging upstream version 1.38.0.

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

1 files changed, 36 insertions, 15 deletions

diff --git a/daemon/static_threads.c b/daemon/static_threads.c
index b7730bc31..d93cfe9d0 100644
--- a/daemon/static_threads.c
+++ b/daemon/static_threads.c
@@ -7,6 +7,7 @@ void *analytics_main(void *ptr);
 void *cpuidlejitter_main(void *ptr);
 void *global_statistics_main(void *ptr);
 void *global_statistics_workers_main(void *ptr);
+void *global_statistics_sqlite3_main(void *ptr);
 void *health_main(void *ptr);
 void *pluginsd_main(void *ptr);
 void *service_main(void *ptr);
@@ -18,7 +19,7 @@ extern bool global_statistics_enabled;
 
 const struct netdata_static_thread static_threads_common[] = {
     {
-        .name = "PLUGIN[timex]",
+        .name = "P[timex]",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "timex",
         .enabled = 1,
@@ -27,7 +28,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = timex_main
     },
     {
-        .name = "PLUGIN[idlejitter]",
+        .name = "P[idlejitter]",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "idlejitter",
         .enabled = 1,
@@ -36,6 +37,15 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = cpuidlejitter_main
     },
     {
+        .name = "HEALTH",
+        .config_section = NULL,
+        .config_name = NULL,
+        .enabled = 1,
+        .thread = NULL,
+        .init_routine = NULL,
+        .start_routine = health_main
+    },
+    {
         .name = "ANALYTICS",
         .config_section = NULL,
         .config_name = NULL,
@@ -45,7 +55,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = analytics_main
     },
     {
-        .name = "GLOBAL_STATS",
+        .name = "STATS_GLOBAL",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "netdata monitoring",
         .env_name = "NETDATA_INTERNALS_MONITORING",
@@ -56,7 +66,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = global_statistics_main
     },
     {
-        .name = "WORKERS_STATS",
+        .name = "STATS_WORKERS",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "netdata monitoring",
         .env_name = "NETDATA_INTERNALS_MONITORING",
@@ -67,6 +77,17 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = global_statistics_workers_main
     },
     {
+        .name = "STATS_SQLITE3",
+        .config_section = CONFIG_SECTION_PLUGINS,
+        .config_name = "netdata monitoring",
+        .env_name = "NETDATA_INTERNALS_MONITORING",
+        .global_variable = &global_statistics_enabled,
+        .enabled = 1,
+        .thread = NULL,
+        .init_routine = NULL,
+        .start_routine = global_statistics_sqlite3_main
+    },
+    {
         .name = "PLUGINSD",
         .config_section = NULL,
         .config_name = NULL,
@@ -85,7 +106,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = service_main
     },
     {
-        .name = "STATSD",
+        .name = "STATSD_FLUSH",
         .config_section = NULL,
         .config_name = NULL,
         .enabled = 1,
@@ -103,7 +124,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = exporting_main
     },
     {
-        .name = "STREAM",
+        .name = "SNDR[localhost]",
         .config_section = NULL,
         .config_name = NULL,
         .enabled = 0,
@@ -112,7 +133,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .start_routine = rrdpush_sender_thread
     },
     {
-        .name = "WEB_SERVER[static1]",
+        .name = "WEB[1]",
         .config_section = NULL,
         .config_name = NULL,
         .enabled = 0,
@@ -123,7 +144,7 @@ const struct netdata_static_thread static_threads_common[] = {
 
 #ifdef ENABLE_ACLK
     {
-        .name = "ACLK_Main",
+        .name = "ACLK_MAIN",
         .config_section = NULL,
         .config_name = NULL,
         .enabled = 1,
@@ -144,13 +165,13 @@ const struct netdata_static_thread static_threads_common[] = {
     },
 
     {
-            .name = "REPLICATION",
-            .config_section = NULL,
-            .config_name = NULL,
-            .enabled = 1,
-            .thread = NULL,
-            .init_routine = NULL,
-            .start_routine = replication_thread_main
+        .name = "REPLAY[1]",
+        .config_section = NULL,
+        .config_name = NULL,
+        .enabled = 1,
+        .thread = NULL,
+        .init_routine = NULL,
+        .start_routine = replication_thread_main
     },
 
     // terminator