Merging upstream version 1.44.3.

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

8 files changed, 21 insertions, 14 deletions

diff --git a/build_external/clean-install-arch-debug.Dockerfile b/build_external/clean-install-arch-debug.Dockerfile
index 5a67bfbc3..a3080ea69 100644
--- a/build_external/clean-install-arch-debug.Dockerfile
+++ b/build_external/clean-install-arch-debug.Dockerfile
@@ -48,9 +48,10 @@ RUN find . -type f >/opt/netdata/manifest
 RUN CFLAGS="-Og -g -ggdb -Wall -Wextra -Wformat-signedness -DNETDATA_INTERNAL_CHECKS=1\
     -DNETDATA_VERIFY_LOCKS=1 ${EXTRA_CFLAGS}" ./netdata-installer.sh --require-cloud --disable-lto
 
-RUN ln -sf /dev/stdout /var/log/netdata/access.log
-RUN ln -sf /dev/stdout /var/log/netdata/debug.log
-RUN ln -sf /dev/stderr /var/log/netdata/error.log
+RUN ln -sf /dev/stdout /var/log/netdata/access.log && \
+    ln -sf /dev/stdout /var/log/netdata/debug.log && \
+    ln -sf /dev/stderr /var/log/netdata/error.log && \
+    ln -sf /dev/stdout /var/log/netdata/fluentbit.log
 
 RUN printf >/opt/netdata/source/gdb_batch '\
 set args -D \n\
diff --git a/build_external/clean-install-arch-extras.Dockerfile b/build_external/clean-install-arch-extras.Dockerfile
index 8c6f4fbaa..8b18057e9 100644
--- a/build_external/clean-install-arch-extras.Dockerfile
+++ b/build_external/clean-install-arch-extras.Dockerfile
@@ -48,9 +48,10 @@ RUN find . -type f >/opt/netdata/manifest
 RUN CFLAGS="-Og -g -ggdb -Wall -Wextra -Wformat-signedness -DNETDATA_INTERNAL_CHECKS=1\
     -DNETDATA_VERIFY_LOCKS=1 ${EXTRA_CFLAGS}" ./netdata-installer.sh --require-cloud --disable-lto
 
-RUN ln -sf /dev/stdout /var/log/netdata/access.log
-RUN ln -sf /dev/stdout /var/log/netdata/debug.log
-RUN ln -sf /dev/stderr /var/log/netdata/error.log
+RUN ln -sf /dev/stdout /var/log/netdata/access.log && \
+    ln -sf /dev/stdout /var/log/netdata/debug.log && \
+    ln -sf /dev/stderr /var/log/netdata/error.log && \
+    ln -sf /dev/stdout /var/log/netdata/fluentbit.log
 
 RUN rm /var/lib/netdata/registry/netdata.public.unique.id
 
diff --git a/build_external/clean-install-arch.Dockerfile b/build_external/clean-install-arch.Dockerfile
index d4d0d4706..b3c61fa15 100644
--- a/build_external/clean-install-arch.Dockerfile
+++ b/build_external/clean-install-arch.Dockerfile
@@ -47,8 +47,9 @@ RUN find . -type f >/opt/netdata/manifest
 RUN CFLAGS="-O1 -ggdb -Wall -Wextra -Wformat-signedness -DNETDATA_INTERNAL_CHECKS=1\
     -DNETDATA_VERIFY_LOCKS=1 ${EXTRA_CFLAGS}" ./netdata-installer.sh --disable-lto
 
-RUN ln -sf /dev/stdout /var/log/netdata/access.log
-RUN ln -sf /dev/stdout /var/log/netdata/debug.log
-RUN ln -sf /dev/stderr /var/log/netdata/error.log
+RUN ln -sf /dev/stdout /var/log/netdata/access.log && \
+    ln -sf /dev/stdout /var/log/netdata/debug.log && \
+    ln -sf /dev/stderr /var/log/netdata/error.log && \
+    ln -sf /dev/stdout /var/log/netdata/fluentbit.log
 
 CMD ["/usr/sbin/netdata", "-D"]
diff --git a/build_external/clean-install.Dockerfile b/build_external/clean-install.Dockerfile
index bf63a5599..0ee154e30 100644
--- a/build_external/clean-install.Dockerfile
+++ b/build_external/clean-install.Dockerfile
@@ -29,9 +29,10 @@ RUN find . -type f >/opt/netdata/manifest
 RUN CFLAGS="-O1 -ggdb -Wall -Wextra -Wformat-signedness -DNETDATA_INTERNAL_CHECKS=1\
     -DNETDATA_VERIFY_LOCKS=1 ${EXTRA_CFLAGS}" ./netdata-installer.sh --disable-lto
 
-RUN ln -sf /dev/stdout /var/log/netdata/access.log
-RUN ln -sf /dev/stdout /var/log/netdata/debug.log
-RUN ln -sf /dev/stderr /var/log/netdata/error.log
+RUN ln -sf /dev/stdout /var/log/netdata/access.log && \
+    ln -sf /dev/stdout /var/log/netdata/debug.log && \
+    ln -sf /dev/stderr /var/log/netdata/error.log && \
+    ln -sf /dev/stdout /var/log/netdata/fluentbit.log
 
 RUN rm /var/lib/netdata/registry/netdata.public.unique.id
 
diff --git a/build_external/scenarios/children-to-localhost/child_netdata.conf b/build_external/scenarios/children-to-localhost/child_netdata.conf
new file mode 100644
index 000000000..1f8b0a1d6
--- /dev/null
+++ b/build_external/scenarios/children-to-localhost/child_netdata.conf
@@ -0,0 +1,2 @@
+[db]
+	mode = dbengine
diff --git a/build_external/scenarios/children-to-localhost/child_stream.conf b/build_external/scenarios/children-to-localhost/child_stream.conf
index 72a353fe0..a8ed306bb 100644
--- a/build_external/scenarios/children-to-localhost/child_stream.conf
+++ b/build_external/scenarios/children-to-localhost/child_stream.conf
@@ -1,7 +1,7 @@
 [stream]
     enabled = yes
     destination = tcp:host.docker.internal
-    api key = 00000000-0000-0000-0000-000000000000
+    api key = 11111111-2222-3333-4444-555555555555
     timeout seconds = 60
     default port = 19999
     send charts matching = *
diff --git a/build_external/scenarios/children-to-localhost/docker-compose.yml b/build_external/scenarios/children-to-localhost/docker-compose.yml
index 59739f9eb..dea56fe52 100644
--- a/build_external/scenarios/children-to-localhost/docker-compose.yml
+++ b/build_external/scenarios/children-to-localhost/docker-compose.yml
@@ -5,5 +5,6 @@ services:
     command: /usr/sbin/netdata -D
     volumes:
       - ./child_stream.conf:/etc/netdata/stream.conf:ro
+      - ./child_netdata.conf:/etc/netdata/netdata.conf:ro
     extra_hosts:
       - "host.docker.internal:host-gateway"
diff --git a/build_external/scenarios/children-to-localhost/parent_stream.conf b/build_external/scenarios/children-to-localhost/parent_stream.conf
index bf85ae258..36a416b91 100644
--- a/build_external/scenarios/children-to-localhost/parent_stream.conf
+++ b/build_external/scenarios/children-to-localhost/parent_stream.conf
@@ -1,4 +1,4 @@
-[00000000-0000-0000-0000-000000000000]
+[11111111-2222-3333-4444-555555555555]
     enabled = yes
     allow from = *
     default history = 3600