mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(whitby): Update grafana config

Browse source 
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:
Griffin Smith 2022-11-05 10:51:54 -04:00 committed by clbot
parent 7945190abb
commit 8240b2959e
1 changed files with 37 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
ops/machines/whitby/default.nix
View file

@ -546,73 +546,54 @@ in
}]; }];
}; };
# XXX: Adapt to https://github.com/NixOS/nixpkgs/pull/191768
services.grafana = { services.grafana = {
enable = false; enable = true;
port = 4723; # "graf" on phone keyboard
settings = {
server = {
http_port = 4723; # "graf" on phone keyboard
domain = "status.tvl.su"; domain = "status.tvl.su";
rootUrl = "https://status.tvl.su"; root_url = "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";
# # Give lukegb, grfn, tazjin "Admin" rights. analytics.reporting_enabled = false;
# role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'";
# # Allow creating new Grafana accounts from OAuth accounts. "auth.generic_oauth" = {
# allow_sign_up = true; 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";
# anonymous = { # Give lukegb, grfn, tazjin "Admin" rights.
# enabled = true; role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'";
# org_name = "The Virus Lounge";
# org_role = "Viewer";
# };
# basic.enabled = false; # Allow creating new Grafana accounts from OAuth accounts.
# oauth_auto_login = true; allow_sign_up = true;
# disable_login_form = true; };
# };
# };
# inherit (builtins) typeOf replaceStrings listToAttrs concatLists;
# inherit (lib) toUpper mapAttrsToList nameValuePair concatStringsSep;
# # Take ["auth" "generic_oauth" "enabled"] and turn it into OPTIONS_GENERIC_OAUTH_ENABLED. "auth.anonymous" = {
# encodeName = raw: replaceStrings [ "." ] [ "_" ] (toUpper (concatStringsSep "_" raw)); enabled = true;
org_name = "The Virus Lounge";
org_role = "Viewer";
};
# # Turn an option value into a string, but we want bools to be sensible strings and not "1" or "". "auth.basic".enabled = false;
# optionToString = value:
# if (typeOf value) == "bool" then
# if value then "true" else "false"
# else builtins.toString value;
# # Turn an nested options attrset into a flat listToAttrs-compatible list. auth = {
# encodeOptions = prefix: inp: concatLists (mapAttrsToList oauth_auto_login = true;
# (name: value: disable_login_form = true;
# if (typeOf value) == "set" };
# then encodeOptions (prefix ++ [ name ]) value };
# else [ (nameValuePair (encodeName (prefix ++ [ name ])) (optionToString value)) ]
# )
# inp);
# in
# listToAttrs (encodeOptions [ ] options);
provision = { provision = {
enable = true; enable = true;
datasources = [{ datasources.settings.datasources = [{
name = "Prometheus"; name = "Prometheus";
type = "prometheus"; type = "prometheus";
url = "http://localhost:9090"; url = "http://localhost:9090";