2 files changed, 18 insertions, 15 deletions
diff --git a/nixos/shared/prometheus-sql-exporter/default.nix b/nixos/shared/prometheus-sql-exporter/default.nix
index 81f1660..5d80a62 100644
--- a/nixos/shared/prometheus-sql-exporter/default.nix
+++ b/nixos/shared/prometheus-sql-exporter/default.nix
@@ -1,21 +1,15 @@
 {
   lib,
   buildGoModule,
-  fetchFromGitHub,
 }:
-
-buildGoModule rec {
+let
+  sources = import <top/npins>;
+in
+buildGoModule {
   pname = "sql_exporter";
-  version = "0.17.1";
-
-  src = fetchFromGitHub {
-    owner = "burningalchemist";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-AEPFXPplHtny1P3gMvB1gbMj10bpu9PXc6ywliF+dCc=";
-  };
-
-  vendorHash = "sha256-KFWDqbdbXvgEtz1nlasWrvIckpzasUdzbb+AKfXmYf8=";
+  version = sources.prometheus-sql-exporter.version;
+  src = sources.prometheus-sql-exporter;
+  vendorHash = "sha256-eZxxmqoiXPdjZs/lwbzvWco9mDFy0zmpGDcqTIyWbK4=";
 
   meta = with lib; {
     description = "Database-agnostic SQL exporter for Prometheus";
diff --git a/nixos/shared/prometheus-sql-exporter/service.nix b/nixos/shared/prometheus-sql-exporter/service.nix
index a887f91..a79528c 100644
--- a/nixos/shared/prometheus-sql-exporter/service.nix
+++ b/nixos/shared/prometheus-sql-exporter/service.nix
@@ -4,7 +4,16 @@
 let
   sqlExporter = pkgs.callPackage ./default.nix {};
   cfg = config.services.prometheus-sql-exporter;
-  configFile =  builtins.toFile "config.yaml" (builtins.toJSON cfg.config);
+  configFile = builtins.toFile "config.yaml" (builtins.toJSON cfg.config);
+  validateConfig = file:
+    pkgs.runCommand "validate-config"
+      {
+        nativeBuildInputs = [sqlExporter];
+      }
+      ''
+        sql_exporter -config.check -config.file "${file}"
+        ln -s "${file}" "$out"
+      '';
 in
 {
   options.services.prometheus-sql-exporter = {
@@ -20,7 +29,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.prometheus-sql-exporter = {
       serviceConfig = {
-        ExecStart = "${sqlExporter}/bin/sql_exporter -config.file ${configFile} -web.listen-address :${toString cfg.port}";
+        ExecStart = "${sqlExporter}/bin/sql_exporter -config.file ${validateConfig configFile} -web.listen-address :${toString cfg.port}";
         DynamicUser = "true";
         User = "prometheus-sql-exporter";
       };