EH22/nox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename grafana to monitoring

Browse source
This commit is contained in:
chris 2025-03-10 21:36:28 +01:00
parent eafb8ad1b7
commit fc869ba783
Signed by: c6ristian
SSH key fingerprint: SHA256:B3m+yzpaxGXSEcDBpPHfvza/DNC0wuX+CKMeGq8wgak
4 changed files with 42 additions and 31 deletions
data/zones
noc.eh22.intern.zone
systems
default.nix
monitoring.noc.eh22.intern
grafana.nixsystem.nix

1
data/zones/noc.eh22.intern.zone
View file

@ -2,6 +2,7 @@ $ORIGIN noc.eh22.intern.
@ 0 IN SOA auth-dns noc.eh22.easterhegg.eu. 1 7200 3600 3600000 60
@ 0 IN NS 10.20.25.3.
auth-dns 0 IN A 10.20.25.3
monitoring 0 IN A 10.20.25.4
grafana 0 IN A 10.20.25.4
proxmox 0 IN A 10.20.25.1
resolv-dns 0 IN A 10.20.25.5

2
systems/default.nix
View file

@ -43,11 +43,11 @@ in
# prod hosts
"auth-dns.noc.eh22.intern" = mkSystem "x86_64-linux" "auth-dns.noc.eh22.intern";
"resolv-dns.noc.eh22.intern" = mkSystem "x86_64-linux" "resolv-dns.noc.eh22.intern";
"monitoring.noc.eh22.intern" = mkSystem "x86_64-linux" "monitoring.noc.eh22.intern";
# staging temp infra
"sketchy-router.noc.eh22.intern" = mkSystem "x86_64-linux" "sketchy-router.noc.eh22.intern";
"grafana.noc.eh22.intern" = mkSystem "x86_64-linux" "grafana.noc.eh22.intern";
# misc hosts
"test.eh22.intern" = mkSystem "x86_64-linux" "test.eh22.intern";
"installer" = mkSystem "x86_64-linux" "installer";

30
systems/grafana.noc.eh22.intern.nix → systems/monitoring.noc.eh22.intern/grafana.nix
View file

@ -4,32 +4,6 @@
...
}:
{
imports = [ ];
sops = {
defaultSopsFile = ../secrets/passwords.yaml;
secrets."services/grafana/admin_password" = {
mode = "0440";
owner = "grafana";
group = "grafana";
restartUnits = [ "grafana.service" ];
};
};
# configure static IP address
networking.useDHCP = false;
systemd.network = {
enable = true;
networks = {
"10-mgmtNet" = {
matchConfig.MACAddress = "BC:24:11:FC:C2:26";
address = [ "10.20.25.4/24" ];
gateway = [ "10.20.25.2" ];
};
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
services = {
grafana = {
@ -73,8 +47,4 @@
};
};
};
# DO NOT CHANGE
# this defines the first version of NixOS that was installed on the machine so that programs with non-migratable data files are kept compatible
home-manager.users.noc.home.stateVersion = "24.11";
system.stateVersion = "24.11";
}

40
systems/monitoring.noc.eh22.intern/system.nix Normal file
View file

@ -0,0 +1,40 @@
{
pkgs,
config,
...
}:
{
sops = {
defaultSopsFile = ../../secrets/passwords.yaml;
secrets."services/grafana/admin_password" = {
mode = "0440";
owner = "grafana";
group = "grafana";
restartUnits = [ "grafana.service" ];
};
};
# configure static IP address
networking.useDHCP = false;
systemd.network = {
enable = true;
networks = {
"10-mgmtNet" = {
matchConfig.MACAddress = "BC:24:11:FC:C2:26";
address = [ "10.20.25.4/24" ];
gateway = [ "10.20.25.2" ];
};
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
imports = [
./grafana.nix
];
# DO NOT CHANGE
# this defines the first version of NixOS that was installed on the machine so that programs with non-migratable data files are kept compatible
home-manager.users.noc.home.stateVersion = "24.11";
system.stateVersion = "24.11";
}