torjus/nixos-servers
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: torjus:abb4cf58ea8dc8cc4b65a76e3a40d6c6f7196525
Branches Tags
torjus:master
..
compare: torjus:02e3d42b4731d82c9f1841fa4f4da3e4ff3f563b
Branches Tags
torjus:master

No commits in common. "abb4cf58ea8dc8cc4b65a76e3a40d6c6f7196525" and "02e3d42b4731d82c9f1841fa4f4da3e4ff3f563b" have entirely different histories.
abb4cf58ea ... 02e3d42b47

8 changed files with 29 additions and 85 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1 @@
.direnv/
result

34
flake.lock generated
View File

@ -1,26 +1,5 @@
{
"nodes": {
"alerttonotify": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1739309053,
"narHash": "sha256-sJErNNnDRxfZXn3Xoyyg3GIxiGTghhP8wjwaN25BJGo=",
"ref": "master",
"rev": "d9e2147ecac4d8558b6c0fea65f1308775af7db9",
"revCount": 6,
"type": "git",
"url": "https://git.t-juice.club/torjus/alerttonotify"
},
"original": {
"ref": "master",
"type": "git",
"url": "https://git.t-juice.club/torjus/alerttonotify"
}
},
"backup-helper": {
"inputs": {
"nixpkgs": [
@ -44,11 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1739206421,
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
"lastModified": 1739055578,
"narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "44534bc021b85c8d78e465021e21f33b856e2540",
"rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
"type": "github"
},
"original": {
@ -76,7 +55,6 @@
},
"root": {
"inputs": {
"alerttonotify": "alerttonotify",
"backup-helper": "backup-helper",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -90,11 +68,11 @@
]
},
"locked": {
"lastModified": 1739262228,
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"lastModified": 1738291974,
"narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
"type": "github"
},
"original": {

43
flake.nix
View File

@ -13,10 +13,6 @@
url = "git+https://git.t-juice.club/torjus/backup-helper?ref=master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
alerttonotify = {
url = "git+https://git.t-juice.club/torjus/alerttonotify?ref=master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
};
outputs =
@ -26,7 +22,6 @@
nixpkgs-unstable,
sops-nix,
backup-helper,
alerttonotify,
...
}@inputs:
let
@ -37,10 +32,6 @@
config.allowUnfree = true;
};
};
commonOverlays = [
overlay-unstable
alerttonotify.overlays.default
];
allSystems = [
"x86_64-linux"
"aarch64-linux"
@ -61,7 +52,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ns1
@ -77,7 +68,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ns2
@ -93,7 +84,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ns3
@ -109,7 +100,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ns4
@ -125,7 +116,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/nixos-test1
@ -142,7 +133,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ha1
@ -159,7 +150,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/inc1
@ -176,7 +167,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/inc2
@ -193,7 +184,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/template
@ -209,7 +200,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/http-proxy
@ -225,7 +216,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/ca
@ -241,7 +232,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/monitoring01
@ -258,7 +249,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/jelly01
@ -274,7 +265,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/nix-cache01
@ -290,7 +281,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/media1
@ -306,7 +297,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/pgdb1
@ -322,7 +313,7 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [ overlay-unstable ];
}
)
./hosts/nats1

1
result
View File

@ -1 +0,0 @@
/nix/store/5acmmy4l87pd6c6q9mq6j73m6hh9lc5z-nixos-system-monitoring01-24.11.20250210.44534bc

7
secrets/secrets.yaml
View File

