nix/machines
1
0
Fork 0
Code Issues Releases Packages Activity Actions

Compare commits

base: nix:b9e7228520f292fa5ff4ef6f1b36231927356d3b
Branches Tags
nix:main
..
compare: nix:1bf63cc7350442c9fc9aea0b1627d2bcdc0bbe12
Branches Tags
nix:main

No commits in common. "b9e7228520f292fa5ff4ef6f1b36231927356d3b" and "1bf63cc7350442c9fc9aea0b1627d2bcdc0bbe12" have entirely different histories.
b9e7228520 ... 1bf63cc735

8 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755201760, "lastModified": 1754472784,
"narHash": "sha256-kqvOIgJmO4WItR5VF/W2kn8PMpAum3XBd3RwFyDyQ/w=", "narHash": "sha256-b390kY06Sm+gzwGiaXrVzIg4mjxwt/oONlDu49260lM=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "9b3641d0aafcae14446bba35a41fef4f607d9c51", "rev": "388a3128c3cda69c6f466de2015aadfae9f9bc75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754971456, "lastModified": 1753140376,
"narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755078291, "lastModified": 1754689972,
"narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +605,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755139244, "lastModified": 1754794262,
"narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", "narHash": "sha256-5SEz135CaJ0LfHILi+CzWMXQmcvD2QeIf4FKwXAxtxA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", "rev": "d754da7c068c6e122f84d84c3e6bcd353ee48635",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -629,11 +629,11 @@
"nixpkgs-25_05": "nixpkgs-25_05" "nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1755110674, "lastModified": 1747965231,
"narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "f5936247dbdb8501221978562ab0b302dd75456c", "rev": "53007af63fade28853408370c4c600a63dd97f41",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -691,11 +691,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1755029507, "lastModified": 1754852587,
"narHash": "sha256-dtLgSAkU6o3skigUB1U6CCdg9Uu+yu3OM3m+Zu2XnPk=", "narHash": "sha256-M+CDFvZ4ZuKK3mlbxv+37yAwL6X3tIklYgurqbhO7Q4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "13e783747d8b90f27bc1e69e3302b5b5e18cf776", "rev": "61ffae2453d00cb63a133b750232804b209db4d1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nix/modules/nixos/infrastructure/vault-prometheus-sender/default.nix
View file

@ -109,7 +109,7 @@ in
{"__address__" = "127.0.0.1:${toString value.port}", "instance" = constants.hostname, "job" = "${name}"}, {"__address__" = "127.0.0.1:${toString value.port}", "instance" = constants.hostname, "job" = "${name}"},
] ]
scrape_interval = "15s" scrape_interval = "1m"
forward_to = [otelcol.receiver.prometheus.default.receiver] forward_to = [otelcol.receiver.prometheus.default.receiver]
} }

2
nix/modules/nixos/infrastructure/vault-prometheus-sender/prometheus.alloy
View file

@ -50,7 +50,7 @@ prometheus.exporter.unix "integrations_node_exporter" {
// Define how to scrape metrics from the node_exporter // Define how to scrape metrics from the node_exporter
prometheus.scrape "integrations_node_exporter" { prometheus.scrape "integrations_node_exporter" {
scrape_interval = "15s" scrape_interval = "1m"
// Use the targets with labels from the discovery.relabel component // Use the targets with labels from the discovery.relabel component
targets = discovery.relabel.integrations_node_exporter.output targets = discovery.relabel.integrations_node_exporter.output
// Send the scraped metrics to the relabeling component // Send the scraped metrics to the relabeling component

2
nix/systems/aarch64-linux/kas.codes/forgejo/default.nix
View file

@ -185,7 +185,7 @@ in
environment.etc."alloy/forgejo_prometheus.alloy" = { environment.etc."alloy/forgejo_prometheus.alloy" = {
text = '' text = ''
prometheus.scrape "forgejo_exporter" { prometheus.scrape "forgejo_exporter" {
scrape_interval = "15s" scrape_interval = "1m"
targets = [ targets = [
{ {
"__address__" = "127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}", "__address__" = "127.0.0.1:${toString config.services.forgejo.settings.server.HTTP_PORT}",

2
nix/systems/aarch64-linux/mx.kaareskovgaard.net/mailserver/prometheus.nix
View file

@ -91,7 +91,7 @@ in
environment.etc."alloy/dovecot_prometheus.alloy" = { environment.etc."alloy/dovecot_prometheus.alloy" = {
text = '' text = ''
prometheus.scrape "dovecot_exporter" { prometheus.scrape "dovecot_exporter" {
scrape_interval = "15s" scrape_interval = "1m"
targets = [ targets = [
{ {
"__address__" = "127.0.0.1:${toString dovecotPromPort}", "__address__" = "127.0.0.1:${toString dovecotPromPort}",

2
nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/alerts/http.yaml
View file

@ -17,4 +17,4 @@
labels: labels:
severity: critical severity: critical
annotations: annotations:
summary: "Nginx VHost {{ $labels.vhost }} on {{ $labels.instance }} is generating many internal server errors over 30 minutes" summary: "Nginx VHost {{ $labels.vhost }} on {{ $labels.instance }} is generating many internal server errors over 1 hour"

7
nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/default.nix
View file

@ -161,10 +161,7 @@ in
services.prometheus = { services.prometheus = {
enable = true; enable = true;
listenAddress = "127.0.0.1"; listenAddress = "127.0.0.1";
extraFlags = [ extraFlags = [ "--web.enable-otlp-receiver" ];
"--web.enable-otlp-receiver"
"--storage.tsdb.retention.time=15d"
];
# alertmanager.enable = true; # alertmanager.enable = true;
rules = [ rules = [
'' ''
@ -227,7 +224,7 @@ in
compactor = { compactor = {
retention_enabled = true; retention_enabled = true;
compaction_interval = "24h"; compaction_interval = "24h";
retention_delete_delay = "15d"; retention_delete_delay = "24h";
delete_request_store = "filesystem"; delete_request_store = "filesystem";
working_directory = "${config.services.loki.dataDir}/retention"; working_directory = "${config.services.loki.dataDir}/retention";
}; };

1
nix/systems/x86_64-linux/monitoring.kaareskovgaard.net/zfs.nix
View file

@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
lib, lib,
config,
... ...
}: }:
{ {