Browse Source

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 9 months ago
parent
commit
3c507b4edb

+ 12 - 0
CMakeLists.txt

@@ -2566,11 +2566,23 @@ install(FILES
         COMPONENT netdata
         DESTINATION usr/lib/netdata/system/systemd)
 
+install(FILES
+        system/systemd/journald@netdata.conf
+        COMPONENT netdata
+        DESTINATION usr/lib/netdata/system/systemd)
+
 if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
                 COMPONENT netdata
                 DESTINATION lib/systemd/system)
+        install(DIRECTORY
+                COMPONENT netdata
+                DESTINATION usr/lib/systemd/journald@netdata.conf.d)
+        install(FILES
+                system/systemd/journald@netdata.conf
+                COMPONENT netdata
+                DESTINATION usr/lib/systemd/journald@netdata.conf.d/netdata.conf)
 endif()
 
 configure_file(system/systemd/netdata.service.v235.in system/systemd/netdata.service.v235 @ONLY)

+ 4 - 0
netdata-installer.sh

@@ -799,6 +799,10 @@ progress "Install logrotate configuration for netdata"
 
 install_netdata_logrotate
 
+progress "Install journald configuration for netdata"
+
+install_netdata_journald_conf
+
 # -----------------------------------------------------------------------------
 progress "Read installation options from netdata.conf"
 

+ 22 - 0
packaging/installer/functions.sh

@@ -909,6 +909,28 @@ install_netdata_logrotate() {
   return 1
 }
 
+# -----------------------------------------------------------------------------
+# install netdata journald configuration
+
+install_netdata_journald_conf() {
+  src="${NETDATA_PREFIX}/usr/lib/netdata/system/systemd/journald@netdata.conf"
+
+  [ ! -d /usr/lib/systemd/ ] && return 0
+  [ "${UID}" -ne 0 ] && return 1
+
+  if [ ! -d /usr/lib/systemd/journald@netdata.conf.d/ ]; then
+    run mkdir /usr/lib/systemd/journald@netdata.conf.d/
+  fi
+
+  run cp "${src}" /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
+
+  if [ -f /usr/lib/systemd/journald@netdata.conf.d/netdata.conf ]; then
+    run chmod 644 /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
+  fi
+
+  return 0
+}
+
 # -----------------------------------------------------------------------------
 # create netdata.conf
 

+ 2 - 0
packaging/installer/netdata-uninstaller.sh

@@ -729,6 +729,7 @@ fi
 
 #### REMOVE NETDATA FILES
 rm_file /etc/logrotate.d/netdata
+rm_file /usr/lib/systemd/journald@netdata.conf.d/netdata.conf
 rm_file /etc/systemd/system/netdata.service
 rm_file /lib/systemd/system/netdata.service
 rm_file /usr/lib/systemd/system/netdata.service
@@ -764,6 +765,7 @@ else
   rm_dir "${NETDATA_PREFIX}/var/cache/netdata"
   rm_dir "${NETDATA_PREFIX}/var/log/netdata"
   rm_dir "${NETDATA_PREFIX}/etc/netdata"
+  rm_dir /usr/lib/systemd/journald@netdata.conf.d/
 fi
 
 if [ -n "${tmpdir}" ]; then

+ 4 - 0
packaging/makeself/install-or-update.sh

@@ -124,6 +124,10 @@ progress "Install logrotate configuration for netdata"
 
 install_netdata_logrotate || run_failed "Cannot install logrotate file for netdata."
 
+progress "Install journald configuration for netdata"
+
+install_netdata_journald_conf || run_failed "Cannot install journald file for netdata."
+
 # -----------------------------------------------------------------------------
 progress "Telemetry configuration"
 

+ 5 - 0
system/systemd/journald@netdata.conf

@@ -0,0 +1,5 @@
+# See journald.conf(5) for details.
+
+[Journal]
+SystemMaxUse=256M
+RuntimeMaxUse=64M