From 32a529e60f0335f09e078725369669e2f196237d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 16 Mar 2025 20:56:26 +0100
Subject: [PATCH] ildkule/prometheus: reenable mysqld exporter

---
 hosts/ildkule/services/monitoring/grafana.nix       | 13 ++++++-------
 .../services/monitoring/prometheus/default.nix      |  3 +--
 .../services/monitoring/prometheus/mysqld.nix       |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/hosts/ildkule/services/monitoring/grafana.nix b/hosts/ildkule/services/monitoring/grafana.nix
index a0000f4..8fc273a 100644
--- a/hosts/ildkule/services/monitoring/grafana.nix
+++ b/hosts/ildkule/services/monitoring/grafana.nix
@@ -56,13 +56,12 @@ in {
           url = "https://raw.githubusercontent.com/matrix-org/synapse/develop/contrib/grafana/synapse.json";
           options.path = dashboards/synapse.json;
         }
-        # TODO: enable once https://github.com/NixOS/nixpkgs/pull/242365 gets merged
-        # {
-        #   name = "MySQL";
-        #   type = "file";
-        #   url = "https://raw.githubusercontent.com/prometheus/mysqld_exporter/main/mysqld-mixin/dashboards/mysql-overview.json";
-        #   options.path = dashboards/mysql.json;
-        # }
+        {
+          name = "MySQL";
+          type = "file";
+          url = "https://raw.githubusercontent.com/prometheus/mysqld_exporter/main/mysqld-mixin/dashboards/mysql-overview.json";
+          options.path = dashboards/mysql.json;
+        }
         {
           name = "Postgresql";
           type = "file";
diff --git a/hosts/ildkule/services/monitoring/prometheus/default.nix b/hosts/ildkule/services/monitoring/prometheus/default.nix
index 2a93dc5..55a38cf 100644
--- a/hosts/ildkule/services/monitoring/prometheus/default.nix
+++ b/hosts/ildkule/services/monitoring/prometheus/default.nix
@@ -4,8 +4,7 @@ in {
   imports = [
     ./gitea.nix
     ./matrix-synapse.nix
-    # TODO: enable once https://github.com/NixOS/nixpkgs/pull/242365 gets merged
-    # ./mysqld.nix
+    ./mysqld.nix
     ./postgres.nix
     ./machines.nix
   ];
diff --git a/hosts/ildkule/services/monitoring/prometheus/mysqld.nix b/hosts/ildkule/services/monitoring/prometheus/mysqld.nix
index ac63672..91a53bf 100644
--- a/hosts/ildkule/services/monitoring/prometheus/mysqld.nix
+++ b/hosts/ildkule/services/monitoring/prometheus/mysqld.nix
@@ -19,7 +19,7 @@ in {
 
     exporters.mysqld = {
       enable = true;
-      configFilePath = config.sops.secrets."config/mysqld_exporter".path;
+      configFile = config.sops.secrets."config/mysqld_exporter".path;
     };
   };
 }