maint: Some Nix flake cleanups

Specifically:

  1. Switch from the nixosModule flake output (which is deprecated) to
     nixosModules.default
  2. Remove "with lib;" it's convenient, but I've gotten feedback when
     upstreaming module changes that that shouldn't be a thing in
     nixpkgs anymore
  3. Add a little type checking to the NixOS module options
  4. Switch the default config to empty (but leave the example)
  5. Use the convention "let cfg = config.services.heracles," a thing
     that's super common in NixOS

examples/example_dashboards.yaml

@@ -8,8 +8,10 @@
         - source: http://heimdall:9001 # Prometheus source uri for this plot
           query: 'sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))' # The PromQL query for this plot
           meta: # metadata for this plot
-            name_format: "`${labels.instance}`" # javascript template literal to format the trace name
+            name_label: instance # Grab a trace name from the query tags 
             #d3_tick_format: "~%" # d3 tick format override for this plot's yaxis
+            #name_prefix: "Prefix" # A prefix for this sublots trace names
+            #name_suffix: "Suffix" # A suffix for this subplots trace names
             #named_axis: "y" # yaxis name to use for this subplots traces
       span: # The span for this range query
         end: now # Where the span ends. RFC3339 format with special handling for the now keyword
@@ -30,14 +32,16 @@
             sum by (instance)(irate(node_cpu_seconds_total{mode="system",job="nodestats"}[5m])) / sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))
           meta:
             d3_tick_format: "~%"
-            name_format: "`${labels.instance} system`"
+            name_label: instance
+            name_prefix: "System"
             named_axis: "y"
         - source: http://heimdall:9001
           query: |
             sum by (instance)(irate(node_cpu_seconds_total{mode="user",job="nodestats"}[5m])) / sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))
           meta:
             d3_tick_format: "~%"
-            name_format: "`${labels.instance} user`"
+            name_label: instance
+            name_suffix: "User"
             named_axis: "y"
     - title: Node memory
       query_type: Scalar
@@ -45,4 +49,4 @@
         - source: http://heimdall:9001
           query: 'node_memory_MemFree_bytes{job="nodestats"}'
           meta:
-            name_format: "`${labels.instance}`"
+            name_label: instance

flake.nix

@@ -83,7 +83,9 @@
                             sum by (instance)(irate(node_cpu_seconds_total{job="nodestats"}[5m]))
                           \'\';
                           meta = {
-                            name_function = "''${labels.instance}";
+                            name_label = "instance";
+                            name_prefix = "trace name prefix";
+                            name_suffix = "trace name suffix";
                             named_axis = "y";
                             # yaxis formatting for this subplot
                             d3_tick_format = "~s";
@@ -112,9 +114,11 @@
 
         config = let
           cfg = config.services.heracles;
-          cfgFile = pkgs.writeText "heracles.yaml" (builtins.toJSON cfg.settings);
         in
           lib.mkIf cfg.enable {
+            environment.etc."heracles.yaml" = {
+              text = lib.generators.toYAML {} cfg.settings;
+            };
             systemd.services.heracles = {
               wantedBy = ["multi-user.target" "default.target"];
               wants = ["network.target"];
@@ -122,7 +126,7 @@
               serviceConfig = {
                 Restart = "on-failure";
                 RestartSec = "30s";
-                ExecStart = "${pkgs.heracles}/bin/heracles --listen ${cfg.listen} --config=${cfgFile}";
+                ExecStart = "${pkgs.heracles}/bin/heracles --listen ${cfg.listen} --config=${config.environment.etc."heracles.yaml".target}";
               };
             };
           };

src/query.rs

@@ -117,7 +117,9 @@ pub struct DataPoint {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PlotMeta {
-    name_format: Option<String>,
+    name_prefix: Option<String>,
+    name_suffix: Option<String>,
+    name_label: Option<String>,
     named_axis: Option<String>,
     d3_tick_format: Option<String>,
 }

static/lib.js

@@ -160,17 +160,19 @@ class TimeseriesGraph extends HTMLElement {
                         yaxis: yaxis,
                         yhoverformat: meta["d3_tick_format"],
                     };
+                    const namePrefix = meta["name_prefix"];
+                    const nameSuffix = meta["name_suffix"];
+                    const nameLabel = meta["name_label"];
                     var name = "";
-                    const formatter = meta.name_format
-                    if (formatter) {
-                        name = eval(formatter);
-                    } else {
-                        var names = [];
-                        for (const value of labels) {
-                            names.push(value);
-                        }
-                        name = names.join(" ");
-                    }
+                    if (namePrefix) {
+                        name = namePrefix + "-";
+                    };
+                    if (nameLabel && labels[nameLabel]) {
+                        name = name + labels[nameLabel];
+                    };
+                    if (nameSuffix) {
+                        name = name + " - " + nameSuffix;
+                    };
                     if (name) { trace.name = name; }
                     for (const point of series) {
                         trace.x.push(new Date(point.timestamp * 1000));
@@ -188,22 +190,17 @@ class TimeseriesGraph extends HTMLElement {
                         type: "bar",
                         x: [],
                         y: [],
+                        yaxis: yaxis,
                         yhoverformat: meta["d3_tick_format"],
                     };
-                    const formatter = meta.name_format;
-                    var name = "";
-                    if (formatter) {
-                        name = eval(formatter);
-                    } else {
-                        var names = [];
-                        for (const value of labels) {
-                            names.push(value);
-                        }
-                        name = names.join(" ");
-                    }
-                    if (name) { trace.name = name; }
+                    let nameLabel = meta["name_label"];
+                    if (nameLabel && labels[nameLabel]) {
+                        trace.name = labels[nameLabel];
+                    };
+                    if (nameLabel && labels[nameLabel]) {
+                        trace.x.push(labels[nameLabel]);
+                    };
                     trace.y.push(series.value);
-                    trace.x.push(trace.name);
                     traces.push(trace);
                 }
             }