From d0ec0c4f8242179679948f856e61f0870491594b Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Fri, 2 Jun 2023 17:35:53 +0200
Subject: [PATCH] cluster/services/monitoring: make tempo otlp receivers
 externally accessible

---
 cluster/services/monitoring/default.nix | 8 ++++++++
 cluster/services/monitoring/tracing.nix | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cluster/services/monitoring/default.nix b/cluster/services/monitoring/default.nix
index ae74c6e..2b4ca20 100644
--- a/cluster/services/monitoring/default.nix
+++ b/cluster/services/monitoring/default.nix
@@ -20,6 +20,14 @@ in
       protocol = "http";
       ipv4 = meshIpFor "server";
     };
+    tempo-otlp-http = {
+      protocol = "http";
+      ipv4 = meshIpFor "server";
+    };
+    tempo-otlp-grpc = {
+      protocol = "http";
+      ipv4 = meshIpFor "server";
+    };
   };
   services.monitoring = {
     nodes = {
diff --git a/cluster/services/monitoring/tracing.nix b/cluster/services/monitoring/tracing.nix
index f180ff0..67a5e94 100644
--- a/cluster/services/monitoring/tracing.nix
+++ b/cluster/services/monitoring/tracing.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (config) links;
-  inherit (cluster.config.links) prometheus-ingest;
+  inherit (cluster.config.links) prometheus-ingest tempo-otlp-http tempo-otlp-grpc;
   dataDir = "/srv/storage/private/tempo";
   tempoConfig = {
     server = {
@@ -13,8 +13,8 @@ let
     };
     distributor.receivers.otlp = {
       protocols = {
-        http.endpoint = links.tempo-otlp-http.tuple;
-        grpc.endpoint = links.tempo-otlp-grpc.tuple;
+        http.endpoint = tempo-otlp-http.tuple;
+        grpc.endpoint = tempo-otlp-grpc.tuple;
       };
     };
     ingester = {
@@ -63,8 +63,6 @@ in {
   links = {
     tempo.protocol = "http";
     tempo-grpc.protocol = "http";
-    tempo-otlp-http.protocol = "http";
-    tempo-otlp-grpc.protocol = "http";
   };
 
   users.users.tempo = {