add netdata journald configuration (#17882)
* add netdata journald configuration * update uninstaller * put in "/usr/lib/systemd/journald@netdata.conf.d/" * update uninstaller * Update CMakeLists.txt Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com> * Update system/systemd/journald@netdata.conf * fix * usr/lib --------- Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
Ilya Mashchenko committed
Jun 14, 2024 at 19:18 UTC
3c507b4edb796f5a5cc7c6bcabfd9142494977cd
6 files changed
+49
CMakeLists.txt
+12
@@ -2566,11 +2566,23 @@ install(FILES
2566
COMPONENT netdata
2567
DESTINATION usr/lib/netdata/system/systemd)
2568
2569
+install(FILES
2570
+ system/systemd/journald@netdata.conf
2571
+ COMPONENT netdata
2572
+ DESTINATION usr/lib/netdata/system/systemd)
2573
+
2574
if(BUILD_FOR_PACKAGING)
2575
install(FILES
2576
${CMAKE_BINARY_DIR}/system/systemd/netdata.service
2577
COMPONENT netdata
2578
DESTINATION lib/systemd/system)
2579
+ install(DIRECTORY
2580
+ COMPONENT netdata
2581
+ DESTINATION usr/lib/systemd/journald@netdata.conf.d)
2582
+ install(FILES
2583
+ system/systemd/journald@netdata.conf
2584
+ COMPONENT netdata
2585
+ DESTINATION usr/lib/systemd/journald@netdata.conf.d/netdata.conf)
2586
endif()
2587
2588
configure_file(system/systemd/netdata.service.v235.in system/systemd/netdata.service.v235 @ONLY)
netdata-installer.sh
+4
@@ -799,6 +799,10 @@ progress "Install logrotate configuration for netdata"
799
800
install_netdata_logrotate
801
802
+progress "Install journald configuration for netdata"
803
+
804
+install_netdata_journald_conf
805
+
806
# -----------------------------------------------------------------------------
807
progress "Read installation options from netdata.conf"
808
packaging/installer/functions.sh
+22
@@ -909,6 +909,28 @@ install_netdata_logrotate() {
909
return 1
910
}
911
912
+# -----------------------------------------------------------------------------
913
+# install netdata journald configuration
914
+
915
+install_netdata_journald_conf() {
916
+ src="${NETDATA_PREFIX}/usr/lib/netdata/system/systemd/journald@netdata.conf"
917
+
918
+ [ ! -d /usr/lib/systemd/ ] && return 0
919
+ [ "${UID}" -ne 0 ] && return 1
920
+
921
+ if [ ! -d /usr/lib/systemd/journald@netdata.conf.d/ ]; then
922
+ run mkdir /usr/lib/systemd/journald@netdata.conf.d/
923
+ fi
924
+
925
+ run cp "${src}" /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
926
+
927
+ if [ -f /usr/lib/systemd/journald@netdata.conf.d/netdata.conf ]; then
928
+ run chmod 644 /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
929
+ fi
930
+
931
+ return 0
932
+}
933
+
934
# -----------------------------------------------------------------------------
935
# create netdata.conf
936
packaging/installer/netdata-uninstaller.sh
+2
@@ -729,6 +729,7 @@ fi
729
730
#### REMOVE NETDATA FILES
731
rm_file /etc/logrotate.d/netdata
732
+rm_file /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
733
rm_file /etc/systemd/system/netdata.service
734
rm_file /lib/systemd/system/netdata.service
735
rm_file /usr/lib/systemd/system/netdata.service
@@ -764,6 +765,7 @@ else
765
rm_dir "${NETDATA_PREFIX}/var/cache/netdata"
766
rm_dir "${NETDATA_PREFIX}/var/log/netdata"
767
rm_dir "${NETDATA_PREFIX}/etc/netdata"
768
+ rm_dir /usr/lib/systemd/journald@netdata.conf.d/
769
fi
770
771
if [ -n "${tmpdir}" ]; then
packaging/makeself/install-or-update.sh
+4
@@ -124,6 +124,10 @@ progress "Install logrotate configuration for netdata"
124
125
install_netdata_logrotate || run_failed "Cannot install logrotate file for netdata."
126
127
+progress "Install journald configuration for netdata"
128
+
129
+install_netdata_journald_conf || run_failed "Cannot install journald file for netdata."
130
+
131
# -----------------------------------------------------------------------------
132
progress "Telemetry configuration"
133
system/systemd/journald@netdata.conf
new
+5
@@ -0,0 +1,5 @@
1
+# See journald.conf(5) for details.
2
+
3
+[Journal]
4
+SystemMaxUse=256M
5
+RuntimeMaxUse=64M