pub-solar/infra
6
1
Fork 3
Code Issues 24 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

flora-6: remove #234

Merged
teutat3s merged 12 commits from remove-flora-6-sad-face into main 2024-09-10 15:58:58 +00:00
Conversation 0 Commits 12 Files changed 94 +37 -4
2 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 19723f3812 - Show all commits

8
hosts/default.nix
View file

@ -105,8 +105,8 @@
self.nixosModules.overlays self.nixosModules.overlays
self.nixosModules.unlock-luks-on-boot self.nixosModules.unlock-luks-on-boot
self.nixosModules.core self.nixosModules.core
#self.nixosModules.prometheus-exporters self.nixosModules.prometheus-exporters
#self.nixosModules.promtail self.nixosModules.promtail
self.nixosModules.garage self.nixosModules.garage
self.nixosModules.nginx self.nixosModules.nginx
@ -122,8 +122,8 @@
self.nixosModules.overlays self.nixosModules.overlays
self.nixosModules.unlock-luks-on-boot self.nixosModules.unlock-luks-on-boot
self.nixosModules.core self.nixosModules.core
#self.nixosModules.prometheus-exporters self.nixosModules.prometheus-exporters
#self.nixosModules.promtail self.nixosModules.promtail
self.nixosModules.garage self.nixosModules.garage
self.nixosModules.nginx self.nixosModules.nginx

33
modules/prometheus/default.nix
View file

@ -74,6 +74,22 @@
instance = "trinkgenossin"; instance = "trinkgenossin";
}; };
} }
{
targets = [
"delite.wg.${config.pub-solar-os.networking.domain}:${toString config.services.prometheus.exporters.node.port}"
];
labels = {
instance = "delite";
};
}
{
targets = [
"blue-shell.wg.${config.pub-solar-os.networking.domain}:${toString config.services.prometheus.exporters.node.port}"
];
labels = {
instance = "blue-shell";
};
}
]; ];
} }
{ {
@ -94,9 +110,26 @@
{ {
targets = [ targets = [
"trinkgenossin.wg.${config.pub-solar-os.networking.domain}:3903" "trinkgenossin.wg.${config.pub-solar-os.networking.domain}:3903"
];
labels = {
instance = "trinkgenossin";
};
}
{
targets = [
"delite.wg.${config.pub-solar-os.networking.domain}:3903" "delite.wg.${config.pub-solar-os.networking.domain}:3903"
];
labels = {
instance = "delite";
};
}
{
targets = [
"blue-shell.wg.${config.pub-solar-os.networking.domain}:3903" "blue-shell.wg.${config.pub-solar-os.networking.domain}:3903"
]; ];
labels = {
instance = "blue-shell";
};
} }
]; ];
} }