@cryptotaxi247 / netdata-1 / commits / 7ab98e59d

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

vkalintiris committed Feb 1, 2024 at 18:33 UTC 7ab98e59d35f5b96bb3d9435be5f0b6ceaa25a96
54 files changed +54 -54
.github/labeler.yml
+1 -1
@@ -278,4 +278,4 @@ area/logs-management:
278 - any:
279 - changed-files:
280 - any-glob-to-any-file:
281 - - logsmanagement/**
281 + - src/logsmanagement/**
.gitignore
+1 -1
@@ -158,7 +158,7 @@ collectors/ioping.plugin/ioping.plugin
158 collectors/go.d.plugin
159 web/netdata-switch-dashboard.sh
160
161 -logsmanagement/stress_test/stress_test
161 +src/logsmanagement/stress_test/stress_test
162
163 # installer generated files
164 /netdata-uninstaller.sh
.gitmodules
+1 -1
@@ -11,7 +11,7 @@
11 url = https://github.com/h2o/h2o.git
12 ignore = untracked
13 [submodule "fluent-bit"]
14 - path = fluent-bit
14 + path = src/fluent-bit
15 url = https://github.com/fluent/fluent-bit.git
16 shallow = true
17 ignore = dirty
\ No newline at end of file
CMakeLists.txt
+38 -38
@@ -1258,39 +1258,39 @@ set(TC_PLUGIN_FILES
1258 )
1259
1260 set(LOGS_MANAGEMENT_PLUGIN_FILES
1261 - logsmanagement/circular_buffer.c
1262 - logsmanagement/circular_buffer.h
1263 - logsmanagement/db_api.c
1264 - logsmanagement/db_api.h
1265 - logsmanagement/defaults.h
1266 - logsmanagement/file_info.h
1267 - logsmanagement/flb_plugin.c
1268 - logsmanagement/flb_plugin.h
1269 - logsmanagement/functions.c
1270 - logsmanagement/functions.h
1271 - logsmanagement/helper.h
1272 - logsmanagement/logsmanag_config.c
1273 - logsmanagement/logsmanag_config.h
1274 - logsmanagement/logsmanagement.c
1275 - logsmanagement/parser.c
1276 - logsmanagement/parser.h
1277 - logsmanagement/query.c
1278 - logsmanagement/query.h
1279 - logsmanagement/rrd_api/rrd_api_docker_ev.c
1280 - logsmanagement/rrd_api/rrd_api_docker_ev.h
1281 - logsmanagement/rrd_api/rrd_api_generic.c
1282 - logsmanagement/rrd_api/rrd_api_generic.h
1283 - logsmanagement/rrd_api/rrd_api_kernel.c
1284 - logsmanagement/rrd_api/rrd_api_kernel.h
1285 - logsmanagement/rrd_api/rrd_api_mqtt.c
1286 - logsmanagement/rrd_api/rrd_api_mqtt.h
1287 - logsmanagement/rrd_api/rrd_api_stats.c
1288 - logsmanagement/rrd_api/rrd_api_stats.h
1289 - logsmanagement/rrd_api/rrd_api_systemd.c
1290 - logsmanagement/rrd_api/rrd_api_systemd.h
1291 - logsmanagement/rrd_api/rrd_api_web_log.c
1292 - logsmanagement/rrd_api/rrd_api_web_log.h
1293 - logsmanagement/rrd_api/rrd_api.h
1261 + src/logsmanagement/circular_buffer.c
1262 + src/logsmanagement/circular_buffer.h
1263 + src/logsmanagement/db_api.c
1264 + src/logsmanagement/db_api.h
1265 + src/logsmanagement/defaults.h
1266 + src/logsmanagement/file_info.h
1267 + src/logsmanagement/flb_plugin.c
1268 + src/logsmanagement/flb_plugin.h
1269 + src/logsmanagement/functions.c
1270 + src/logsmanagement/functions.h
1271 + src/logsmanagement/helper.h
1272 + src/logsmanagement/logsmanag_config.c
1273 + src/logsmanagement/logsmanag_config.h
1274 + src/logsmanagement/logsmanagement.c
1275 + src/logsmanagement/parser.c
1276 + src/logsmanagement/parser.h
1277 + src/logsmanagement/query.c
1278 + src/logsmanagement/query.h
1279 + src/logsmanagement/rrd_api/rrd_api_docker_ev.c
1280 + src/logsmanagement/rrd_api/rrd_api_docker_ev.h
1281 + src/logsmanagement/rrd_api/rrd_api_generic.c
1282 + src/logsmanagement/rrd_api/rrd_api_generic.h
1283 + src/logsmanagement/rrd_api/rrd_api_kernel.c
1284 + src/logsmanagement/rrd_api/rrd_api_kernel.h
1285 + src/logsmanagement/rrd_api/rrd_api_mqtt.c
1286 + src/logsmanagement/rrd_api/rrd_api_mqtt.h
1287 + src/logsmanagement/rrd_api/rrd_api_stats.c
1288 + src/logsmanagement/rrd_api/rrd_api_stats.h
1289 + src/logsmanagement/rrd_api/rrd_api_systemd.c
1290 + src/logsmanagement/rrd_api/rrd_api_systemd.h
1291 + src/logsmanagement/rrd_api/rrd_api_web_log.c
1292 + src/logsmanagement/rrd_api/rrd_api_web_log.h
1293 + src/logsmanagement/rrd_api/rrd_api.h
1294 src/database/sqlite/sqlite3.c
1295 src/database/sqlite/sqlite3.h
1296 )
@@ -1847,8 +1847,8 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
1847 set(ENABLE_LOGSMANAGEMENT True)
1848
1849 if(ENABLE_LOGS_MANAGEMENT_TESTS)
1850 - list(APPEND LOGS_MANAGEMENT_PLUGIN_FILES logsmanagement/unit_test/unit_test.c
1851 - logsmanagement/unit_test/unit_test.h)
1850 + list(APPEND LOGS_MANAGEMENT_PLUGIN_FILES src/logsmanagement/unit_test/unit_test.c
1851 + src/logsmanagement/unit_test/unit_test.h)
1852 set(ENABLE_LOGSMANAGEMENT_TESTS True)
1853 endif()
1854
@@ -1859,7 +1859,7 @@ if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
1859 COMPONENT logs_management_plugin
1860 DESTINATION usr/libexec/netdata/plugins.d)
1861
1862 - install(DIRECTORY logsmanagement/stock_conf/logsmanagement.d
1862 + install(DIRECTORY src/logsmanagement/stock_conf/logsmanagement.d
1863 COMPONENT logs_management_plugin
1864 DESTINATION usr/lib/netdata/conf.d)
1865
@@ -2683,8 +2683,8 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/collectors/ioping.plugin/ioping.plugin DEST
2683 # logs management
2684 #
2685 if (ENABLE_PLUGIN_LOGS_MANAGEMENT)
2686 - configure_file(logsmanagement/stock_conf/logsmanagement.d.conf.in logsmanagement/stock_conf/logsmanagement.d.conf @ONLY)
2687 - install(FILES ${CMAKE_BINARY_DIR}/logsmanagement/stock_conf/logsmanagement.d.conf
2686 + configure_file(src/logsmanagement/stock_conf/logsmanagement.d.conf.in src/logsmanagement/stock_conf/logsmanagement.d.conf @ONLY)
2687 + install(FILES ${CMAKE_BINARY_DIR}/src/logsmanagement/stock_conf/logsmanagement.d.conf
2688 COMPONENT logs_management_plugin
2689 DESTINATION usr/lib/netdata/conf.d)
2690 endif()
netdata-installer.sh
+11 -11
@@ -972,20 +972,20 @@ build_fluentbit() {
972 env_cmd="env CFLAGS='-fPIC -pipe -w' CXXFLAGS='-fPIC -pipe -w' LDFLAGS="
973 fi
974
975 - mkdir -p fluent-bit/build || return 1
976 - cd fluent-bit/build > /dev/null || return 1
975 + mkdir -p src/fluent-bit/build || return 1
976 + cd src/fluent-bit/build > /dev/null || return 1
977
978 rm CMakeCache.txt > /dev/null 2>&1
979
980 if ! run eval "${env_cmd} $1 -C ../../logsmanagement/fluent_bit_build/config.cmake -B./ -S../"; then
981 cd - > /dev/null || return 1
982 - rm -rf fluent-bit/build > /dev/null 2>&1
982 + rm -rf src/fluent-bit/build > /dev/null 2>&1
983 return 1
984 fi
985
986 if ! run eval "${env_cmd} ${make} ${MAKEOPTS}"; then
987 cd - > /dev/null || return 1
988 - rm -rf fluent-bit/build > /dev/null 2>&1
988 + rm -rf src/fluent-bit/build > /dev/null 2>&1
989 return 1
990 fi
991
@@ -1000,28 +1000,28 @@ bundle_fluentbit() {
1000 return 0
1001 fi
1002
1003 - if [ ! -d "fluent-bit" ]; then
1003 + if [ ! -d "src/fluent-bit" ]; then
1004 warning "Missing submodule Fluent-Bit. The install process will continue, but Netdata Logs Management support will be disabled."
1005 ENABLE_LOGS_MANAGEMENT=0
1006 return 0
1007 fi
1008
1009 - patch -N -p1 fluent-bit/CMakeLists.txt -i logsmanagement/fluent_bit_build/CMakeLists.patch
1010 - patch -N -p1 fluent-bit/src/flb_log.c -i logsmanagement/fluent_bit_build/flb-log-fmt.patch
1009 + patch -N -p1 src/fluent-bit/CMakeLists.txt -i src/logsmanagement/fluent_bit_build/CMakeLists.patch
1010 + patch -N -p1 src/fluent-bit/src/flb_log.c -i src/logsmanagement/fluent_bit_build/flb-log-fmt.patch
1011
1012 # If musl is used, we need to patch chunkio, providing fts has been previously installed.
1013 libc="$(detect_libc)"
1014 if [ "${libc}" = "musl" ]; then
1015 - patch -N -p1 fluent-bit/lib/chunkio/src/CMakeLists.txt -i logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
1016 - patch -N -p1 fluent-bit/cmake/luajit.cmake -i logsmanagement/fluent_bit_build/exclude-luajit.patch
1017 - patch -N -p1 fluent-bit/src/flb_network.c -i logsmanagement/fluent_bit_build/xsi-strerror.patch
1015 + patch -N -p1 src/fluent-bit/lib/chunkio/src/CMakeLists.txt -i src/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch
1016 + patch -N -p1 src/fluent-bit/cmake/luajit.cmake -i src/logsmanagement/fluent_bit_build/exclude-luajit.patch
1017 + patch -N -p1 src/fluent-bit/src/flb_network.c -i src/logsmanagement/fluent_bit_build/xsi-strerror.patch
1018 fi
1019
1020 [ -n "${GITHUB_ACTIONS}" ] && echo "::group::Bundling Fluent-Bit."
1021
1022 if build_fluentbit "$cmake"; then
1023 # If Fluent-Bit built with inotify support, use it.
1024 - if [ "$(grep -o '^FLB_HAVE_INOTIFY:INTERNAL=.*' fluent-bit/build/CMakeCache.txt | cut -d '=' -f 2)" ]; then
1024 + if [ "$(grep -o '^FLB_HAVE_INOTIFY:INTERNAL=.*' src/fluent-bit/build/CMakeCache.txt | cut -d '=' -f 2)" ]; then
1025 CFLAGS="${CFLAGS} -DFLB_HAVE_INOTIFY"
1026 fi
1027 FLUENT_BIT_BUILD_SUCCESS=1
src/fluent-bit renamed
src/logsmanagement/README.md renamed
src/logsmanagement/circular_buffer.c renamed
src/logsmanagement/circular_buffer.h renamed
src/logsmanagement/db_api.c renamed
src/logsmanagement/db_api.h renamed
src/logsmanagement/defaults.h renamed
src/logsmanagement/file_info.h renamed
src/logsmanagement/flb_plugin.c renamed
src/logsmanagement/flb_plugin.h renamed
src/logsmanagement/fluent_bit_build/CMakeLists.patch renamed
src/logsmanagement/fluent_bit_build/chunkio-static-lib-fts.patch renamed
src/logsmanagement/fluent_bit_build/config.cmake renamed
src/logsmanagement/fluent_bit_build/exclude-luajit.patch renamed
src/logsmanagement/fluent_bit_build/flb-log-fmt.patch renamed
src/logsmanagement/fluent_bit_build/xsi-strerror.patch renamed
src/logsmanagement/functions.c renamed
src/logsmanagement/functions.h renamed
src/logsmanagement/helper.h renamed
src/logsmanagement/logsmanag_config.c renamed
src/logsmanagement/logsmanag_config.h renamed
src/logsmanagement/logsmanagement.c renamed
src/logsmanagement/parser.c renamed
src/logsmanagement/parser.h renamed
src/logsmanagement/query.c renamed
src/logsmanagement/query.h renamed
src/logsmanagement/rrd_api/rrd_api.h renamed
src/logsmanagement/rrd_api/rrd_api_docker_ev.c renamed
src/logsmanagement/rrd_api/rrd_api_docker_ev.h renamed
src/logsmanagement/rrd_api/rrd_api_generic.c renamed
src/logsmanagement/rrd_api/rrd_api_generic.h renamed
src/logsmanagement/rrd_api/rrd_api_kernel.c renamed
src/logsmanagement/rrd_api/rrd_api_kernel.h renamed
src/logsmanagement/rrd_api/rrd_api_mqtt.c renamed
src/logsmanagement/rrd_api/rrd_api_mqtt.h renamed
src/logsmanagement/rrd_api/rrd_api_stats.c renamed
src/logsmanagement/rrd_api/rrd_api_stats.h renamed
src/logsmanagement/rrd_api/rrd_api_systemd.c renamed
src/logsmanagement/rrd_api/rrd_api_systemd.h renamed
src/logsmanagement/rrd_api/rrd_api_web_log.c renamed
src/logsmanagement/rrd_api/rrd_api_web_log.h renamed
src/logsmanagement/stock_conf/logsmanagement.d.conf.in renamed
src/logsmanagement/stock_conf/logsmanagement.d/default.conf renamed
+2 -2
@@ -1,6 +1,6 @@
1 # ------------------------------------------------------------------------------
2 # Netdata Logs Management default configuration
3 -# See full explanation on https://github.com/netdata/netdata/blob/master/logsmanagement/README.md
3 +# See full explanation on https://github.com/netdata/netdata/blob/master/src/logsmanagement/README.md
4 #
5 # To add a new log source, a new section must be added in this
6 # file with at least the following settings:
@@ -10,7 +10,7 @@
10 # log type = flb_tail
11 #
12 # For a list of all available log types, see:
13 -# https://github.com/netdata/netdata/blob/master/logsmanagement/README.md#types-of-available-collectors
13 +# https://github.com/netdata/netdata/blob/master/src/logsmanagement/README.md#types-of-available-collectors
14 #
15 # ------------------------------------------------------------------------------
16
src/logsmanagement/stock_conf/logsmanagement.d/example_forward.conf renamed
src/logsmanagement/stock_conf/logsmanagement.d/example_mqtt.conf renamed
src/logsmanagement/stock_conf/logsmanagement.d/example_serial.conf renamed
src/logsmanagement/stock_conf/logsmanagement.d/example_syslog.conf renamed
src/logsmanagement/unit_test/unit_test.c renamed
src/logsmanagement/unit_test/unit_test.h renamed