From 992cd619042370e0b2134403cfd223b6d501a111 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 27 Mar 2024 12:01:55 +0100
Subject: [PATCH] Update Element to 1.11.62 and cleanup metrics handling

---
 example/images/matrix-element/Dockerfile |  2 +-
 example/matrix.nomad.hcl                 | 14 ++++++++++----
 matrix.nomad.hcl                         |  2 +-
 templates/homeserver.yml.tpl             |  2 +-
 variables.yml                            |  6 +++++-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/example/images/matrix-element/Dockerfile b/example/images/matrix-element/Dockerfile
index 0fce13a..d940707 100644
--- a/example/images/matrix-element/Dockerfile
+++ b/example/images/matrix-element/Dockerfile
@@ -1,7 +1,7 @@
 FROM nginxinc/nginx-unprivileged:alpine
 MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
 
-ARG ELEMENT_VERSION=1.11.61 \
+ARG ELEMENT_VERSION=1.11.62 \
     SYNAPSE_ADMIN_VERSION=0.9.1
 
 ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \
diff --git a/example/matrix.nomad.hcl b/example/matrix.nomad.hcl
index ae54f6b..7bbbcfd 100644
--- a/example/matrix.nomad.hcl
+++ b/example/matrix.nomad.hcl
@@ -4,6 +4,8 @@ job "matrix" {
   region      = "global"
 
 
+
+
   group "matrix" {
 
     network {
@@ -24,9 +26,13 @@ job "matrix" {
       port = 8008
 
       meta {
-        alloc     = "${NOMAD_ALLOC_INDEX}"
-        job       = "${NOMAD_JOB_NAME}"
-        namespace = "${NOMAD_NAMESPACE}"
+        alloc      = "${NOMAD_ALLOC_INDEX}"
+        datacenter = "${NOMAD_DC}"
+        group      = "${NOMAD_GROUP_NAME}"
+        job        = "${NOMAD_JOB_NAME}"
+        namespace  = "${NOMAD_NAMESPACE}"
+        node       = "${node.unique.name}"
+        region     = "${NOMAD_REGION}"
       }
 
 
@@ -311,7 +317,7 @@ _EOT
       driver = "docker"
 
       config {
-        image           = "danielberteaud/matrix-element:1.11.61-1"
+        image           = "danielberteaud/matrix-element:1.11.62-1"
         readonly_rootfs = true
         pids_limit      = 100
         volumes = [
diff --git a/matrix.nomad.hcl b/matrix.nomad.hcl
index 1335e4c..c5d70a9 100644
--- a/matrix.nomad.hcl
+++ b/matrix.nomad.hcl
@@ -7,7 +7,7 @@ job "[[ .instance ]]" {
 
     network {
       mode = "bridge"
-[[- if $c.prometheus.enabled ]]
+[[- if conv.ToBool $c.prometheus.enabled ]]
       port "metrics" {}
 [[- end ]]
     }
diff --git a/templates/homeserver.yml.tpl b/templates/homeserver.yml.tpl
index dc3a7f2..1b0a1b1 100644
--- a/templates/homeserver.yml.tpl
+++ b/templates/homeserver.yml.tpl
@@ -14,7 +14,7 @@ listeners:
           - client
           - federation
         compress: false
-[[- if .prometheus.enabled ]]
+[[- if conv.ToBool .prometheus.enabled ]]
   - port: 9000
     type: metrics
     bind_addresses: ['127.0.0.1']
diff --git a/variables.yml b/variables.yml
index 12f7871..487ccf8 100644
--- a/variables.yml
+++ b/variables.yml
@@ -110,7 +110,7 @@ matrix:
   # Note : element will be served by the nginx container, so all the image, resources etc. are set there
   element:
     map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx
-    version: 1.11.61
+    version: 1.11.62
 
   synapse_admin:
     version: 0.9.1
@@ -153,3 +153,7 @@ matrix:
     data:
       type: csi
       source: "[[ .instance ]]-synapse-data"
+
+prometheus:
+  # Enable prometheus metrics if available
+  enabled: '[[ .prometheus.available ]]'