[taler-grid5k] 163/189: update centos

[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 deb771d883b77fd2505a08dd999dd14e7c4b2dbb
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Apr 20 10:11:50 2022 +0200

    update centos
---
 additional/grafana/load-statistics.json | 6 +++---
 image/centos8/taler-centos8.yaml        | 4 +---
 image/debian11/taler-debian11.yaml      | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/additional/grafana/load-statistics.json 
b/additional/grafana/load-statistics.json
index 69f0244..6fef09f 100644
--- a/additional/grafana/load-statistics.json
+++ b/additional/grafana/load-statistics.json
@@ -198,7 +198,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "100 - (avg by (instance) 
(rate(node_cpu_seconds_total{mode=\"idle\", 
component=\"exchange\"}[$__rate_interval]))*100)",
+          "expr": "100 - (avg(rate(node_cpu_seconds_total{mode=\"idle\", 
component=\"exchange\"}[$__rate_interval]))*100)",
           "hide": false,
           "interval": "",
           "intervalFactor": 1,
@@ -206,7 +206,7 @@
           "refId": "B"
         }
       ],
-      "title": " [Exchange] Requests vs CPU",
+      "title": " [Exchange] Requests vs Average CPU",
       "type": "timeseries"
     },
     {
@@ -1628,6 +1628,6 @@
   "timezone": "",
   "title": "Load Statistics",
   "uid": "rkyhDAt7z",
-  "version": 70,
+  "version": 72,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/image/centos8/taler-centos8.yaml b/image/centos8/taler-centos8.yaml
index 7532126..3b6e8a7 100644
--- a/image/centos8/taler-centos8.yaml
+++ b/image/centos8/taler-centos8.yaml
@@ -38,7 +38,7 @@ global:
   # g5k_kernel_params: ""
   ## Environment visibility
   # g5k_visibility: "shared"
-  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_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 wget 
curl vim"
   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 systemd-coredump bash-completion 
pgbouncer pgstat"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter 
prometheus-pgbouncer-exporter"
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter 
named gettext-base dnsmasq prometheus-pgbouncer-exporter pgbouncer"
@@ -66,8 +66,6 @@ setup:
   - install:
     - packages:
       - exec_in: |
-         echo "deb https://deb.taler.net/apt/debian bullseye main" > 
/etc/apt/sources.list.d/taler.list
-         wget -O - https://taler.net/taler-systems.gpg.key | apt-key add -
          yum update
          yum upgrade -y
          yum install -y $${taler_packages} $${taler_build_packages}
diff --git a/image/debian11/taler-debian11.yaml 
b/image/debian11/taler-debian11.yaml
index d7648da..92cbd3e 100644
--- a/image/debian11/taler-debian11.yaml
+++ b/image/debian11/taler-debian11.yaml
@@ -71,8 +71,6 @@ setup:
   - install:
     - packages:
       - exec_in: |
-         echo "deb https://deb.taler.net/apt/debian bullseye main" > 
/etc/apt/sources.list.d/taler.list
-         wget -O - https://taler.net/taler-systems.gpg.key | apt-key add -
          apt update
          apt upgrade -y
          apt install -y $${taler_packages} $${taler_build_packages}

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