imp: update grafana alloy/agent for scraping 10.3.1 new tracing endpoint

Author: johnalotoski

flake/nixosModules/profile-grafana-agent.nix

@@ -464,7 +464,7 @@ flake: {
                     ++ optionals (cfgSvc ? cardano-node && cfgSvc.cardano-node.enable)
                     (map (i: let
                       metrics_path =
-                        if cfgSvc.cardano-node.useLegacyTracing
+                        if cfgSvc.cardano-node.useLegacyTracing || (!cfgSvc.cardano-node.useLegacyTracing && cfgSvc.cardano-node.ngTracer)
                         then "/metrics"
                         else "/${(cfgSvc.cardano-node.extraNodeInstanceConfig i).TraceOptionNodeName}";
 
@@ -475,8 +475,10 @@ flake: {
 
                       targets =
                         if cfgSvc.cardano-node.useLegacyTracing
-                        then ["${hostAddr}:${toString (cardanoNodePrometheusExporterPort + i)}"]
-                        else ["${hostAddr}:${toString cardanoNodePrometheusExporterPort}"];
+                        then "${hostAddr}:${toString (cardanoNodePrometheusExporterPort + i)}"
+                        else if cfgSvc.cardano-node.ngTracer
+                        then "${hostAddr}:${toString (cardanoNodePrometheusExporterPort + i)}"
+                        else "${hostAddr}:${toString cardanoNodePrometheusExporterPort}";
                     in {
                       inherit metrics_path;
                       job_name = "integrations/${serviceName i}";

flake/nixosModules/profile-grafana-alloy.nix

@@ -302,9 +302,7 @@ flake @ {moduleWithSystem, ...}: {
         cardanoNode = optionals (cfgSvc ? cardano-node && cfgSvc.cardano-node.enable) (map (
           i: let
             metricsPath =
-              # Use once PrometheusSimple is available in >= node 10.3
-              # if cfgSvc.cardano-node.useLegacyTracing || (!cfgSvc.cardano-node.useLegacyTracing && cfgSvc.cardano-node.ngTracer)
-              if cfgSvc.cardano-node.useLegacyTracing
+              if cfgSvc.cardano-node.useLegacyTracing || (!cfgSvc.cardano-node.useLegacyTracing && cfgSvc.cardano-node.ngTracer)
               then "/metrics"
               else "/${(cfgSvc.cardano-node.extraNodeInstanceConfig i).TraceOptionNodeName}";
 
@@ -316,10 +314,8 @@ flake @ {moduleWithSystem, ...}: {
             target =
               if cfgSvc.cardano-node.useLegacyTracing
               then "${hostAddr}:${toString (cardanoNodePrometheusExporterPort + i)}"
-              # Use once PrometheusSimple is available in >= node 10.3
-              # else "${hostAddr}:${toString cardanoNodePrometheusExporterPort}";
               else if cfgSvc.cardano-node.ngTracer
-              then "${hostAddr}:${toString 12808}"
+              then "${hostAddr}:${toString (cardanoNodePrometheusExporterPort + i)}"
               else "${hostAddr}:${toString cardanoNodePrometheusExporterPort}";
 
             toUnderscore = s: replaceStrings ["-"] ["_"] s;