diff --git a/docs/redirects.json b/docs/redirects.json index f2b8e5f..6ad2715 100644 --- a/docs/redirects.json +++ b/docs/redirects.json @@ -902,6 +902,9 @@ "blocks-monitoring": [ "blocks-monitoring.html#blocks-monitoring" ], + "blocks-monitoring-backup-dashboard": [ + "blocks-monitoring.html#blocks-monitoring-backup-dashboard" + ], "blocks-monitoring-budget-alerts": [ "blocks-monitoring.html#blocks-monitoring-budget-alerts" ], diff --git a/modules/blocks/monitoring/docs/.#default.md b/modules/blocks/monitoring/docs/.#default.md new file mode 120000 index 0000000..beb82f0 --- /dev/null +++ b/modules/blocks/monitoring/docs/.#default.md @@ -0,0 +1 @@ +timi@laspin.305764:1763219006 \ No newline at end of file diff --git a/modules/blocks/monitoring/docs/assets/dashboards_Backups_1.png b/modules/blocks/monitoring/docs/assets/dashboards_Backups_1.png new file mode 100644 index 0000000..6ce5b7f Binary files /dev/null and b/modules/blocks/monitoring/docs/assets/dashboards_Backups_1.png differ diff --git a/modules/blocks/monitoring/docs/assets/dashboards_Backups_2.png b/modules/blocks/monitoring/docs/assets/dashboards_Backups_2.png new file mode 100644 index 0000000..b556574 Binary files /dev/null and b/modules/blocks/monitoring/docs/assets/dashboards_Backups_2.png differ diff --git a/modules/blocks/monitoring/docs/assets/dashboards_Backups_3.png b/modules/blocks/monitoring/docs/assets/dashboards_Backups_3.png new file mode 100644 index 0000000..d4b2ff5 Binary files /dev/null and b/modules/blocks/monitoring/docs/assets/dashboards_Backups_3.png differ diff --git a/modules/blocks/monitoring/docs/default.md b/modules/blocks/monitoring/docs/default.md index a093711..37c81d3 100644 --- a/modules/blocks/monitoring/docs/default.md +++ b/modules/blocks/monitoring/docs/default.md @@ -118,6 +118,18 @@ This dashboard is used to monitor a [deluge](./services-deluge.html) instance. ![Deluge Dashboard Top Part](./assets/dashboards_Deluge_1.png) ![Deluge Dashboard Bottom Part](./assets/dashboards_Deluge_2.png) +## Backup Dashboard and Alert {#blocks-monitoring-backup-dashboard} + +This dashboard show Restic and BorgBackup backup jobs, or any job with "backup" in the systemd service name. + +The most important graphs are the first three: + +- "Backup Jobs in the Past Week" + +![Backup Dashboard Top Part](./assets/dashboards_Backups_1.png) +![Backup Dashboard Middle Part](./assets/dashboards_Backups_2.png) +![Backup Dashboard Bottom Part](./assets/dashboards_Backups_3.png) + ## Requests Error Budget Alert {#blocks-monitoring-budget-alerts} This alert will fire when the ratio between number of requests getting a 5XX response from a service diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 40fa0d5..0612e21 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -618,9 +618,8 @@ in SMTP_ADDR = "${cfg.smtp.host}:${toString cfg.smtp.port}"; FROM = cfg.smtp.from_address; USER = cfg.smtp.username; + PASSWD = cfg.smtp.passwordFile; }; - - services.forgejo.mailerPasswordFile = cfg.smtp.passwordFile; }) # https://wiki.nixos.org/wiki/Forgejo#Runner