From 4d873fa54867b3ebe9134038c561e880748a32a4 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 27 Mar 2024 11:58:37 +0100
Subject: [PATCH] Cleanup metrics handling

---
 example/miniflux.nomad.hcl | 12 +++++++++---
 miniflux.nomad.hcl         |  4 ++--
 variables.yml              |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/example/miniflux.nomad.hcl b/example/miniflux.nomad.hcl
index a8ee37e..eda1f60 100644
--- a/example/miniflux.nomad.hcl
+++ b/example/miniflux.nomad.hcl
@@ -5,6 +5,8 @@ job "miniflux" {
   region      = "global"
 
 
+
+
   group "miniflux" {
 
     count = 1
@@ -22,9 +24,13 @@ job "miniflux" {
       port = 8085
 
       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}"
       }
 
       connect {
diff --git a/miniflux.nomad.hcl b/miniflux.nomad.hcl
index d047b82..5e23c65 100644
--- a/miniflux.nomad.hcl
+++ b/miniflux.nomad.hcl
@@ -10,7 +10,7 @@ job "[[ .instance ]]" {
 
     network {
       mode = "bridge"
-[[- if $c.prometheus.enabled ]]
+[[- if conv.ToBool .prometheus.enabled ]]
       port "metrics" {}
 [[- end ]]
     }
@@ -62,7 +62,7 @@ job "[[ .instance ]]" {
       env {
         LISTEN_ADDR = "127.0.0.1:8085"
         BASE_URL    = "[[ .miniflux.public_url ]]"
-[[- if $c.prometheus.enabled ]]
+[[- if conv.ToBool $c.prometheus.enabled ]]
         METRICS_COLLECTOR = 1
 [[- end ]]
       }
diff --git a/variables.yml b/variables.yml
index 87aa178..b62b6d4 100644
--- a/variables.yml
+++ b/variables.yml
@@ -43,5 +43,6 @@ miniflux:
 
 # Prometheus configuration
 prometheus:
+  enabled: '[[ .prometheus.available ]]'
   metrics_url: http://localhost:8085/metrics