chore(whitby): Update grafana config
Uncomment and update the grafana config for whitby based on the new config format that nixos accepts. I've validated this locally by visually inspecting the resulting `ini` file, but not actually run it yet. Change-Id: I12d78ae48146e1b01bd2a4152276d4c6b16c1a3d Reviewed-on: https://cl.tvl.fyi/c/depot/+/7191 Autosubmit: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
7945190abb
commit
8240b2959e
1 changed files with 37 additions and 56 deletions
|
@ -546,73 +546,54 @@ in
|
|||
}];
|
||||
};
|
||||
|
||||
# XXX: Adapt to https://github.com/NixOS/nixpkgs/pull/191768
|
||||
services.grafana = {
|
||||
enable = false;
|
||||
port = 4723; # "graf" on phone keyboard
|
||||
domain = "status.tvl.su";
|
||||
rootUrl = "https://status.tvl.su";
|
||||
analytics.reporting.enable = false;
|
||||
# extraOptions =
|
||||
# let
|
||||
# options = {
|
||||
# auth = {
|
||||
# generic_oauth = {
|
||||
# enabled = true;
|
||||
# client_id = "grafana";
|
||||
# scopes = "openid profile email";
|
||||
# name = "TVL";
|
||||
# email_attribute_path = "mail";
|
||||
# login_attribute_path = "sub";
|
||||
# name_attribute_path = "displayName";
|
||||
# auth_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/auth";
|
||||
# token_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/token";
|
||||
# api_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/userinfo";
|
||||
enable = true;
|
||||
|
||||
# # Give lukegb, grfn, tazjin "Admin" rights.
|
||||
# role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'";
|
||||
settings = {
|
||||
server = {
|
||||
http_port = 4723; # "graf" on phone keyboard
|
||||
domain = "status.tvl.su";
|
||||
root_url = "https://status.tvl.su";
|
||||
};
|
||||
|
||||
# # Allow creating new Grafana accounts from OAuth accounts.
|
||||
# allow_sign_up = true;
|
||||
# };
|
||||
analytics.reporting_enabled = false;
|
||||
|
||||
# anonymous = {
|
||||
# enabled = true;
|
||||
# org_name = "The Virus Lounge";
|
||||
# org_role = "Viewer";
|
||||
# };
|
||||
"auth.generic_oauth" = {
|
||||
enabled = true;
|
||||
client_id = "grafana";
|
||||
scopes = "openid profile email";
|
||||
name = "TVL";
|
||||
email_attribute_path = "mail";
|
||||
login_attribute_path = "sub";
|
||||
name_attribute_path = "displayName";
|
||||
auth_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/auth";
|
||||
token_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/token";
|
||||
api_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/userinfo";
|
||||
|
||||
# basic.enabled = false;
|
||||
# oauth_auto_login = true;
|
||||
# disable_login_form = true;
|
||||
# };
|
||||
# };
|
||||
# inherit (builtins) typeOf replaceStrings listToAttrs concatLists;
|
||||
# inherit (lib) toUpper mapAttrsToList nameValuePair concatStringsSep;
|
||||
# Give lukegb, grfn, tazjin "Admin" rights.
|
||||
role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'";
|
||||
|
||||
# # Take ["auth" "generic_oauth" "enabled"] and turn it into OPTIONS_GENERIC_OAUTH_ENABLED.
|
||||
# encodeName = raw: replaceStrings [ "." ] [ "_" ] (toUpper (concatStringsSep "_" raw));
|
||||
# Allow creating new Grafana accounts from OAuth accounts.
|
||||
allow_sign_up = true;
|
||||
};
|
||||
|
||||
# # Turn an option value into a string, but we want bools to be sensible strings and not "1" or "".
|
||||
# optionToString = value:
|
||||
# if (typeOf value) == "bool" then
|
||||
# if value then "true" else "false"
|
||||
# else builtins.toString value;
|
||||
"auth.anonymous" = {
|
||||
enabled = true;
|
||||
org_name = "The Virus Lounge";
|
||||
org_role = "Viewer";
|
||||
};
|
||||
|
||||
# # Turn an nested options attrset into a flat listToAttrs-compatible list.
|
||||
# encodeOptions = prefix: inp: concatLists (mapAttrsToList
|
||||
# (name: value:
|
||||
# if (typeOf value) == "set"
|
||||
# then encodeOptions (prefix ++ [ name ]) value
|
||||
# else [ (nameValuePair (encodeName (prefix ++ [ name ])) (optionToString value)) ]
|
||||
# )
|
||||
# inp);
|
||||
# in
|
||||
# listToAttrs (encodeOptions [ ] options);
|
||||
"auth.basic".enabled = false;
|
||||
|
||||
auth = {
|
||||
oauth_auto_login = true;
|
||||
disable_login_form = true;
|
||||
};
|
||||
};
|
||||
|
||||
provision = {
|
||||
enable = true;
|
||||
datasources = [{
|
||||
datasources.settings.datasources = [{
|
||||
name = "Prometheus";
|
||||
type = "prometheus";
|
||||
url = "http://localhost:9090";
|
||||
|
|
Loading…
Reference in a new issue