Update Grafana links to keycloak and client secret
additional: Change main domain to grafana.clicks.codes
Change-Id: Id40d69668e26ee4f48de6c882fe5cc21b70e6dc2
Reviewed-on: https://git.clicks.codes/c/Clicks/NixFiles/+/181
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Skyler Grey <minion@clicks.codes>
diff --git a/modules/common/grafana.nix b/modules/common/grafana.nix
index 05fe726..84b4eb1 100644
--- a/modules/common/grafana.nix
+++ b/modules/common/grafana.nix
@@ -5,7 +5,7 @@
settings = {
server = rec {
- domain = "logs.clicks.codes";
+ domain = "grafana.clicks.codes";
root_url = "https://${domain}";
http_port = 9052;
enable_gzip = true;
@@ -22,11 +22,11 @@
login_attribute_path = "login";
name_attribute_path = "name";
auth_url =
- "https://login.clicks.codes/realms/clicks/protocol/openid-connect/auth";
+ "https://login.clicks.codes/realms/master/protocol/openid-connect/auth";
token_url =
- "https://login.clicks.codes/realms/clicks/protocol/openid-connect/token";
+ "https://login.clicks.codes/realms/master/protocol/openid-connect/token";
api_url =
- "https://login.clicks.codes/realms/clicks/protocol/openid-connect/userinfo";
+ "https://login.clicks.codes/realms/master/protocol/openid-connect/userinfo";
role_attribute_path =
"contains(resource_access.grafana.roles[*], 'server_admin') && 'GrafanaAdmin' || contains(resource_access.grafana.roles[*], 'admin') && 'Admin' || contains(resource_access.grafana.roles[*], 'editor') && 'Editor' || 'Viewer'";
allow_assign_grafana_admin = true;
diff --git a/secrets/grafana.json b/secrets/grafana.json
index 32ee151..f53ee93 100644
--- a/secrets/grafana.json
+++ b/secrets/grafana.json
@@ -1,5 +1,5 @@
{
- "clicks_grafana_client_secret": "ENC[AES256_GCM,data:sLMtup1tpWomwyTxtfMQjMAHFxJuKO7URJ9at2JX8fo=,iv:11gakyak4ardVFKKGUyu4sl3j00SA4FIyTO4DpMsr/w=,tag:OkheD4Wr8qYeVRQCAD6rdg==,type:str]",
+ "clicks_grafana_client_secret": "ENC[AES256_GCM,data:5azjoBrCatckMSv0LisETFhXSaZWd3EsRXy5Wyt5lzY=,iv:tEZWeWdyFjaEfEpiSjAu2qQ3w3fqoETUrAGd6y2lfSQ=,tag:Rxmel1pl+j9C7iNL8LcK6g==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
@@ -23,10 +23,10 @@
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArUFEvU3pjRmRidlMyaDg4\nblUxbEtsZ2xHZWtRQW9STGFkOTJraTJ0ODAwCmozclJFNk94Y3JTYkk4MjR0N3Bv\nU1hubUgvRDBYUFJNakJLbWo2RW00dnMKLS0tIENFcXViT2JYN0ZBL1lqSnNBbDNW\nMGlHdGw5ZU44Rmt5a3ppakJLSGVCL0kK007I1OokUmC49ch8jYCOtAQ0/0E4ATrR\ne4dGe9t3mbclp1l8PtbMGJ+O3N9TRwqS810ltTUEvo/Xl7cUcS6RWw==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
- "lastmodified": "2023-10-11T21:44:46Z",
- "mac": "ENC[AES256_GCM,data:Rtl/ITInTUqwhIkFZmEIBOqfQOaRIMV0biBOny9A4Z5yl0QlH9dubV4jvZNx+ZEDfeLm6qfjNGDIDlVHgP4+LqGVxUS+MOzlIgDl9cATmlnxSXNk4WURUmD459OVVqY0aAFXT6hhfyjXhmINrGFYa9qDGBAgWkaAgAE3dObMK0M=,iv:DFRkgo1qD9or/kOyIEaNp5NLZNGuZCMBpK9r3Vx+1L4=,tag:XYhPJhM0M2PdVN2IyZd6hA==,type:str]",
+ "lastmodified": "2023-12-09T20:16:51Z",
+ "mac": "ENC[AES256_GCM,data:hj61HHrtSSVjVd9gZHQQpH4AzRS9XKACbI0FfjfykcVRhA1q3zzgStI4oXQVXaIOaM55kFUT0hfZY8dM37qKqPSxW9R1IynUIuRU200lYXA5EoZnJS6eUqScPe52tCUHW569MfOEm/YbqISdj61PL8+2dpCTOryzbpXA7KB25GQ=,iv:EGRwRUyZ+EgwatjTdBuf4KUyYmq+hPtPlco0Dm7MxQA=,tag:LnPEfBrjR1eRcQ2RX8M5wA==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
- "version": "3.7.3"
+ "version": "3.8.1"
}
}
\ No newline at end of file