Compare commits

..

No commits in common. "936d8f9090afb7934564c642aa9e7f8af495433a" and "290f541c5f555c0203535c7be0771b70e803da0f" have entirely different histories.

3 changed files with 5 additions and 6 deletions

View file

@ -36,7 +36,6 @@
services = { services = {
forgejo.enable = true; forgejo.enable = true;
grafana.enable = true; grafana.enable = true;
prometheus.enable = true;
}; };
programs = { programs = {
editors = { editors = {

View file

@ -50,19 +50,19 @@ in {
enable = true; enable = true;
datasources.settings = { datasources.settings = {
datasources = [ datasources = [
(mkIf config.modules.system.services.prometheus.enable { (mkIf config.modules.system.services.database.postgresql.enable {
name = "Prometheus"; name = "Prometheus";
type = "prometheus"; type = "prometheus";
access = "proxy"; access = "proxy";
url = "http://127.0.0.1:${toString config.services.prometheus.port}"; url = "http://127.0.0.1:4024";
isDefault = true; isDefault = true;
}) })
(mkIf config.modules.system.services.database.postgresql.enable { (mkIf config.modules.system.services.prometheus.enable {
name = "PostgreSQL"; name = "PostgreSQL";
type = "postgres"; type = "postgres";
access = "proxy"; access = "proxy";
url = "http://127.0.0.1:${toString config.services.prometheus.exporters.postgres.port}"; url = "http://127.0.0.1:${toString config.services.prometheus.port}";
}) })
]; ];
}; };

View file

@ -7,7 +7,7 @@
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
cfg = config.modules.system.services.prometheus; cfg = config.modules.system.services.grafana;
port = 4022; port = 4022;
in { in {
options.modules.system.services.prometheus.enable = mkEnableOption "Grafana, a graphing service"; options.modules.system.services.prometheus.enable = mkEnableOption "Grafana, a graphing service";