]> arthur.barton.de Git - netdata.git/commitdiff
install netdata logrotate file, fixes #413
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 15 May 2016 10:28:57 +0000 (13:28 +0300)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 15 May 2016 10:28:57 +0000 (13:28 +0300)
netdata-installer.sh

index 11597c346c7a138862b4bf166616a26378760d1f..58c302a191fd738d8fec89db272b0ed598939de3 100755 (executable)
@@ -303,7 +303,7 @@ run() {
 if [ ${LIBS_ARE_HERE} -eq 1 ]
        then
        shift
-       echo >&2 "ok, assuming zlib is really installed."
+       echo >&2 "ok, assuming libs are really installed."
        export ZLIB_CFLAGS=" "
        export ZLIB_LIBS="-lz"
        export UUID_CFLAGS=" "
@@ -337,11 +337,16 @@ echo >&2 "Compiling netdata ..."
 run make || exit 1
 
 # backup user configurations
+installer_backup_suffix="${PID}.${RANDOM}"
 for x in apps_groups.conf charts.d.conf
 do
        if [ -f "${NETDATA_PREFIX}/etc/netdata/${x}" ]
                then
-               cp -p "${NETDATA_PREFIX}/etc/netdata/${x}" "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup"
+               cp -p "${NETDATA_PREFIX}/etc/netdata/${x}" "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup.${installer_backup_suffix}"
+
+       elif [ -f "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup.${installer_backup_suffix}" ]
+               then
+               rm -f "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup.${installer_backup_suffix}"
        fi
 done
 
@@ -351,9 +356,9 @@ run make install || exit 1
 # restore user configurations
 for x in apps_groups.conf charts.d.conf
 do
-       if [ -f "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup" ]
+       if [ -f "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup.${installer_backup_suffix}" ]
                then
-               cp -p "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup" "${NETDATA_PREFIX}/etc/netdata/${x}"
+               cp -p "${NETDATA_PREFIX}/etc/netdata/${x}.installer_backup.${installer_backup_suffix}" "${NETDATA_PREFIX}/etc/netdata/${x}"
        fi
 done
 
@@ -391,6 +396,12 @@ if [ ${UID} -eq 0 ]
                # let the uninstall script know
                NETDATA_ADDED_TO_DOCKER=1
        fi
+
+       if [ -d /etc/logrotate.d -a ! -f /etc/logrotate.d/netdata ]
+               then
+               echo >&2 "Adding netdata logrotate configuration ..."
+               run cp system/netdata.logrotate /etc/logrotate.d/netdata
+       fi
 fi
 
 
@@ -706,8 +717,6 @@ if [ "${UID}" -ne 0 ]
                sudo chown root "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/apps.plugin"
                sudo chmod 4755 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/apps.plugin"
 
-       These commands allow apps.plugin to run as root.
-
        apps.plugin is performing a hard-coded function of data collection for all
        running processes. It cannot be instructed from the netdata daemon to perform
        any task, so it is pretty safe to do this.
@@ -766,6 +775,12 @@ cat >netdata-uninstaller.sh <<-UNINSTALL
                deletedir "${NETDATA_PREFIX}/var/log/netdata"
        fi
 
+       if [ -f /etc/logrotate.d/netdata ]
+               then
+               echo "Deleting /etc/logrotate.d/netdata ..."
+               rm -i /etc/logrotate.d/netdata
+       fi
+
        getent passwd netdata > /dev/null
        if [ $? -eq 0 ]
                then