[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 29/48: nginx query params break loki
From: |
gnunet |
Subject: |
[taler-grid5k] 29/48: nginx query params break loki |
Date: |
Sat, 28 May 2022 12:11:49 +0200 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a commit to branch master
in repository grid5k.
commit 476ce80589256aba2c39fc4477a044f54a30b64d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu May 19 20:45:35 2022 +0200
nginx query params break loki
---
additional/persist.sh | 17 ++++++++++-------
configs/etc/nginx/sites-available/auditor | 3 ++-
configs/etc/nginx/sites-available/exchange | 3 ++-
configs/etc/nginx/sites-available/fakebank | 3 ++-
configs/etc/nginx/sites-available/merchant | 3 ++-
image/debian11/taler-debian11.yaml | 2 +-
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/additional/persist.sh b/additional/persist.sh
index 1761c4d..12bddc5 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -50,16 +50,19 @@ function backup() {
G5K_BACKUP="g5k-$(date +%s).tar.gz"
- echo "Creating archive, this can take some time"
- ssh g5k 'rm -rf grenoble/g5k.tar* && find . -maxdepth 1 -type l -exec tar
--ignore-failed-read -rf grenoble/g5k.tar -C {} exp-logs exp-data espec-times
2>&1 \; | grep -vi "no such file"' &
-
+ ssh g5k 'rm -rf grenoble/g5k.tar* || true'
+
+ echo "Copying files, this can take some time"
+ # We are not using tar -r because this scans the whole archive and takes
forever for big ones
+ ssh g5k 'find . -maxdepth 1 -type l ! -name grenoble -exec cp -r {}/exp-data
{}/exp-logs {}/espec-times grenoble \; 2>&1 | grep -v "cannot stat"' &
+
PID=$!
while kill -0 $PID > /dev/null 2>&1; do
work_in_progress
done
-
- echo "Compressing archive, this may take some time"
- ssh g5k 'gzip grenoble/g5k.tar' &
+
+ echo "Creating archive, this can take some time"
+ ssh grenoble.g5k 'tar -czf g5k.tar.gz exp-logs exp-data espec-times' &
PID=$!
while kill -0 $PID > /dev/null 2>&1; do
@@ -67,7 +70,7 @@ function backup() {
done
echo "Copying archive to local machine"
- scp g5k:~/grenoble/g5k.tar.gz ${G5K_BACKUP}
+ scp grenoble.g5k:g5k.tar.gz ${G5K_BACKUP}
test -d ${BACKUP_DIR} || mkdir ${BACKUP_DIR}
diff --git a/configs/etc/nginx/sites-available/auditor
b/configs/etc/nginx/sites-available/auditor
index 7a74b7f..f673bea 100644
--- a/configs/etc/nginx/sites-available/auditor
+++ b/configs/etc/nginx/sites-available/auditor
@@ -1,5 +1,6 @@
log_format taler 'm=$request_method uri=$uri s=$status '
- 'q=$args '
+ # Only enable if required, breaks loki logfmt
+ # 'q=$args '
'uct=$upstream_connect_time '
'urt=$upstream_response_time '
'rt=$request_time '
diff --git a/configs/etc/nginx/sites-available/exchange
b/configs/etc/nginx/sites-available/exchange
index 7d8b6e9..82731dd 100644
--- a/configs/etc/nginx/sites-available/exchange
+++ b/configs/etc/nginx/sites-available/exchange
@@ -9,7 +9,8 @@ upstream exchange {
# This format is expected by promtail (configs/etc/monitor/promtail.yaml)
log_format taler 'm=$request_method uri=$uri s=$status '
- 'q=$args '
+ # Only enable if required, breaks loki logfmt
+ # 'q=$args '
'uct=$upstream_connect_time '
'urt=$upstream_response_time '
'rt=$request_time '
diff --git a/configs/etc/nginx/sites-available/fakebank
b/configs/etc/nginx/sites-available/fakebank
index 15101aa..3971c89 100644
--- a/configs/etc/nginx/sites-available/fakebank
+++ b/configs/etc/nginx/sites-available/fakebank
@@ -1,5 +1,6 @@
log_format taler 'm=$request_method uri=$uri s=$status '
- 'q=$args '
+ # Only enable if required, breaks loki logfmt
+ # 'q=$args '
'uct=$upstream_connect_time '
'urt=$upstream_response_time '
'rt=$request_time '
diff --git a/configs/etc/nginx/sites-available/merchant
b/configs/etc/nginx/sites-available/merchant
index 8398bd7..9e4f74e 100644
--- a/configs/etc/nginx/sites-available/merchant
+++ b/configs/etc/nginx/sites-available/merchant
@@ -1,5 +1,6 @@
log_format taler 'm=$request_method uri=$uri s=$status '
- 'q=$args '
+ # Only enable if required, breaks loki logfmt
+ # 'q=$args '
'uct=$upstream_connect_time '
'urt=$upstream_response_time '
'rt=$request_time '
diff --git a/image/debian11/taler-debian11.yaml
b/image/debian11/taler-debian11.yaml
index 6bafc9e..bb469fb 100644
--- a/image/debian11/taler-debian11.yaml
+++ b/image/debian11/taler-debian11.yaml
@@ -155,7 +155,7 @@ setup:
npm install -g pnpm
./bootstrap
- ./configure
+ ./configure --prefix=/usr
sed -i "s|^\s*pnpm install --frozen-lockfile --filter
@gnu-taler/taler-wallet-cli...|& --unsafe-perm|" Makefile
make install
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] 15/48: further changes, (continued)
- [taler-grid5k] 15/48: further changes, gnunet, 2022/05/28
- [taler-grid5k] 20/48: add auditor in db monitoring, gnunet, 2022/05/28
- [taler-grid5k] 37/48: custom metrics of postgres exporter only work when selecting a db in the url, gnunet, 2022/05/28
- [taler-grid5k] 45/48: update dashboards, gnunet, 2022/05/28
- [taler-grid5k] 38/48: add relabel to prometheus, gnunet, 2022/05/28
- [taler-grid5k] 35/48: wallet build broken, gnunet, 2022/05/28
- [taler-grid5k] 48/48: integrate final changes from setup, gnunet, 2022/05/28
- [taler-grid5k] 25/48: auditor db in /tmp of G5k, gnunet, 2022/05/28
- [taler-grid5k] 40/48: not working, gnunet, 2022/05/28
- [taler-grid5k] 27/48: different updates, gnunet, 2022/05/28
- [taler-grid5k] 29/48: nginx query params break loki,
gnunet <=
- [taler-grid5k] 46/48: fix db dashboard, gnunet, 2022/05/28
- [taler-grid5k] 36/48: optimistically increase file limit, gnunet, 2022/05/28
- [taler-grid5k] 28/48: log query parameters in nginx, gnunet, 2022/05/28
- [taler-grid5k] 41/48: add wait events, gnunet, 2022/05/28
- [taler-grid5k] 26/48: fix setup.sh, gnunet, 2022/05/28
- [taler-grid5k] 39/48: add relabel to prometheus, gnunet, 2022/05/28
- [taler-grid5k] 31/48: fix update of g5k repo, gnunet, 2022/05/28
- [taler-grid5k] 30/48: add some comments to auditor.sh, gnunet, 2022/05/28
- [taler-grid5k] 47/48: changes to rspec and dashboards, gnunet, 2022/05/28
- [taler-grid5k] 24/48: recover run.sh discard wget ouptup, gnunet, 2022/05/28