feat: declarative probes for uptime-kuma
All checks were successful
Check meta / check_meta (push) Successful in 24s
Check meta / check_meta (pull_request) Successful in 26s
Check meta / check_dns (push) Successful in 52s
Check meta / check_dns (pull_request) Successful in 53s
build configuration / build_vault01 (pull_request) Successful in 59s
build configuration / build_storage01 (pull_request) Successful in 1m9s
build configuration / build_compute01 (pull_request) Successful in 1m16s
build configuration / build_web02 (pull_request) Successful in 57s
build configuration / build_web01 (pull_request) Successful in 1m39s
build configuration / build_rescue01 (pull_request) Successful in 1m1s
build configuration / push_to_cache (pull_request) Successful in 2m42s
build configuration / build_vault01 (push) Successful in 1m9s
build configuration / build_storage01 (push) Successful in 1m10s
build configuration / build_compute01 (push) Successful in 1m16s
build configuration / build_web02 (push) Successful in 53s
build configuration / build_rescue01 (push) Successful in 57s
lint / check (push) Successful in 25s
build configuration / build_web01 (push) Successful in 1m35s
build configuration / push_to_cache (push) Successful in 2m12s
All checks were successful
Check meta / check_meta (push) Successful in 24s
Check meta / check_meta (pull_request) Successful in 26s
Check meta / check_dns (push) Successful in 52s
Check meta / check_dns (pull_request) Successful in 53s
build configuration / build_vault01 (pull_request) Successful in 59s
build configuration / build_storage01 (pull_request) Successful in 1m9s
build configuration / build_compute01 (pull_request) Successful in 1m16s
build configuration / build_web02 (pull_request) Successful in 57s
build configuration / build_web01 (pull_request) Successful in 1m39s
build configuration / build_rescue01 (pull_request) Successful in 1m1s
build configuration / push_to_cache (pull_request) Successful in 2m42s
build configuration / build_vault01 (push) Successful in 1m9s
build configuration / build_storage01 (push) Successful in 1m10s
build configuration / build_compute01 (push) Successful in 1m16s
build configuration / build_web02 (push) Successful in 53s
build configuration / build_rescue01 (push) Successful in 57s
lint / check (push) Successful in 25s
build configuration / build_web01 (push) Successful in 1m35s
build configuration / push_to_cache (push) Successful in 2m12s
This commit is contained in:
parent
c4154e0a35
commit
20d3354a4d
5 changed files with 225 additions and 42 deletions
|
@ -2,4 +2,4 @@ let
|
||||||
lib = import ../../../lib { };
|
lib = import ../../../lib { };
|
||||||
publicKeys = lib.getNodeKeys "rescue01";
|
publicKeys = lib.getNodeKeys "rescue01";
|
||||||
in
|
in
|
||||||
lib.setDefault { inherit publicKeys; } [ ]
|
lib.setDefault { inherit publicKeys; } [ "stateless-uptime-kuma-password" ]
|
||||||
|
|
28
machines/rescue01/secrets/stateless-uptime-kuma-password
Normal file
28
machines/rescue01/secrets/stateless-uptime-kuma-password
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 jIXfPA wZdqi7vBlMEOJiY1VvbsmqyBSO/jl6SWLRGw+0ylKWo
|
||||||
|
UvKyh4Jh608Z9i9+6WuPu3mwnlC98aAr6jiV38JJGzk
|
||||||
|
-> ssh-ed25519 QlRB9Q +DUjR2Wqwg2SevBY+YgvLEDkcnoWGRTfcVFbl27CQT4
|
||||||
|
poWQnP4cOQGc5Xhgrgz2KKEOJ8dB+iCcqME5D/zJv5c
|
||||||
|
-> ssh-ed25519 r+nK/Q GsidIKDaPJmx8igrgoAbWGywJQB0nV/cY8Zm0CIByho
|
||||||
|
m4HrxUhPkp7gahyLO2gfQUnglkB715jaCrADg77ns34
|
||||||
|
-> ssh-rsa krWCLQ
|
||||||
|
VwNy3N6+l3Vgpo8AK7cJ2gRmHa+oBtB4w3n+E8gn7sugcEB16NDtjK861zwszUq7
|
||||||
|
OfOPUZ5mE+RWz20XYWPAJIPEYNaiqc5vJzguFvZdlyJNInJLxANlIaHydE1AGA9v
|
||||||
|
l07t9PAxxV5L40EiPHxjveEKaKiAAJVbWWfILX9f4U5vjKy5729IE/3aTRUbTD/M
|
||||||
|
CXINLnzFWwDLi3x2yBrGUly2mLIb4KyDuE8jnPmtCFveKsVxVsDEeiXvi0yeT+xM
|
||||||
|
viGvXJ9Ad6tAug4BE2suqwG1iPHsa98pFBqYM8gG2rp2WOFhzs0emkTu5LGYJOMr
|
||||||
|
VR39Qxcdp1WjPr9e+l/MDQ
|
||||||
|
-> ssh-ed25519 /vwQcQ GBXHQzwSFS+abM91umquafIEcUoI407reSuULz7SGGY
|
||||||
|
WpW9aHq2Eq8pXpvGsEKoByQLj0tr04GxNQrf09ronrY
|
||||||
|
-> ssh-ed25519 0R97PA BxlIEcd6G5GDLUxgoTzyUqRRxGIx49YCZSvzjVIBdjw
|
||||||
|
oDqUd2O+oBdDrOvrQysdptF1LuvXK/dKurFnHUjgNfk
|
||||||
|
-> ssh-ed25519 JGx7Ng Km6PmwRZ9HfGjEhkgb8P+ZCt+B/C+jg9bcvdwBvrS0Q
|
||||||
|
D+UC5nkMnpYuJtz5X30iF1avU+jlEy4zOEPkyj5o2x8
|
||||||
|
-> ssh-ed25519 5SY7Kg 3tf/eLI3ngqilOfEz8fayTDHWHNd14ANJTSt5lz1yDM
|
||||||
|
QUhDPYuiZ9YloKgYqY5UdMVmawyMAOS/T4jbpvsNJpI
|
||||||
|
-> ssh-ed25519 p/Mg4Q h/8lvmwcmoyTa6vW0N2AbgKt/dpNNqVmRW02NaYl7Wo
|
||||||
|
OaFeo+ZPa2LY5zRJzv/exq4bv734FxZwX3ql1kpv5bk
|
||||||
|
-> ssh-ed25519 +MNHsw iaiHp0x4Xzf886Q0Li6IleeO3wZUAQbYFHxn0jzdCk0
|
||||||
|
W4gaBtwKPbonB2g9+Ts+teXPEPoWDCVoVn1vixiQ+7M
|
||||||
|
--- 1ACvcwsxZKnjgKRAzJy8e4eBtxZXrwe00wPdDlMWnBo
|
||||||
|
Œ<ƒ¼î|ë=©r<2Ÿµ.>ÃÇ~,5J²Ä … àé[ºë^+͸Z‰ñj›á×=Ï<Ï%Út뮪
|
|
@ -1,9 +1,116 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
nodes,
|
||||||
|
config,
|
||||||
|
sources,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
|
inherit (config.statelessUptimeKuma.lib)
|
||||||
|
pingProbesFromHive
|
||||||
|
fromHive
|
||||||
|
httpProbesFromConfig
|
||||||
|
probesWithTag
|
||||||
|
;
|
||||||
host = "status.dgnum.eu";
|
host = "status.dgnum.eu";
|
||||||
|
|
||||||
port = 3001;
|
port = 3001;
|
||||||
|
|
||||||
|
httpExcludes = [
|
||||||
|
"localhost"
|
||||||
|
"ens.cal.dgnum.eu"
|
||||||
|
"luj-current.cal.dgnum.eu"
|
||||||
|
"s3.dgnum.eu"
|
||||||
|
"cdn.dgnum.eu"
|
||||||
|
"saml-idp.dgnum.eu"
|
||||||
|
"status.dgnum.eu"
|
||||||
|
] ++ nodes.web01.config.dgn-redirections.retired;
|
||||||
|
|
||||||
|
extraProbes = {
|
||||||
|
monitors = {
|
||||||
|
"prometheus.dgnum.eu" = {
|
||||||
|
type = lib.mkForce "http";
|
||||||
|
accepted_statuscodes = [ "401" ];
|
||||||
|
};
|
||||||
|
"api.meet.dgnum.eu" = {
|
||||||
|
keyword = "Crab Fit API";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
status_pages = {
|
||||||
|
"dgnum" = {
|
||||||
|
title = "DGNum";
|
||||||
|
description = "Etat de l'infra de la DGNum";
|
||||||
|
showTags = true;
|
||||||
|
publicGroupList = [
|
||||||
|
{
|
||||||
|
name = "Services";
|
||||||
|
weight = 1;
|
||||||
|
monitorList = builtins.attrNames (
|
||||||
|
probesWithTag { name = "Service"; } config.statelessUptimeKuma.probesConfig
|
||||||
|
);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Serveurs";
|
||||||
|
weight = 2;
|
||||||
|
monitorList = builtins.attrNames (
|
||||||
|
probesWithTag { name = "Ping"; } config.statelessUptimeKuma.probesConfig
|
||||||
|
);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "VPN Interne";
|
||||||
|
weight = 2;
|
||||||
|
monitorList = builtins.attrNames (
|
||||||
|
probesWithTag { name = "VPN"; } config.statelessUptimeKuma.probesConfig
|
||||||
|
);
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
pingProbes = pingProbesFromHive {
|
||||||
|
inherit nodes;
|
||||||
|
mkHost = _: config: config.networking.fqdn;
|
||||||
|
tags = [ { name = "Ping"; } ];
|
||||||
|
excludes = [
|
||||||
|
"geo01"
|
||||||
|
"geo02"
|
||||||
|
"rescue01"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
vpnProbes = pingProbesFromHive {
|
||||||
|
inherit nodes;
|
||||||
|
prefix = "VPN - ";
|
||||||
|
mkHost = node: _: "${node}.dgnum";
|
||||||
|
tags = [ { name = "VPN"; } ];
|
||||||
|
excludes = [
|
||||||
|
"rescue01"
|
||||||
|
"web02"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
httpProbes = fromHive {
|
||||||
|
inherit nodes;
|
||||||
|
builder =
|
||||||
|
_: module:
|
||||||
|
httpProbesFromConfig {
|
||||||
|
inherit (module) config;
|
||||||
|
tags = [
|
||||||
|
{
|
||||||
|
name = "Host";
|
||||||
|
value = module.config.networking.fqdn;
|
||||||
|
}
|
||||||
|
{ name = "Service"; }
|
||||||
|
];
|
||||||
|
excludes = httpExcludes;
|
||||||
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
imports = [ (sources.stateless-uptime-kuma + "/nixos/module.nix") ];
|
||||||
|
nixpkgs.overlays = [ (import (sources.stateless-uptime-kuma + "/overlay.nix")) ];
|
||||||
services.uptime-kuma.enable = true;
|
services.uptime-kuma.enable = true;
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
@ -23,4 +130,22 @@ in
|
||||||
80
|
80
|
||||||
443
|
443
|
||||||
];
|
];
|
||||||
|
|
||||||
|
statelessUptimeKuma = {
|
||||||
|
probesConfig = lib.mkMerge [
|
||||||
|
pingProbes
|
||||||
|
httpProbes
|
||||||
|
extraProbes
|
||||||
|
vpnProbes
|
||||||
|
{ inherit status_pages; }
|
||||||
|
];
|
||||||
|
extraFlags = [
|
||||||
|
"-v DEBUG"
|
||||||
|
"-s"
|
||||||
|
];
|
||||||
|
host = "http://localhost:${builtins.toString port}/";
|
||||||
|
username = "dgnum";
|
||||||
|
passwordFile = config.age.secrets."stateless-uptime-kuma-password".path;
|
||||||
|
enableService = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
_:
|
{ lib, config, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
retired_host = "retired.dgnum.eu";
|
retired_host = "retired.dgnum.eu";
|
||||||
|
@ -28,6 +28,25 @@ let
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
cfg = config.dgn-redirections;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.dgn-redirections = {
|
||||||
|
redirections = lib.mkOption {
|
||||||
|
type =
|
||||||
|
with lib.types;
|
||||||
|
attrsOf (submodule {
|
||||||
|
options.to = lib.mkOption { type = str; };
|
||||||
|
});
|
||||||
|
default = { };
|
||||||
|
};
|
||||||
|
retired = lib.mkOption {
|
||||||
|
type = with lib.types; listOf str;
|
||||||
|
default = [ ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
config = {
|
||||||
|
dgn-redirections = {
|
||||||
redirections = {
|
redirections = {
|
||||||
"calendrier.eleves.ens.fr".to = "calendrier.dgnum.eu";
|
"calendrier.eleves.ens.fr".to = "calendrier.dgnum.eu";
|
||||||
"docs.beta.rz.ens.wtf".to = "pads.dgnum.eu";
|
"docs.beta.rz.ens.wtf".to = "pads.dgnum.eu";
|
||||||
|
@ -65,9 +84,9 @@ let
|
||||||
"rstudio"
|
"rstudio"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
};
|
||||||
{
|
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
${retired_host}.default = true;
|
${retired_host}.default = true;
|
||||||
} // (builtins.mapAttrs mkRedirection redirections) // (mkRetired retired);
|
} // (builtins.mapAttrs mkRedirection cfg.redirections) // (mkRetired cfg.retired);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,6 +167,17 @@
|
||||||
"url": "https://github.com/cachix/pre-commit-hooks.nix/archive/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8.tar.gz",
|
"url": "https://github.com/cachix/pre-commit-hooks.nix/archive/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8.tar.gz",
|
||||||
"hash": "0xibcl3546fqv9g2wmjv6350glp61ld3m8n5yqjx0y5dn73apj4w"
|
"hash": "0xibcl3546fqv9g2wmjv6350glp61ld3m8n5yqjx0y5dn73apj4w"
|
||||||
},
|
},
|
||||||
|
"stateless-uptime-kuma": {
|
||||||
|
"type": "Git",
|
||||||
|
"repository": {
|
||||||
|
"type": "Git",
|
||||||
|
"url": "https://git.dgnum.eu/mdebray/stateless-uptime-kuma"
|
||||||
|
},
|
||||||
|
"branch": "master",
|
||||||
|
"revision": "c6baf60295e4bee4e4c13cf5c628ccd3ab89b141",
|
||||||
|
"url": null,
|
||||||
|
"hash": "1ivkvvq4jz5kh873jppypnhzm3vb8gdrvia7zsy67p6wnvzvhxkv"
|
||||||
|
},
|
||||||
"wp4nix": {
|
"wp4nix": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Reference in a new issue