From c8e5c6f4bffa23cf705487cd5f6d5a71f49f5e43 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Thu, 30 May 2024 14:47:32 -0700
Subject: [PATCH] fix(monitoring): loki grpc port

---
 modules/system/exports/monitoring.nix | 28 ++++++++++++++++++++++++---
 nixos/monitoring.nix                  |  5 ++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/modules/system/exports/monitoring.nix b/modules/system/exports/monitoring.nix
index 86ff57cc..e520d23c 100644
--- a/modules/system/exports/monitoring.nix
+++ b/modules/system/exports/monitoring.nix
@@ -139,11 +139,33 @@ in
                 assertion = config.ports.default.port == nixosConfig.services.loki.settings.httpListenPort;
                 message = "port mismatch";
               })
+              (nixosConfig: let
+                inherit (nixosConfig.services.loki.settings) grpcListenPort;
+              in {
+                assertion = !config.ports.grpc.enable || config.ports.grpc.port == grpcListenPort;
+                message = "gRPC port mismatch";
+              })
+              (nixosConfig: let
+                inherit (nixosConfig.services.loki.settings) grpcListenPort;
+              in {
+                assertion = if config.ports.grpc.enable
+                  then grpcListenPort != 0
+                  else grpcListenPort == 0;
+                message = "gRPC enable mismatch";
+              })
             ];
           };
-          ports.default = mapAlmostOptionDefaults {
-            port = 9093;
-            protocol = "http";
+          ports = {
+            default = mapAlmostOptionDefaults {
+              port = 9093;
+              protocol = "http";
+            };
+            grpc = mapAlmostOptionDefaults {
+              enable = false;
+              port = 9095;
+              protocol = "http";
+            };
+            #grpclb.port = 9096;
           };
         };
         promtail = {config, ...}: {
diff --git a/nixos/monitoring.nix b/nixos/monitoring.nix
index 1c3734e2..a4329431 100644
--- a/nixos/monitoring.nix
+++ b/nixos/monitoring.nix
@@ -13,7 +13,10 @@ in {
   };
   networking.firewall.interfaces.lan.allowedTCPPorts = mkMerge [
     (mkIf grafana.enable [ grafana.port ])
-    (mkIf loki.enable [ loki.settings.httpListenPort loki.settings.grpcListenPort ])
+    (mkIf loki.enable [
+      loki.settings.httpListenPort
+      (mkIf (loki.settings.grpcListenPort != 0) loki.settings.grpcListenPort)
+    ])
     (mkIf prometheus.enable [ prometheus.port ])
   ];
 }