fluent-bit & logsmanagement under src/ (#16903)

54 files changed, 54 insertions, 54 deletions

diff --git a/.github/labeler.yml b/.github/labeler.yml
index efe6256107..6d3f603f2c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -278,4 +278,4 @@ area/logs-management:
   - any:
       - changed-files:
           - any-glob-to-any-file:
-              - logsmanagement/**
+              - src/logsmanagement/**
diff --git a/.gitignore b/.gitignore
index 08a4959fcb..18b528ba2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,7 +158,7 @@ collectors/ioping.plugin/ioping.plugin
 collectors/go.d.plugin
 web/netdata-switch-dashboard.sh
 
-logsmanagement/stress_test/stress_test
+src/logsmanagement/stress_test/stress_test
 
 # installer generated files
 /netdata-uninstaller.sh
diff --git a/.gitmodules b/.gitmodules
index cfa3d7ad6a..09a829c1d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
 	url = https://github.com/h2o/h2o.git
 	ignore = untracked
 [submodule "fluent-bit"]
-	path = fluent-bit
+	path = src/fluent-bit
 	url = https://github.com/fluent/fluent-bit.git
 	shallow = true
 	ignore = dirty
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c5c00b1d1..72d27c4a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1258,39 +1258,39 @@ set(TC_PLUGIN_FILES
 )
 
 set(LOGS_MANAGEMENT_PLUGIN_FILES
-        logsmanagement/circular_buffer.c
-        logsmanagement/circular_buffer.h
-        logsmanagement/db_api.c
-        logsmanagement/db_api.h
-        logsmanagement/defaults.h
-        logsmanagement/file_info.h
-        logsmanagement/flb_plugin.c
-        logsmanagement/flb_plugin.h
-        logsmanagement/functions.c
-        logsmanagement/functions.h
-        logsmanagement/helper.h
-        logsmanagement/logsmanag_config.c
-        logsmanagement/logsmanag_config.h
-        logsmanagement/logsmanagement.c
-        logsmanagement/parser.c
-        logsmanagement/parser.h
-        logsmanagement/query.c
-        logsmanagement/query.h
-        logsmanagement/rrd_api/rrd_api_docker_ev.c
-        logsmanagement/rrd_api/rrd_api_docker_ev.h
-        logsmanagement/rrd_api/rrd_api_generic.c
-        logsmanagement/rrd_api/rrd_api_generic.h
-        logsmanagement/rrd_api/rrd_api_kernel.c
-        logsmanagement/rrd_api/rrd_api_kernel.h
-        logsmanagement/rrd_api/rrd_api_mqtt.c
-        logsmanagement/rrd_api/rrd_api_mqtt.h
-        logsmanagement/rrd_api/rrd_api_stats.c
-        logsmanagement/rrd_api/rrd_api_stats.h
-        logsmanagement/rrd_api/rrd_api_systemd.c
-        logsmanagement/rrd_api/rrd_api_systemd.h
-        logsmanagement/rrd_api/rrd_api_web_log.c
-        logsmanagement/rrd_api/rrd_api_web_log.h
-        logsmanagement/rrd_api/rrd_api.h
+        src/logsmanagement/circular_buffer.c
+        src/logsmanagement/circular_buffer.h
+        src/logsmanagement/db_api.c
+        src/logsmanagement/db_api.h
+        src/logsmanagement/defaults.h
+        src/logsmanagement/file_info.h
+        src/logsmanagement/flb_plugin.c
+        src/logsmanagement/flb_plugin.h
+        src/logsmanagement/functions.c
+        src/logsmanagement/functions.h
+        src/logsmanagement/helper.h
+        src/logsmanagement/logsmanag_config.c
+        src/logsmanagement/logsmanag_config.h
+        src/logsmanagement/logsmanagement.c
+        src/logsmanagement/parser.c
+        src/logsmanagement/parser.h
+        src/logsmanagement/query.c
+        src/logsmanagement/query.h
+        src/logsmanagement/rrd_api/rrd_api_docker_ev.c
+        src/logsmanagement/rrd_api/rrd_api_docker_ev.h
+        src/logsmanagement/rrd_api/rrd_api_generic.c
+        src/logsmanagement/rrd_api/rrd_api_generic.h
+        src/logsmanagement/rrd_api/rrd_api_kernel.c
+        src/logsmanagement/rrd_api/rrd_api_kernel.h
+        src/logsmanagement/rrd_api/rrd_api_mqtt.c
+        src/logsmanagement/rrd_api/rrd_api_mqtt.h
+        src/logsmanagement/rrd_api/rrd_api_stats.c
+        src/logsmanagement/rrd_api/rrd_api_stats.h
+        src/logsmanagement/rrd_api/rrd_api_systemd.c
+        src/logsmanagement/rrd_api/rrd_api_systemd.h
+        src/logsmanagement/rrd_api/rrd_api_web_log.c
+        src/logsmanagement/rrd_api/rrd_api_web_log.h
+        src/logsmanagement/rrd_api/rrd_api.h
         src/database/sqlite/sqlite3.c
         src/database/sqlite/sqlite3.h
 )
@@ -1847,8 +1847,8 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
     set(ENABLE_LOGSMANAGEMENT True)
 
     if(ENABLE_LOGS_MANAGEMENT_TESTS)
-        list(APPEND LOGS_MANAGEMENT_PLUGIN_FILES logsmanagement/unit_test/unit_test.c
-                                                 logsmanagement/unit_test/unit_test.h)
+        list(APPEND LOGS_MANAGEMENT_PLUGIN_FILES src/logsmanagement/unit_test/unit_test.c
+                                                 src/logsmanagement/unit_test/unit_test.h)
         set(ENABLE_LOGSMANAGEMENT_TESTS True)
     endif()
 
@@ -1859,7 +1859,7 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
             COMPONENT logs_management_plugin
             DESTINATION usr/libexec/netdata/plugins.d)
 
-    install(DIRECTORY logsmanagement/stock_conf/logsmanagement.d
+    install(DIRECTORY src/logsmanagement/stock_conf/logsmanagement.d
             COMPONENT logs_management_plugin
             DESTINATION usr/lib/netdata/conf.d)
 
@@ -2683,8 +2683,8 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/collectors/ioping.plugin/ioping.plugin DEST
 # logs management
 #
 if (ENABLE_PLUGIN_LOGS_MANAGEMENT)
-        configure_file(logsmanagement/stock_conf/logsmanagement.d.conf.in logsmanagement/stock_conf/logsmanagement.d.conf @ONLY)
-        install(FILES ${CMAKE_BINARY_DIR}/logsmanagement/stock_conf/logsmanagement.d.conf
+        configure_file(src/logsmanagement/stock_conf/logsmanagement.d.conf.in src/logsmanagement/stock_conf/logsmanagement.d.conf @ONLY)
+        install(FILES ${CMAKE_BINARY_DIR}/src/logsmanagement/stock_conf/logsmanagement.d.conf
                 COMPONENT logs_management_plugin
                 DESTINATION usr/lib/netdata/conf.d)
 endif()
diff --git a/netdata-installer.sh b/netdata-installer.sh
index fceb13f826..97dd8aa5c0 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -972,20 +972,20 @@ build_fluentbit() {
     env_cmd="env CFLAGS='-fPIC -pipe -w' CXXFLAGS='-fPIC -pipe -w' LDFLAGS="
   fi
 
-  mkdir -p fluent-bit/build || return 1
-  cd fluent-bit/build > /dev/null || return 1
+  mkdir -p src/fluent-bit/build || return 1
+  cd src/fluent-bit/build > /dev/null || return 1
 
   rm CMakeCache.txt > /dev/null 2>&1
 
   if ! run eval "${env_cmd} $1 -C ../../logsmanagement/fluent_bit_build/config.cmake -B./ -S../"; then
     cd - > /dev/null || return 1
-    rm -rf fluent-bit/build > /dev/null 2>&1
+    rm -rf src/fluent-bit/build > /dev/null 2>&1
     return 1
   fi
 
   if ! run eval "${env_cmd} ${make} ${MAKEOPTS}"; then
     cd - > /dev/null || return 1
-    rm -rf fluent-bit/build > /dev/null 2>&1
+    rm -rf src/fluent-bit/build > /dev/null 2>&1
     return 1
   fi
 
@@ -1000,28 +1000,28 @@ bundle_fluentbit() {
     return 0
   fi
 
-  if [ ! -d "fluent-bit" ]; then
+  if [ ! -d "src/fluent-bit" ]; then
     warning "Missing submodule Fluent-Bit. The install process will continue, but Netdata Logs Management support will be disabled."
     ENABLE_LOGS_MANAGEMENT=0
     return 0
   fi
 
-  patch -N -p1 fluent-bit/CMakeLists.txt -i logsmanagement/fluent_bit_build/CMakeLists.patch
-  patch -N -p1 fluent-bit/src/flb_log.c -i logsmanagement/fluent_bit_build/flb-log-fmt.patch
+  patch -N -p1 src/fluent-bit/CMakeLists.txt -i src/logsmanagement/fluent_bit_build/CMakeLists.patch
+  patch -N -p1 src/fluent-bit/src/flb_log.c -i src/logsmanagement/fluent_bit_build/flb-log-fmt.patch
 
   # If musl is used, we need to patch chunkio, providing fts has been previously installed.
   libc="$(detect_libc)"
   if [ "${libc}" = "musl" ]; then
-    patch -N -p1 fluent-bit/lib/chunkio/src/CMakeLists.txt -i logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
-    patch -N -p1 fluent-bit/cmake/luajit.cmake -i logsmanagement/fluent_bit_build/exclude-luajit.patch
-    patch -N -p1 fluent-bit/src/flb_network.c -i logsmanagement/fluent_bit_build/xsi-strerror.patch
+    patch -N -p1 src/fluent-bit/lib/chunkio/src/CMakeLists.txt -i src/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
+    patch -N -p1 src/fluent-bit/cmake/luajit.cmake -i src/logsmanagement/fluent_bit_build/exclude-luajit.patch
+    patch -N -p1 src/fluent-bit/src/flb_network.c -i src/logsmanagement/fluent_bit_build/xsi-strerror.patch
   fi
 
   [ -n "${GITHUB_ACTIONS}" ] && echo "::group::Bundling Fluent-Bit."
 
   if build_fluentbit "$cmake"; then
     # If Fluent-Bit built with inotify support, use it.
-    if [ "$(grep -o '^FLB_HAVE_INOTIFY:INTERNAL=.*' fluent-bit/build/CMakeCache.txt | cut -d '=' -f 2)" ]; then
+    if [ "$(grep -o '^FLB_HAVE_INOTIFY:INTERNAL=.*' src/fluent-bit/build/CMakeCache.txt | cut -d '=' -f 2)" ]; then
       CFLAGS="${CFLAGS} -DFLB_HAVE_INOTIFY"
     fi
     FLUENT_BIT_BUILD_SUCCESS=1
diff --git a/fluent-bit b/src/fluent-bit
-Subproject b19e9ce674de872640c00a697fa545b66df0628
+Subproject b19e9ce674de872640c00a697fa545b66df0628
diff --git a/logsmanagement/README.md b/src/logsmanagement/README.md
index 5c3982dca7..5c3982dca7 100644
--- a/logsmanagement/README.md
+++ b/src/logsmanagement/README.md
diff --git a/logsmanagement/circular_buffer.c b/src/logsmanagement/circular_buffer.c
index 9e748a30b4..9e748a30b4 100644
--- a/logsmanagement/circular_buffer.c
+++ b/src/logsmanagement/circular_buffer.c
diff --git a/logsmanagement/circular_buffer.h b/src/logsmanagement/circular_buffer.h
index 92697824bd..92697824bd 100644
--- a/logsmanagement/circular_buffer.h
+++ b/src/logsmanagement/circular_buffer.h
diff --git a/logsmanagement/db_api.c b/src/logsmanagement/db_api.c
index 50018ea26d..50018ea26d 100644
--- a/logsmanagement/db_api.c
+++ b/src/logsmanagement/db_api.c
diff --git a/logsmanagement/db_api.h b/src/logsmanagement/db_api.h
index 81ff2de063..81ff2de063 100644
--- a/logsmanagement/db_api.h
+++ b/src/logsmanagement/db_api.h
diff --git a/logsmanagement/defaults.h b/src/logsmanagement/defaults.h
index 2309f78109..2309f78109 100644
--- a/logsmanagement/defaults.h
+++ b/src/logsmanagement/defaults.h
diff --git a/logsmanagement/file_info.h b/src/logsmanagement/file_info.h
index 224f4ecc40..224f4ecc40 100644
--- a/logsmanagement/file_info.h
+++ b/src/logsmanagement/file_info.h
diff --git a/logsmanagement/flb_plugin.c b/src/logsmanagement/flb_plugin.c
index a583d8f957..a583d8f957 100644
--- a/logsmanagement/flb_plugin.c
+++ b/src/logsmanagement/flb_plugin.c
diff --git a/logsmanagement/flb_plugin.h b/src/logsmanagement/flb_plugin.h
index 5c35315b11..5c35315b11 100644
--- a/logsmanagement/flb_plugin.h
+++ b/src/logsmanagement/flb_plugin.h
diff --git a/logsmanagement/fluent_bit_build/CMakeLists.patch b/src/logsmanagement/fluent_bit_build/CMakeLists.patch
index e2b8cab145..e2b8cab145 100644
--- a/logsmanagement/fluent_bit_build/CMakeLists.patch
+++ b/src/logsmanagement/fluent_bit_build/CMakeLists.patch
diff --git a/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch b/src/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
index f3c4dd8355..f3c4dd8355 100644
--- a/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
+++ b/src/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
diff --git a/logsmanagement/fluent_bit_build/config.cmake b/src/logsmanagement/fluent_bit_build/config.cmake
index 7bb2e86a90..7bb2e86a90 100644
--- a/logsmanagement/fluent_bit_build/config.cmake
+++ b/src/logsmanagement/fluent_bit_build/config.cmake
diff --git a/logsmanagement/fluent_bit_build/exclude-luajit.patch b/src/logsmanagement/fluent_bit_build/exclude-luajit.patch
index 4055f59c17..4055f59c17 100644
--- a/logsmanagement/fluent_bit_build/exclude-luajit.patch
+++ b/src/logsmanagement/fluent_bit_build/exclude-luajit.patch
diff --git a/logsmanagement/fluent_bit_build/flb-log-fmt.patch b/src/logsmanagement/fluent_bit_build/flb-log-fmt.patch
index b3429c41d8..b3429c41d8 100644
--- a/logsmanagement/fluent_bit_build/flb-log-fmt.patch
+++ b/src/logsmanagement/fluent_bit_build/flb-log-fmt.patch
diff --git a/logsmanagement/fluent_bit_build/xsi-strerror.patch b/src/logsmanagement/fluent_bit_build/xsi-strerror.patch
index 527de20992..527de20992 100644
--- a/logsmanagement/fluent_bit_build/xsi-strerror.patch
+++ b/src/logsmanagement/fluent_bit_build/xsi-strerror.patch
diff --git a/logsmanagement/functions.c b/src/logsmanagement/functions.c
index 59a732bea8..59a732bea8 100644
--- a/logsmanagement/functions.c
+++ b/src/logsmanagement/functions.c
diff --git a/logsmanagement/functions.h b/src/logsmanagement/functions.h
index ea8f35c0e6..ea8f35c0e6 100644
--- a/logsmanagement/functions.h
+++ b/src/logsmanagement/functions.h
diff --git a/logsmanagement/helper.h b/src/logsmanagement/helper.h
index 6d1d51f76d..6d1d51f76d 100644
--- a/logsmanagement/helper.h
+++ b/src/logsmanagement/helper.h
diff --git a/logsmanagement/logsmanag_config.c b/src/logsmanagement/logsmanag_config.c
index e356183f81..e356183f81 100644
--- a/logsmanagement/logsmanag_config.c
+++ b/src/logsmanagement/logsmanag_config.c
diff --git a/logsmanagement/logsmanag_config.h b/src/logsmanagement/logsmanag_config.h
index 3469392216..3469392216 100644
--- a/logsmanagement/logsmanag_config.h
+++ b/src/logsmanagement/logsmanag_config.h
diff --git a/logsmanagement/logsmanagement.c b/src/logsmanagement/logsmanagement.c
index 05c18d3434..05c18d3434 100644
--- a/logsmanagement/logsmanagement.c
+++ b/src/logsmanagement/logsmanagement.c
diff --git a/logsmanagement/parser.c b/src/logsmanagement/parser.c
index f637bef278..f637bef278 100644
--- a/logsmanagement/parser.c
+++ b/src/logsmanagement/parser.c
diff --git a/logsmanagement/parser.h b/src/logsmanagement/parser.h
index c0cf284b10..c0cf284b10 100644
--- a/logsmanagement/parser.h
+++ b/src/logsmanagement/parser.h
diff --git a/logsmanagement/query.c b/src/logsmanagement/query.c
index c98e0ccc3b..c98e0ccc3b 100644
--- a/logsmanagement/query.c
+++ b/src/logsmanagement/query.c
diff --git a/logsmanagement/query.h b/src/logsmanagement/query.h
index a9da4368ab..a9da4368ab 100644
--- a/logsmanagement/query.h
+++ b/src/logsmanagement/query.h
diff --git a/logsmanagement/rrd_api/rrd_api.h b/src/logsmanagement/rrd_api/rrd_api.h
index 8c98acbb94..8c98acbb94 100644
--- a/logsmanagement/rrd_api/rrd_api.h
+++ b/src/logsmanagement/rrd_api/rrd_api.h
diff --git a/logsmanagement/rrd_api/rrd_api_docker_ev.c b/src/logsmanagement/rrd_api/rrd_api_docker_ev.c
index 743d256a90..743d256a90 100644
--- a/logsmanagement/rrd_api/rrd_api_docker_ev.c
+++ b/src/logsmanagement/rrd_api/rrd_api_docker_ev.c
diff --git a/logsmanagement/rrd_api/rrd_api_docker_ev.h b/src/logsmanagement/rrd_api/rrd_api_docker_ev.h
index 6934132657..6934132657 100644
--- a/logsmanagement/rrd_api/rrd_api_docker_ev.h
+++ b/src/logsmanagement/rrd_api/rrd_api_docker_ev.h
diff --git a/logsmanagement/rrd_api/rrd_api_generic.c b/src/logsmanagement/rrd_api/rrd_api_generic.c
index 752f5af75b..752f5af75b 100644
--- a/logsmanagement/rrd_api/rrd_api_generic.c
+++ b/src/logsmanagement/rrd_api/rrd_api_generic.c
diff --git a/logsmanagement/rrd_api/rrd_api_generic.h b/src/logsmanagement/rrd_api/rrd_api_generic.h
index 25b801a0d9..25b801a0d9 100644
--- a/logsmanagement/rrd_api/rrd_api_generic.h
+++ b/src/logsmanagement/rrd_api/rrd_api_generic.h
diff --git a/logsmanagement/rrd_api/rrd_api_kernel.c b/src/logsmanagement/rrd_api/rrd_api_kernel.c
index 9372f77356..9372f77356 100644
--- a/logsmanagement/rrd_api/rrd_api_kernel.c
+++ b/src/logsmanagement/rrd_api/rrd_api_kernel.c
diff --git a/logsmanagement/rrd_api/rrd_api_kernel.h b/src/logsmanagement/rrd_api/rrd_api_kernel.h
index ccb4a75267..ccb4a75267 100644
--- a/logsmanagement/rrd_api/rrd_api_kernel.h
+++ b/src/logsmanagement/rrd_api/rrd_api_kernel.h
diff --git a/logsmanagement/rrd_api/rrd_api_mqtt.c b/src/logsmanagement/rrd_api/rrd_api_mqtt.c
index eb90b2ab61..eb90b2ab61 100644
--- a/logsmanagement/rrd_api/rrd_api_mqtt.c
+++ b/src/logsmanagement/rrd_api/rrd_api_mqtt.c
diff --git a/logsmanagement/rrd_api/rrd_api_mqtt.h b/src/logsmanagement/rrd_api/rrd_api_mqtt.h
index 13c5cff3db..13c5cff3db 100644
--- a/logsmanagement/rrd_api/rrd_api_mqtt.h
+++ b/src/logsmanagement/rrd_api/rrd_api_mqtt.h
diff --git a/logsmanagement/rrd_api/rrd_api_stats.c b/src/logsmanagement/rrd_api/rrd_api_stats.c
index e845d04176..e845d04176 100644
--- a/logsmanagement/rrd_api/rrd_api_stats.c
+++ b/src/logsmanagement/rrd_api/rrd_api_stats.c
diff --git a/logsmanagement/rrd_api/rrd_api_stats.h b/src/logsmanagement/rrd_api/rrd_api_stats.h
index 79a0f15d14..79a0f15d14 100644
--- a/logsmanagement/rrd_api/rrd_api_stats.h
+++ b/src/logsmanagement/rrd_api/rrd_api_stats.h
diff --git a/logsmanagement/rrd_api/rrd_api_systemd.c b/src/logsmanagement/rrd_api/rrd_api_systemd.c
index 1d489389f6..1d48938