Merge branch 'twans_15.3' into 'development'

Twans 15.3

See merge request clustervision/trinityx-combined!451

Author: aphmschonewille

site/roles/trinity/grafana/files/dashboards/trinityx-prometheus-slurm-job.json

@@ -1876,7 +1876,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(rate(({__name__=~\"slurm_job_gpu_.*_seconds_total\", jobid=~\"$job_id\"}>0)[$__rate_interval:]))",
+	  "expr": "sum(\r\n  rate(\r\n    label_replace(\r\n      {__name__=~\"slurm_job_gpu_.*_seconds_total\", jobid=\"$job_id\"},\r\n      \"metric\", \"$1\", \"__name__\", \"(.*)\"\r\n    )[$__rate_interval:]\r\n  )\r\n)",
           "hide": false,
           "instant": false,
           "interval": "30s",
@@ -2029,7 +2029,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(rate(({__name__=~\"slurm_job_gpu_.*_seconds_total\", jobid=~\"$job_id\"}>0)[$__rate_interval:]))",
+	  "expr": "sum(\r\n  rate(\r\n    label_replace(\r\n      {__name__=~\"slurm_job_gpu_.*_seconds_total\", jobid=\"$job_id\"},\r\n      \"metric\", \"$1\", \"__name__\", \"(.*)\"\r\n    )[$__rate_interval:]\r\n  )\r\n)",
           "hide": false,
           "instant": false,
           "interval": "30s",
@@ -2643,4 +2643,4 @@
   "uid": "dfe8e0f3-30ae-4c5c-b4e3-17cdf8e09fa5",
   "version": 1,
   "weekStart": ""
-}
+}

site/roles/trinity/init/tasks/main.yml

@@ -367,6 +367,7 @@
   - debug:
       msg: "trix_ctrl_local_ip: {{ trix_ctrl_local_ip|default('Undefined') }}"
   when: on_controller
+  tags: always
 
 - name: Collect number of controllers
   set_fact: