auditor db in /tmp of G5k

3 files changed, 38 insertions, 13 deletions

diff --git a/additional/grafana/load-statistics.json b/additional/grafana/load-statistics.json
index 9d5ee29..3cc96ee 100644
--- a/additional/grafana/load-statistics.json
+++ b/additional/grafana/load-statistics.json
@@ -692,6 +692,22 @@
         }
       ],
       "title": "[Database] Total Requests vs Disk Space used",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "taler-exchange",
+            "renamePattern": "Exchange"
+          }
+        },
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "taler-ingress",
+            "renamePattern": "Auditor"
+          }
+        }
+      ],
       "type": "timeseries"
     },
     {
@@ -1616,6 +1632,6 @@
   "timezone": "",
   "title": "Load Statistics",
   "uid": "rkyhDAt7z",
-  "version": 75,
+  "version": 76,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/rspecs/taler.many.with-auditor.rspec b/additional/rspecs/taler.many.with-auditor.rspec
index 89189ca..d5274a0 100644
--- a/additional/rspecs/taler.many.with-auditor.rspec
+++ b/additional/rspecs/taler.many.with-auditor.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-05-15T13:29:15.463+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:jfed="http://jfed.iminds.be/rspec/ext/jfed/1" xmlns:sharedvlan="http://www.protogeni.net/resources/rspec/ext/shared-vlan/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd ">
+<rspec xmlns="http://www.geni.net/resources/rspec/3" type="request" generated_by="jFed RSpec Editor" generated="2022-05-15T13:51:37.636+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:jfed="http://jfed.iminds.be/rspec/ext/jfed/1" xmlns:sharedvlan="http://www.protogeni.net/resources/rspec/ext/shared-vlan/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd ">
   <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"/>
@@ -93,7 +93,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="273.4810126582279" y="205.30722735107315"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="269.5" y="206.5"/>
   </node>
   <node client_id="Wallet-3" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -123,7 +123,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="273.4810126582279" y="236.665006020825"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="271.5" y="236.5"/>
   </node>
   <node client_id="Wallet-8" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -177,7 +177,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="82.0" y="298.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="79.0" y="299.5"/>
   </node>
   <node client_id="Wallet-17" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -207,7 +207,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="83.0" y="328.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="80.0" y="330.5"/>
   </node>
   <node client_id="Wallet-22" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -237,7 +237,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="84.0" y="358.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="80.0" y="361.5"/>
   </node>
   <node client_id="Wallet-27" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -303,7 +303,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0" y="429.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="276.0" y="424.5"/>
   </node>
   <node client_id="Wallet-38" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -333,7 +333,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0" y="460.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0" y="455.5"/>
   </node>
   <node client_id="Wallet-43" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -363,7 +363,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="278.0" y="495.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0" y="487.5"/>
   </node>
   <node client_id="Wallet-48" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -393,7 +393,7 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="279.0" y="526.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="276.0" y="519.5"/>
   </node>
   <node client_id="Wallet-53" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -417,13 +417,13 @@
     <sliver_type name="raw-pc">
       <disk_image name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="84.0" y="552.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="83.0" y="550.5"/>
   </node>
   <node client_id="Wallet-57" 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>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="279.0" y="558.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0" y="550.5"/>
   </node>
   <node client_id="Wallet-58" exclusive="true" component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
diff --git a/experiment/scripts/auditor.sh b/experiment/scripts/auditor.sh
index 45da0cc..4eeac9a 100644
--- a/experiment/scripts/auditor.sh
+++ b/experiment/scripts/auditor.sh
@@ -20,6 +20,13 @@ function create_users() {
 }
 
 function init_db() {
+
+  # Grid5000 mounts the default disk on /tmp
+  # Move the DB there to get more storage
+  if [ -d /var/lib/postgresql ]; then
+    mv /var/lib/postgresql /tmp/
+  fi
+
   # Get hardware info to tune in postgresql.conf
   SHARED_MEM=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 4 ))
   CACHE_SIZE=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) * 3/4))
@@ -149,6 +156,8 @@ function init_db() {
   work_mem=2GB
   maintenance_work_mem=4GB
 
+  data_directory='/tmp/postgresql/${POSTGRES_VERSION}/main'
+
   max_logical_replication_workers=${NUM_CPU}
   max_sync_workers_per_subscription=${NUM_CPU}
   " > /etc/postgresql/${POSTGRES_VERSION}/main/auditor.conf