[taler-grid5k] 124/189: enable admin api for prometheus in order to test snapshots

[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 9c92f12b76697489169e47454525f361c72890df
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Apr 7 11:29:10 2022 +0200

    enable admin api for prometheus in order to test snapshots
---
 additional/grafana/database.json                         | 10 +++++-----
 additional/grafana/request-statistics.json               | 16 ++++++++++++----
 .../rspecs/taler.sharded.minimal-with-wallets.rspec      |  8 ++++----
 configs/etc/default/prometheus                           |  2 +-
 experiment/env                                           |  2 +-
 experiment/scripts/benchmark.sh                          |  2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/additional/grafana/database.json b/additional/grafana/database.json
index e21b004..db11983 100644
--- a/additional/grafana/database.json
+++ b/additional/grafana/database.json
@@ -67,7 +67,7 @@
   "gnetId": 6742,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1649276424737,
+  "iteration": 1649317559908,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1627,7 +1627,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_tup_inserted{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_tup_inserted{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1640,7 +1640,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_tup_updated{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_tup_updated{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1653,7 +1653,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_tup_deleted{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_tup_deleted{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2980,6 +2980,6 @@
   "timezone": "",
   "title": "Database",
   "uid": "2FTtdeOnk",
-  "version": 97,
+  "version": 98,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/grafana/request-statistics.json 
b/additional/grafana/request-statistics.json
index 9c962d6..9931b76 100644
--- a/additional/grafana/request-statistics.json
+++ b/additional/grafana/request-statistics.json
@@ -74,7 +74,7 @@
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1649237918829,
+  "iteration": 1649318197276,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -145,7 +145,11 @@
       "pluginVersion": "8.4.3",
       "targets": [
         {
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | 
src=\"wallet\" | unwrap duration(time) [$__range])",
+          "datasource": {
+            "type": "loki",
+            "uid": "${DS_LOKI}"
+          },
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | 
src=~\"wallet(.*)\" | unwrap duration(time) [$__range])",
           "instant": true,
           "range": false,
           "refId": "A"
@@ -208,7 +212,11 @@
       "pluginVersion": "8.4.3",
       "targets": [
         {
-          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | 
src=\"proxy\" | unwrap duration(time) [$__range])",
+          "datasource": {
+            "type": "loki",
+            "uid": "${DS_LOKI}"
+          },
+          "expr": "avg_over_time({app=\"taler-network\"} | logfmt | 
src=~\"eproxy(.*)\" | unwrap duration(time) [$__range])",
           "instant": true,
           "range": false,
           "refId": "A"
@@ -1791,6 +1799,6 @@
   "timezone": "browser",
   "title": "Request Statistics",
   "uid": "WcfSXqDnk",
-  "version": 182,
+  "version": 183,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/rspecs/taler.sharded.minimal-with-wallets.rspec 
b/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
index 011934d..e9292f9 100644
--- a/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
+++ b/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-04-06T11:49:43.853+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-04-07T08:29:19.023+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -48,7 +48,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="738.320134344963" y="77.06040773488321"/>
   </node>
-  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -143,11 +143,11 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="879.2095600418041" y="244.89615915450665"/>
   </node>
-  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="350.95488793162536" y="162.8475631289378"/>
   </node>
-</rspec>
+</rspec>
\ No newline at end of file
diff --git a/configs/etc/default/prometheus b/configs/etc/default/prometheus
index b9b82ca..e4d6362 100644
--- a/configs/etc/default/prometheus
+++ b/configs/etc/default/prometheus
@@ -1,4 +1,4 @@
-ARGS="--config.file=/etc/monitor/prometheus.yaml 
--web.listen-address=0.0.0.0:8080"
+ARGS="--config.file=/etc/monitor/prometheus.yaml 
--web.listen-address=0.0.0.0:8080 --web.enable-admin-api"
 
 # Prometheus supports the following options:
 #  --config.file="/etc/prometheus/prometheus.yml"
diff --git a/experiment/env b/experiment/env
index 5830e9b..546cafb 100644
--- a/experiment/env
+++ b/experiment/env
@@ -96,7 +96,7 @@ NUM_WALLET_PROCESSES=10
 # Which benchmark to use of the wallet-cli (bench1, bench2)
 WALLET_BENCHMARK=bench1
 # Request the exchange via https instead of http
-WALLET_SECURE_EXCHANGE=true
+WALLET_USE_HTTPS=true
 # Needed for wallets to accept self signed certificates
 NODE_TLS_REJECT_UNAUTHORIZED=0
 
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 069d2d5..a79cc7a 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -16,7 +16,7 @@ function start_wallet_bench() {
   LOG_LEVEL=ERROR
   PROTO=http
 
-  if [[ ${WALLET_SECURE_EXCHANGE} == "true" ]]; then
+  if [[ ${WALLET_USE_HTTPS} == "true" ]]; then
     PROTO=https
   fi
   

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