[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 26/48: fix setup.sh
|
From: |
gnunet |
|
Subject: |
[taler-grid5k] 26/48: fix setup.sh |
|
Date: |
Sat, 28 May 2022 12:11:46 +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 dfc8781f01818014807da54c34f08be9aa07524b
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue May 17 18:38:58 2022 +0200
fix setup.sh
---
additional/grafana/load-statistics.json | 8 +-
additional/grafana/request-statistics.json | 138 +++++++++++++++++------------
additional/persist.sh | 4 +
experiment/env | 5 +-
experiment/scripts/auditor.sh | 0
experiment/scripts/exchange.sh | 5 ++
experiment/scripts/setup.sh | 6 +-
7 files changed, 100 insertions(+), 66 deletions(-)
diff --git a/additional/grafana/load-statistics.json
b/additional/grafana/load-statistics.json
index 3cc96ee..58dd08f 100644
--- a/additional/grafana/load-statistics.json
+++ b/additional/grafana/load-statistics.json
@@ -589,7 +589,7 @@
"mode": "palette-classic"
},
"custom": {
- "axisLabel": "",
+ "axisLabel": "Requests / Second",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
@@ -641,6 +641,10 @@
{
"id": "unit",
"value": "bytes"
+ },
+ {
+ "id": "custom.axisLabel",
+ "value": "Database Size"
}
]
}
@@ -1632,6 +1636,6 @@
"timezone": "",
"title": "Load Statistics",
"uid": "rkyhDAt7z",
- "version": 76,
+ "version": 77,
"weekStart": ""
}
\ No newline at end of file
diff --git a/additional/grafana/request-statistics.json
b/additional/grafana/request-statistics.json
index 41cbe40..9cf7575 100644
--- a/additional/grafana/request-statistics.json
+++ b/additional/grafana/request-statistics.json
@@ -23,7 +23,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
- "version": "8.4.3"
+ "version": "8.4.6"
},
{
"type": "datasource",
@@ -74,7 +74,7 @@
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": null,
- "iteration": 1649441773439,
+ "iteration": 1652777639923,
"links": [],
"liveNow": false,
"panels": [
@@ -142,7 +142,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -209,7 +209,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -276,7 +276,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -343,7 +343,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -410,7 +410,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -477,7 +477,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -544,7 +544,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -774,6 +774,7 @@
"mode": "thresholds"
},
"mappings": [],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
@@ -813,7 +814,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -834,25 +835,28 @@
"fieldConfig": {
"defaults": {
"color": {
- "mode": "continuous-GrYlRd"
+ "fixedColor": "green",
+ "mode": "fixed"
},
- "mappings": [],
- "max": 5,
- "min": 0,
+ "mappings": [
+ {
+ "options": {
+ "match": "null+nan",
+ "result": {
+ "index": 0,
+ "text": "0"
+ }
+ },
+ "type": "special"
+ }
+ ],
+ "noValue": "0",
"thresholds": {
"mode": "percentage",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "#EAB839",
- "value": 60
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -882,7 +886,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -912,16 +916,13 @@
"mode": "thresholds"
},
"mappings": [],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -951,7 +952,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1012,7 +1013,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1168,7 +1169,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1199,16 +1200,13 @@
"mode": "thresholds"
},
"mappings": [],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -1238,7 +1236,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1266,16 +1264,13 @@
"mode": "thresholds"
},
"mappings": [],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -1305,7 +1300,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1333,16 +1328,13 @@
"mode": "thresholds"
},
"mappings": [],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -1372,7 +1364,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1396,7 +1388,19 @@
"fixedColor": "text",
"mode": "fixed"
},
- "mappings": [],
+ "mappings": [
+ {
+ "options": {
+ "match": "null+nan",
+ "result": {
+ "index": 0,
+ "text": "0"
+ }
+ },
+ "type": "special"
+ }
+ ],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
@@ -1431,7 +1435,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1548,17 +1552,25 @@
"color": {
"mode": "thresholds"
},
- "mappings": [],
+ "mappings": [
+ {
+ "options": {
+ "match": "null+nan",
+ "result": {
+ "index": 0,
+ "text": "0"
+ }
+ },
+ "type": "special"
+ }
+ ],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
@@ -1588,7 +1600,7 @@
"text": {},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1612,7 +1624,19 @@
"fixedColor": "text",
"mode": "fixed"
},
- "mappings": [],
+ "mappings": [
+ {
+ "options": {
+ "match": "null+nan",
+ "result": {
+ "index": 0,
+ "text": "0"
+ }
+ },
+ "type": "special"
+ }
+ ],
+ "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
@@ -1647,7 +1671,7 @@
},
"textMode": "auto"
},
- "pluginVersion": "8.4.3",
+ "pluginVersion": "8.4.6",
"targets": [
{
"datasource": {
@@ -1667,7 +1691,7 @@
"type": "stat"
}
],
- "refresh": "1m",
+ "refresh": "30s",
"schemaVersion": 35,
"style": "dark",
"tags": [
@@ -1805,6 +1829,6 @@
"timezone": "browser",
"title": "Request Statistics",
"uid": "WcfSXqDnk",
- "version": 194,
+ "version": 201,
"weekStart": ""
}
\ No newline at end of file
diff --git a/additional/persist.sh b/additional/persist.sh
index ef4fb51..1761c4d 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -105,6 +105,10 @@ if [[ $(ssh-add -L) =~ "The agent has no" ]]; then
exit 1
fi
+if ! ssh -q -o BatchMode=yes g5k 'exit'; then
+ echo "SSH connection does not work, please check your configuration"
+ exit 1
+fi
case $1 in
-b|--backup)
diff --git a/experiment/env b/experiment/env
index 017ae33..a60d289 100644
--- a/experiment/env
+++ b/experiment/env
@@ -102,9 +102,6 @@ WALLET_BENCHMARK=bench1
WALLET_USE_HTTPS=true
# Run a withdraw only experiment
WALLET_WITHDRAW_ONLY=false
-# Do batch withdrawals of a reserve rather than single coins
-# NOTE: comment if not wanted
-TALER_WALLET_BATCH_WITHDRAWAL=1
# How the wallets select merchants, possible values: 'zipf' and 'rand'
# If the configured value is neither zipf or rand, a single merchant is taken
WALLET_MERCHANT_SELECTION=normal
@@ -118,6 +115,8 @@ NODE_TLS_REJECT_UNAUTHORIZED=0
TALER_WALLET_SYNC_CRYPTO=1
TALER_WALLET_PRIMITIVE_WORKER=1
TALER_WALLET_INSECURE_TRUST_EXCHANGE=1
+# Do batch withdrawals of a reserve rather than single coins
+TALER_WALLET_BATCH_WITHDRAWAL=1
# Initial number of exchange processes to run.
# default = 10
diff --git a/experiment/scripts/auditor.sh b/experiment/scripts/auditor.sh
old mode 100644
new mode 100755
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 9ea2992..a887ae2 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -23,6 +23,11 @@ start NUM:
stop NUM:
Stop NUM exchange-httpd daemons
+
+add-auditor AUDITOR_PUB_KEY AUDITOR_API_URL AUDITOR_NAME:
+ Register an auditor to the exchange
+ Best called from the auditor node.
+
"
set -eux
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 65d2a2f..77137e6 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -57,7 +57,7 @@ function parse_experiment_nodes() {
)
echo "${NODE^^}_HOSTS=\"${NODES_STR}\"" >> ~/.env
- echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | awk -F '|' '{print NF}')" >>
~/.env
+ echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | grep -v "none" | awk -F '|'
'{print NF}')" >> ~/.env
done
# Export NODE_NAME, which can be used to set log directories for example
@@ -214,7 +214,7 @@ function clean_previous_setup() {
clean_previous_setup
# Check if binaries need to be rebuilt on debian based operating systems
if ! grep -q "Red Hat" /proc/version; then
- source ~/scripts/install.sh &
+ source ~/scripts/install.sh
fi
parse_experiment_nodes
setup_log_dir
@@ -222,8 +222,6 @@ setup_environment
setup_config
setup_dns
-wait
-
if ! grep -q "Red Hat" /proc/version; then
# Only works in debian based operating systems
exec ~/scripts/createusers.sh
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] 35/48: wallet build broken, (continued)
- [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, 2022/05/28
- [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 <=
- [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
- [taler-grid5k] 34/48: increase bank size, gnunet, 2022/05/28
- [taler-grid5k] 44/48: added new panels for db statistics, gnunet, 2022/05/28
- [taler-grid5k] 32/48: update bank, gnunet, 2022/05/28
- [taler-grid5k] 43/48: fix metric, gnunet, 2022/05/28
- [taler-grid5k] 42/48: fix metric, gnunet, 2022/05/28