[taler-grid5k] 126/141: add log backup and update dns config for 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 234a7e123678395c739d5efd88229ac9e6b8ff6d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Nov 11 23:37:04 2021 +0100

    add log backup and update dns config for nfs
---
 configs/etc/logrotate.d/taler    |  9 +++++++++
 configs/etc/rsyslog.d/taler.conf |  4 +++-
 docker/entrypoint.sh             |  7 ++++---
 experiment/env                   |  1 +
 experiment/scripts/log-save.sh   | 12 ++++++++++++
 experiment/scripts/monitor.sh    |  2 +-
 experiment/setup.sh              | 22 ++++++++++++++++------
 7 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/configs/etc/logrotate.d/taler b/configs/etc/logrotate.d/taler
new file mode 100644
index 0000000..8e592c2
--- /dev/null
+++ b/configs/etc/logrotate.d/taler
@@ -0,0 +1,9 @@
+/tmp/taler/*log {
+  daily
+  missingok
+  rotate 5
+  notifempty
+  create 
+  maxsize 500M
+  compress
+}
diff --git a/configs/etc/rsyslog.d/taler.conf b/configs/etc/rsyslog.d/taler.conf
index 1310d2d..ce535a7 100644
--- a/configs/etc/rsyslog.d/taler.conf
+++ b/configs/etc/rsyslog.d/taler.conf
@@ -1,16 +1,18 @@
 module(load="omprog")
 # Need to load due to parser error https://github.com/grafana/loki/issues/1783
 module(load="mmutf8fix")
+$template FileName,"/tmp/taler/%programname%.log"
 if ($programname startswith 'taler' or $syslogtag startswith 'taler') then {
   action(type="mmutf8fix" replacementChar="?")
 # 
https://grafana.com/docs/loki/latest/clients/promtail/scraping/#rsyslog-output-configuration
   action(type="omfwd"
          protocol="tcp"
-         target="<MONITOR_DOMAIN_HERE>"
+         target="monitor.perf.taler"
          port="1514"
          Template="RSYSLOG_SyslogProtocol23Format"
          TCP_Framing="octet-counted"
          KeepAlive="on")
+  *.* ?FileName
   & stop
 }
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 36ddf5f..a99ef00 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -153,12 +153,13 @@ then
   mv "${TALER_HOME}"/merchant/taler-merchant*.tar.gz 
grid5000/steps/data/merchant.tar.gz
   mv "${TALER_HOME}"/wallet-core/taler-wallet*.tar.gz 
grid5000/steps/data/wallet.tar.gz
 
-  rm -rf build || true
+  rm -rf /tmp/taler-debian11 || true
   echo "INFO building image"
-  yes r | kameleon build taler-debian11.yaml | tee build.log 
+  yes r | kameleon build -b /tmp taler-debian11.yaml | tee build.log 
+  mv /tmp/taler-debian11 ${TALER_HOME}
 fi
 
-cd build/taler-debian11
+cd ${TALER_HOME}/taler-debian11
 
 if [ -f "/root/cert.pem" ] && [ "$COPY" != false ]; then
 
diff --git a/experiment/env b/experiment/env
index c7ba1ab..305f45d 100755
--- a/experiment/env
+++ b/experiment/env
@@ -48,4 +48,5 @@ NUM_WIREWATTCH_PROCESSES=1
 ENABLE_EXPORTERS=true
 
 DYNDNS_KEY=
+GRAFANA_HOST=
 GRAFANA_API_KEY=
diff --git a/experiment/scripts/log-save.sh b/experiment/scripts/log-save.sh
new file mode 100755
index 0000000..81e2a74
--- /dev/null
+++ b/experiment/scripts/log-save.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+LOG_DIR=/tmp/taler
+
+EXPORT_DIR=/home/${G5K_USER}/taler-logs
+
+if [ ! -d "${EXPORT_DIR}" ]; then
+  mkdir "${EXPORT_DIR}"
+fi
+
+logrotate -f /etc/logrotate.d/taler
+cp ${LOG_DIR}/*.gz ${EXPORT_DIR}
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 84b026b..0b15817 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -6,7 +6,7 @@ source ~/scripts/helpers.sh
 if [[ "$1" == "init" ]];
 then
   AUTH_HEADER="Authorization: Bearer ${GRAFANA_API_KEY}"
-  GRAFANA_API="https://$(host ${DNS_HOST} | sed -n 1p | awk '{print 
$4}'):3000/api"
+  GRAFANA_API="https://$(host ${GRAFANA_HOST} | sed -n 1p | awk '{print 
$4}'):3000/api"
   
   if ! curl -k -f -H "${AUTH_HEADER}" \
     "${GRAFANA_API}/datasources" \
diff --git a/experiment/setup.sh b/experiment/setup.sh
index cfdf365..d06e444 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -4,6 +4,7 @@ set -euax
 
 source .env
 cat .env | tee -a /etc/environment
+echo "G5K_USER=$(cat experiment-info.json | jq -r '.user.name')" >> 
/etc/environment
 
 G5K_HOME=/root/grid5k
 
@@ -22,6 +23,9 @@ cp -r "${G5K_HOME}"/configs/* /
 sed -i "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
        /etc/rsyslog.d/taler.conf
 
+echo "*/10 * * * * root /bin/bash /root/scripts/log-save.sh" \
+      >> /etc/crontab
+
 # Add the dyndns key which will be used by the dns update
 cat << EOF > /root/ddns.key 
 key "ddns-key.perf.taler" {
@@ -30,17 +34,23 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-# Add our DNS on taler.net as the only nameserver 
-if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
-  echo "nameserver 127.0.0.1" > /etc/resolv.conf
-  echo "nameserver ${NS_IP}" >> /etc/resolv.conf
+if ! grep -Fxq "server=/${DNS_ZONE}/${NS_IP}" /etc/dnsmasq.conf ; then
+  grep nameserver /etc/resolv.conf | \
+       awk '{print "server="$2}' \
+       >> /etc/dnsmasq.conf
+  
+  echo "server=/${DNS_ZONE}/${NS_IP}" >> /etc/dnsmasq.conf
 fi
 
+echo "nameserver 127.0.0.1" > /etc/resolv.conf
+
 systemctl daemon-reload
 systemctl restart dnsmasq
 
-mv ~/taler-perf.sh /usr/local/bin/taler-perf
+if [ -f ~/taler-perf.sh ]; then
+  mv ~/taler-perf.sh /usr/local/bin/taler-perf
+fi
 
-source ~/scripts/createusers.sh
+exec ~/scripts/createusers.sh
 
 exit 0

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