Merging upstream version 1.46.3.

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

1 files changed, 6 insertions, 22 deletions

diff --git a/daemon/static_threads.c b/src/daemon/static_threads.c
index b70373d74..4199e9306 100644
--- a/daemon/static_threads.c
+++ b/src/daemon/static_threads.c
@@ -12,23 +12,13 @@ void *health_main(void *ptr);
 void *pluginsd_main(void *ptr);
 void *service_main(void *ptr);
 void *statsd_main(void *ptr);
-void *timex_main(void *ptr);
 void *profile_main(void *ptr);
-void *replication_thread_main(void *ptr __maybe_unused);
+void *replication_thread_main(void *ptr);
 
 extern bool global_statistics_enabled;
 
 const struct netdata_static_thread static_threads_common[] = {
     {
-        .name = "P[timex]",
-        .config_section = CONFIG_SECTION_PLUGINS,
-        .config_name = "timex",
-        .enabled = 1,
-        .thread = NULL,
-        .init_routine = NULL,
-        .start_routine = timex_main
-    },
-    {
         .name = "P[idlejitter]",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "idlejitter",
@@ -70,7 +60,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .name = "STATS_WORKERS",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "netdata monitoring extended",
-        .env_name = "NETDATA_INTERNALS_MONITORING",
+        .env_name = "NETDATA_INTERNALS_EXTENDED_MONITORING",
         .global_variable = &global_statistics_enabled,
         .enabled = 0, // this is ignored - check main() for "netdata monitoring extended"
         .thread = NULL,
@@ -81,7 +71,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .name = "STATS_SQLITE3",
         .config_section = CONFIG_SECTION_PLUGINS,
         .config_name = "netdata monitoring extended",
-        .env_name = "NETDATA_INTERNALS_MONITORING",
+        .env_name = "NETDATA_INTERNALS_EXTENDED_MONITORING",
         .global_variable = &global_statistics_enabled,
         .enabled = 0, // this is ignored - check main() for "netdata monitoring extended"
         .thread = NULL,
@@ -115,6 +105,8 @@ const struct netdata_static_thread static_threads_common[] = {
         .init_routine = NULL,
         .start_routine = statsd_main
     },
+#ifndef OS_WINDOWS
+    // this crashes the debugger under windows
     {
         .name = "EXPORTING",
         .config_section = NULL,
@@ -124,6 +116,7 @@ const struct netdata_static_thread static_threads_common[] = {
         .init_routine = NULL,
         .start_routine = exporting_main
     },
+#endif
     {
         .name = "SNDR[localhost]",
         .config_section = NULL,
@@ -195,15 +188,6 @@ const struct netdata_static_thread static_threads_common[] = {
         .init_routine = NULL,
         .start_routine = profile_main
     },
-    {
-        .name = "DYNCFG",
-        .config_section = NULL,
-        .config_name = NULL,
-        .enabled = 1,
-        .thread = NULL,
-        .init_routine = NULL,
-        .start_routine = dyncfg_main
-    },
 
     // terminator
     {