[taler-grid5k] 12/16: move logs automatically to nfs

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit b5ad7a34544fab83c99f9c6108cfce7b435ccbc7
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Nov 22 22:53:00 2021 +0100

    move logs automatically to nfs
---
 configs/etc/logrotate.d/taler                       |  2 +-
 configs/etc/rsyslog.d/taler.conf                    |  2 +-
 .../usr/lib/systemd/system/taler-logbackup.service  |  3 +--
 .../usr/lib/systemd/system/taler-logbackup.timer    |  2 +-
 experiment/scripts/log-save.sh                      | 21 ---------------------
 experiment/scripts/setup.sh                         | 19 ++++++++++++-------
 image/taler-debian11.yaml                           |  2 +-
 7 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/configs/etc/logrotate.d/taler b/configs/etc/logrotate.d/taler
index 61358f5..d45447a 100644
--- a/configs/etc/logrotate.d/taler
+++ b/configs/etc/logrotate.d/taler
@@ -1,4 +1,4 @@
-/home/<G5K_USER_HERE>/taler-logs/*log {
+<LOG_DIR_HERE>/*log {
   daily
   missingok
   rotate 100
diff --git a/configs/etc/rsyslog.d/taler.conf b/configs/etc/rsyslog.d/taler.conf
index f369a23..cbc8e7a 100644
--- a/configs/etc/rsyslog.d/taler.conf
+++ b/configs/etc/rsyslog.d/taler.conf
@@ -3,7 +3,7 @@ module(load="omprog")
 module(load="mmutf8fix")
 
 # Set the filename for the log backup
-$template FileName,"/home/<G5K_USER_HERE>/taler-logs/%programname%.log"
+$template FileName,"<LOG_DIR_HERE>/%programname%.log"
 
 if ($programname startswith 'taler' or $syslogtag startswith 'taler') then {
   action(type="mmutf8fix" replacementChar="?")
diff --git a/configs/usr/lib/systemd/system/taler-logbackup.service 
b/configs/usr/lib/systemd/system/taler-logbackup.service
index ed81bc6..45001c2 100644
--- a/configs/usr/lib/systemd/system/taler-logbackup.service
+++ b/configs/usr/lib/systemd/system/taler-logbackup.service
@@ -3,9 +3,8 @@ Description=Compresses and moves taler logs to the grid5000 nfs
 Wants=taler-logbackup.timer
 
 [Service]
-EnvironmentFile=/etc/environment
 Type=oneshot
-ExecStart=/root/scripts/log-save.sh 
+ExecStart=/usr/sbin/logrotate /etc/logrotate.d/taler
 
 [Install]
 WantedBy=multi-user.target
diff --git a/configs/usr/lib/systemd/system/taler-logbackup.timer 
b/configs/usr/lib/systemd/system/taler-logbackup.timer
index a602e2b..fe33a6a 100644
--- a/configs/usr/lib/systemd/system/taler-logbackup.timer
+++ b/configs/usr/lib/systemd/system/taler-logbackup.timer
@@ -4,7 +4,7 @@ Requires=taler-logbackup.service
 
 [Timer]
 Unit=taler-logbackup.service
-OnCalendar=*:0/10
+OnCalendar=*:0/15
 
 [Install]
 WantedBy=timers.target
diff --git a/experiment/scripts/log-save.sh b/experiment/scripts/log-save.sh
deleted file mode 100755
index bbdfe74..0000000
--- a/experiment/scripts/log-save.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Runs logrotate on the logs written to LOG_DIR
-# Assumes rsyslog to be configured to log files there
-
-LOG_DIR=/tmp/taler
-
-EXPORT_DIR=/home/${G5K_USER}/taler-logs
-
-if [ ! -d "${EXPORT_DIR}" ]; then
-  mkdir "${EXPORT_DIR}"
-fi
-
-logrotate /etc/logrotate.d/taler
-
-TS=$(date +%s)
-
-if [ -d "${LOG_DIR}" ]; then
-  for FILE in $(find ${LOG_DIR} -iname "*.gz"); do
-    mv ${FILE} ${EXPORT_DIR}/$(basename -- ${FILE%.gz}.${TS}.gz)
-  done
-fi
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 20732ee..e4d67ed 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -2,15 +2,20 @@
 # Setup nodes for the experiment
 set -euax
 
+echo "G5K_USER=$(cat ~/experiment-info.json | jq -r '.user.name')" >> ~/.env
+
 source ~/.env
 # Add the environment config for following shells
 cat ~/.env | tee -a /etc/environment
-echo "G5K_USER=$(cat ~/experiment-info.json | jq -r '.user.name')" >> 
/etc/environment
 
-if [ -d /home${G5K_USER}/taler-logs ]; then
-  rm -rf /home/${G5K_USER}/taler-logs/*
-else 
-  mkdir /home/${G5K_USER}/taler-logs
+LOG_DIR=/home/${G5K_USER}/taler-logs
+
+if [ -d ${LOG_DIR} ]; then
+  rm -rf ${LOG_DIR}/*
+elif [ -d /home/${G5K_USER} ]; then 
+  mkdir ${LOG_DIR}
+else
+  LOG_DIR=/tmp/taler && mkdir ${LOG_DIR}
 fi
 
 G5K_HOME=/root/taler/grid5k
@@ -28,10 +33,10 @@ cp -r "${G5K_HOME}"/configs/* /
 
 # Send all logs about taler to promtail on the monitoring node
 sed -i -e "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
-         "s/<G5K_USER_HERE>/${G5K_USER}/g" \
+       -e "s/<LOG_DIR_HERE>/${LOG_DIR}/g" \
        /etc/rsyslog.d/taler.conf
 
-sed -i "s/<G5K_USER_HERE>/${G5K_USER}/g" \
+sed -i "s/<LOG_DIR_HERE>/${LOG_DIR}/g" \
         /etc/logrotate.d/taler
 
 sed -i "s/<ARGUMENTS_HERE>/${EXCHANGE_ARGS}/g" \
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index bbf6825..dec6fb8 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -42,7 +42,7 @@ global:
   taler_build_packages: "recutils autoconf uncrustify autopoint libtool 
python3-pip libgcrypt20-dev libjansson-dev libcurl4-gnutls-dev libsodium-dev 
libidn2-dev libunistring-dev libmicrohttpd-dev libsqlite3-dev libqrencode-dev 
valgrind libpq-dev texinfo gdb make npm zip python3-distutils pkg-config"
   taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs tshark dnsmasq bind9"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter"
-  taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter"
+  taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named"
   taler_loki_version: "v2.4.0"
   gnunet_tar: gnunet.tar.gz
   exchange_tar: exchange.tar.gz

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.