[taler-grid5k] 76/189: add status label for hopefully better speed

[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 0a09a6482bddf113930a1833b4e2f4bf2184b49e
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Mar 12 20:32:08 2022 +0100

    add status label for hopefully better speed
---
 configs/etc/monitor/promtail.yaml |  3 ++-
 experiment/env                    |  1 +
 experiment/scripts/run.sh         |  2 +-
 experiment/taler.rspec            | 11 +++++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index 9356f65..a660a30 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -32,12 +32,13 @@ scrape_configs:
        selector: '{job="proxy"}'
        stages:
        - regex:
-           expression: 
'.*uri=/(?P<ep>[a-zA-Z]+)(?:/\w+)?(?:/(?P<act>[a-zA-Z]+))?.*'
+           expression: 
'.*uri=/(?P<ep>[a-zA-Z]+)(?:/\w+)?(?:/(?P<act>[a-zA-Z]+))? 
s=(?P<status>\d{3}).*'
        - template:
            source: endpoint
            template: '{{ printf "%s-%s" .ep .act | trimSuffix "-" }}'
        - labels:
            endpoint:
+           status:
 - job_name: wallet
   syslog:
     listen_address: 0.0.0.0:1516
diff --git a/experiment/env b/experiment/env
index ae8071d..400f1bb 100644
--- a/experiment/env
+++ b/experiment/env
@@ -39,6 +39,7 @@ EXCH_AGGREGATOR_DOMAIN=exch-aggregator.${DNS_ZONE}
     EXCH_CLOSER_DOMAIN=exch-closer.${DNS_ZONE}
   EXCH_TRANSFER_DOMAIN=exch-transfer.${DNS_ZONE}
  EXCH_WIREWATCH_DOMAIN=exch-wirewatch.${DNS_ZONE}
+ SECONDARY_EXCH_DOMAIN=exch-secondary.*.${DNS_ZONE}
 
 # Arguments to pass to all taler-exchange-* binaries at startup.
 # E.g. -L INFO
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index 2f96557..9f33c2e 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -39,7 +39,7 @@ elif [[ "${HOSTNAME}" =~ ${EXCHANGE_HOSTS} ]]; then
     exec ~/scripts/exchange.sh init-primary
 elif [[ "${HOSTNAME}" =~ ${SECEXCH_HOSTS} ]]; then 
     set_host secondary-exchange
-    #set_ddn ${EXCHANGE_DOMAIN}
+    set_ddn ${SECONDARY_EXCH_DOMAIN//\*/${HOST}}
     setup_log
     enable_logrotate
     enable_netdelay ${DATABASE_DOMAIN}
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
index 5b3a3db..44b2bd4 100644
--- a/experiment/taler.rspec
+++ b/experiment/taler.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-03-09T15:46:24.102+01: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-03-12T18:04:35.785+01: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"/>
@@ -12,7 +12,7 @@
       <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="274.0" 
y="164.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="228.0" 
y="161.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -195,4 +195,11 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="671.5" 
y="221.5"/>
   </node>
+  <node client_id="SecExch" 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="360.0" 
y="162.5"/>
+  </node>
 </rspec>
\ No newline at end of file

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