Monitoring fixes

3 files changed, 61 insertions, 61 deletions

diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix
index 38a8ef8..c728151 100755
--- a/host/Rory-nginx/services/postgres.nix
+++ b/host/Rory-nginx/services/postgres.nix
@@ -80,20 +80,20 @@
     };
   };
 
-  services.prometheus.exporters.postgres = {
-    enable = true;
-    port = 9187;
-    extraFlags = [
-      "--collector.database_wraparound"
-      "--collector.long_running_transactions"
-      "--collector.postmaster"
-      "--collector.process_idle"
-      "--collector.stat_activity_autovacuum"
-      "--collector.stat_statements"
-      #"--collector.stat_wal_receiver" #we dont have WAL receivers
-      "--collector.statio_user_indexes"
-      "--collector.xlog_location"
-    ];
-  };
+#  services.prometheus.exporters.postgres = {
+#    enable = true;
+#    port = 9187;
+#    extraFlags = [
+#      "--collector.database_wraparound"
+#      "--collector.long_running_transactions"
+#      "--collector.postmaster"
+#      "--collector.process_idle"
+#      "--collector.stat_activity_autovacuum"
+#      "--collector.stat_statements"
+#      #"--collector.stat_wal_receiver" #we dont have WAL receivers
+#      "--collector.statio_user_indexes"
+#      "--collector.xlog_location"
+#    ];
+#  };
 
 }
diff --git a/modules/base-server.nix b/modules/base-server.nix
index 9e248e4..7473513 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -81,51 +81,51 @@
   hardware.enableRedistributableFirmware = false;
 
   services = {
-    prometheus = {
-      exporters = {
-        node = {
-          enable = true;
-          port = 9100;
-          enabledCollectors = [
-            #"logind" #too slow
-            "systemd"
-            "processes"
-            "interrupts"
-            # Testing:
-            "buddyinfo"
-            "cgroups"
-            "ksmd"
-            "lnstat"
-            "mountstats"
-            "network_route"
-            #"perf" # requires sysctl change
-            "qdisc"
-            "sysctl"
-            "softirqs"
-            "tcpstat"
-          ];
-          disabledCollectors = [
-            "textfile"
-            "xfs"
-            "zfs"
-            "selinux"
-            "cpufreq"
-            "btrfs"
-            "powersupplyclass"
-            "mdadm"
-            "tapestats"
-            "fibrechannel"
-            "cpu_vulnerabilities"
-            "watchdog"
-            "thermal_zone"
-            "logind"
-            "nfs"
-            "nfsd"
-            "infiniband"
-          ];
-        };
-      };
-    };
+#    prometheus = {
+#      exporters = {
+#        node = {
+#          enable = true;
+#          port = 9100;
+#          enabledCollectors = [
+#            #"logind" #too slow
+#            "systemd"
+#            "processes"
+#            "interrupts"
+#            # Testing:
+#            "buddyinfo"
+#            "cgroups"
+#            "ksmd"
+#            "lnstat"
+#            "mountstats"
+#            "network_route"
+#            #"perf" # requires sysctl change
+#            "qdisc"
+#            "sysctl"
+#            "softirqs"
+#            "tcpstat"
+#          ];
+#          disabledCollectors = [
+#            "textfile"
+#            "xfs"
+#            "zfs"
+#            "selinux"
+#            "cpufreq"
+#            "btrfs"
+#            "powersupplyclass"
+#            "mdadm"
+#            "tapestats"
+#            "fibrechannel"
+#            "cpu_vulnerabilities"
+#            "watchdog"
+#            "thermal_zone"
+#            "logind"
+#            "nfs"
+#            "nfsd"
+#            "infiniband"
+#          ];
+#        };
+#      };
+#    };
     promtail = {
       enable = true;
       configuration = {
diff --git a/modules/monitoring/postgres.nix b/modules/monitoring/postgres.nix
index bbb55e6..5505892 100644
--- a/modules/monitoring/postgres.nix
+++ b/modules/monitoring/postgres.nix
@@ -37,7 +37,7 @@ in
           options = {
             path = builtins.fetchurl {
               url = "https://grafana.com/api/dashboards/14114/revisions/1/download";
-              sha256 = "0qza4j8lywrj08bqbww52dgh2p2b9rkhq5p313g72i57lrlkacfl";
+              sha256 = "0hk0d2nk8nh5ldd17sy3wwpn1xhyinjlsy5vgmnvpvn6g97n342z";
             };
           };
         }