From 9c9bd2a9fc9876468a05ac0b1cf454f2759e47d8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 24 Apr 2024 11:49:11 +0200
Subject: [PATCH] Fix scraping of s3 and sync-IERS metrics

---
 infra/jobs/station/device-server.levant.nomad  |  2 +-
 infra/jobs/station/object-storage.levant.nomad | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/infra/jobs/station/device-server.levant.nomad b/infra/jobs/station/device-server.levant.nomad
index 1ff31a5fd..76d610790 100644
--- a/infra/jobs/station/device-server.levant.nomad
+++ b/infra/jobs/station/device-server.levant.nomad
@@ -49,7 +49,7 @@ job "device-servers" {
                 image       = "minio/mc:latest"
                 entrypoint  = [""]
                 command     = "/bin/bash"
-                args        = ["-c", "mc alias set object-storage http://s3.service.consul:9000 [[.object_storage.user.name]] [[.object_storage.user.pass]] && mc mirror --preserve --watch object-storage/iers/ /opt/IERS/" ]
+                args        = ["-c", "mc alias set object-storage http://s3.service.consul:9000 [[.object_storage.user.name]] [[.object_storage.user.pass]] && mc mirror --preserve --watch object-storage/iers/ /opt/IERS/ --monitoring-address 0.0.0.0:8081" ]
             }
 
             resources {
diff --git a/infra/jobs/station/object-storage.levant.nomad b/infra/jobs/station/object-storage.levant.nomad
index 55900a279..b7f8f85fe 100644
--- a/infra/jobs/station/object-storage.levant.nomad
+++ b/infra/jobs/station/object-storage.levant.nomad
@@ -16,15 +16,10 @@ job "object-storage" {
     }
 
     service {
-      tags = ["scrape"]
       name = "s3"
       port = "9000"
       task = "minio"
       address_mode="alloc"
-
-      meta {
-        metrics_address = "s3.service.consul:9598"
-      }
     }
     service {
       name = "s3-console"
@@ -32,6 +27,13 @@ job "object-storage" {
       task = "minio"
       address_mode="alloc"
     }
+    service {
+      tags = ["scrape"]
+      name = "s3-metrics"
+      port = "9598"
+      task = "minio"
+      address_mode="alloc"
+    }
 
     task "minio" {
       driver = "docker"
-- 
GitLab