@ -1,7 +1,6 @@
root_password_hash: ENC[AES256_GCM,data:wk/xEuf+qU3ezmondq9y3OIotXPI/L+TOErTjgJz58wEvQkApYkjc3bHaUTzOrmWjQBgDUENObzPmvQ8WKawUSJRVlpfOEr5TQ==,iv:I8Z3xJz3qoXBD7igx087A1fMwf8d29hQ4JEI3imRXdY=,tag:M80osQeWGG9AAA8BrMfhHA==,type:str]
ns_xfer_key: ENC[AES256_GCM,data:VFpK7GChgFeUgQm31tTvVC888bN0yt6BAnHQa6KUTg4iZGP1WL5Bx6Zp8dY=,iv:9RF1eEc7JBxBebDOKfcDjGS2U7XsHkOW/l52yIP+1LA=,tag:L6DR2QlHOfo02kzfWWCrvg==,type:str]
backup_helper_secret: ENC[AES256_GCM,data:EvXEJnDilbfALQ==,iv:Q3dkZ8Ee3qbcjcoi5GxfbaVB4uRIvkIB6ioKVV/dL2Y=,tag:T/UgZvQgYGa740Wh7D0b7Q==,type:str]
nats_nkey: ENC[AES256_GCM,data:N2CVXjdwiE7eSPUtXe+NeKSTzA9eFwK2igxaCdYsXd4Ps0/DjYb/ggnQziQzSy8viESZYjXhJ2VtNw==,iv:Xhcf5wPB01Wu0A+oMw0wzTEHATp+uN+wsaYshxIzy1w=,tag:IauTIOHqfiM75Ufml/JXbg==,type:str]
sops:
kms: []
gcp_kms: []
@ -143,8 +142,8 @@ sops:
UWg1ZmFIMlk4STlMdzBOd1dLOW9ZY2sK8BYqBM/0YZ6fjgQAqSCYM9Cnh2IqP4QD
NQDBErJf0AQ8qU+CXjBSxTLBBJPnibdBJPCcOfnym16gFgMuHsqMdg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-11T21:18:22Z"
mac: ENC[AES256_GCM,data:5//boMp1awc/2XAkSASSCuobpkxa0E6IKf3GR8xHpMoCD30FJsCwV7PgX3fR8OuLEhOJ7UguqMNQdNqG37RMacreuDmI1J8oCFKp+3M2j4kCbXaEo8bw7WAtyjUez+SAXKzZWYmBibH0KOy6jdt+v0fdgy5hMBT4IFDofYRsyD0=,iv:6pD+SLwncpmal/FR4U8It2njvaQfUzzpALBCxa0NyME=,tag:4QN8ZFjdqck5ZgulF+FtbA==,type:str]
lastmodified: "2024-06-02T22:09:06Z"
mac: ENC[AES256_GCM,data:cxJq4EMEMVEw0IUXNwtyQj4MaYIJ/Xo4OaY+3VLgIhYw6oBO9CmJxgLuXcSnGnr23oNE5OQF6ALv+vxF46D1pI0V1zhqKL6zMIs0DzPBwo7Arg166w5kGAT274jK7YWymeJ7fafWXYubLlGUthyVJS1BkvlqIhoe2BlTZ3bPyBs=,iv:Z2Uh9Oo4q/ce6DDLShs7JAX3XFNAVOGBmBPvRbGxaaU=,tag:6qZhZ4+tgtXl60b0Lx7Taw==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.4
version: 3.8.1

21
services/monitoring/alerttonotify.nix
View File

@ -1,21 +0,0 @@
{ pkgs, config, ... }:
{
sops.secrets."nats_nkey" = { };
systemd.services."alerttonotify" = {
wants = [ "network-online.target" ];
after = [
"network-online.target"
"sops-nix.service"
];
environment = {
NATS_URL = "nats://nats1.home.2rjus.net:4222";
NATS_NKEY_FILE = "${config.sops.secrets.nats_nkey.path}";
};
serviceConfig = {
Type = "exec";
ExecStart = "${pkgs.alerttonotify}/bin/alerttonotify";
};
};
}

1
services/monitoring/default.nix
View File

@ -5,6 +5,5 @@
./grafana.nix
./prometheus.nix
./pve.nix
./alerttonotify.nix
];
}

6
services/monitoring/prometheus.nix
View File

@ -8,7 +8,7 @@
global = {
};
route = {
receiver = "webhook_natstonotify";
receiver = "webhook_gunter";
group_wait = "30s";
group_interval = "5m";
repeat_interval = "12h";
@ -16,10 +16,10 @@
};
receivers = [
{
name = "webhook_natstonotify";
name = "webhook_gunter";
webhook_configs = [
{
url = "http://localhost:5001/alert";
url = "http://gunter.home.2rjus.net:5001/alert";
}
];
}