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

feat: grafana + prometheus + loki on flora-6 #77

Merged
teutat3s merged 15 commits from feat/grafana into main 2023-12-13 23:21:32 +00:00
Conversation 1 Commits 15 Files changed 19 +24288 -6
teutat3s commented 2023-12-03 14:54:56 +00:00
Owner
Copy link
No description provided.
teutat3s changed title from WIP: feat: grafana + prometheus to feat: grafana + prometheus + loki 2023-12-05 12:54:02 +00:00
teutat3s requested review from b12f 2023-12-05 12:54:20 +00:00
teutat3s requested review from hensoko 2023-12-05 12:54:20 +00:00
teutat3s requested review from axeman 2023-12-05 12:54:20 +00:00
teutat3s changed title from feat: grafana + prometheus + loki to feat: grafana + prometheus + loki on flora-6 2023-12-05 12:55:08 +00:00
teutat3s self-assigned this 2023-12-05 13:02:38 +00:00
teutat3s force-pushed feat/grafana from f9f72fb14f to f3436de94b 2023-12-06 18:20:17 +00:00 Compare
teutat3s force-pushed feat/grafana from f3436de94b to 6595109ae5 2023-12-06 19:13:01 +00:00 Compare
axeman reviewed 2023-12-08 15:44:46 +00:00
axeman left a comment
Owner
Copy link

The loki config doesn't seem to contain any config to delete old logs.
According to the docs here the logs will live forever. Or did I miss something?

The loki config doesn't seem to contain any config to delete old logs. According to the docs [here](https://grafana.com/docs/loki/latest/operations/storage/retention/) the logs will live forever. Or did I miss something?
hosts/flora-6/apps/grafana.nix Outdated
@ -0,0 +68,4 @@
auth_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/auth";
token_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/token";
api_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/userinfo";
role_attribute_path = "contains(roles[*], 'admin') && 'GrafanaAdmin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'";
axeman commented 2023-12-08 15:33:34 +00:00
Owner
Copy link

This looks wrong, we only have the 'admin' role in keycloack. Perhaps we should remove the editor role, doesn't seem like it make sense for our org.

This looks wrong, we only have the 'admin' role in keycloack. Perhaps we should remove the editor role, doesn't seem like it make sense for our org.
axeman commented 2023-12-08 15:33:39 +00:00
Owner
Copy link

This looks wrong, we only have the 'admin' role in keycloack. Perhaps we should remove the editor role, probably doesn't make sense for our org.

This looks wrong, we only have the 'admin' role in keycloack. Perhaps we should remove the editor role, probably doesn't make sense for our org.
teutat3s commented 2023-12-13 16:53:00 +00:00
Author
Owner
Copy link

Adressed in 10bb3295de.

Adressed in https://git.pub.solar/pub-solar/infra/commit/10bb3295de2f8622f9360cb310a396504d614a88.
teutat3s marked this conversation as resolved
hosts/flora-6/configuration.nix Outdated
@ -32,0 +37,4 @@
"br-91ba3e5e7589"
"vethd42ed22"
"veth8fbf599"
"vethd62653e"
axeman commented 2023-12-08 15:41:03 +00:00
Owner
Copy link

These look like they can change, is there no better way to do this?
Also it would be nice to mention what's running on these containers.

These look like they can change, is there no better way to do this? Also it would be nice to mention what's running on these containers.
axeman marked this conversation as resolved
teutat3s commented 2023-12-08 16:41:00 +00:00
Author
Owner
Copy link

The loki config doesn't seem to contain any config to delete old logs.
According to the docs here the logs will live forever. Or did I miss something?

Fixed in eed4814258

> The loki config doesn't seem to contain any config to delete old logs. > According to the docs [here](https://grafana.com/docs/loki/latest/operations/storage/retention/) the logs will live forever. Or did I miss something? Fixed in https://git.pub.solar/pub-solar/infra/commit/eed48142583abe4c64a484ff7c324aa91fc69ff1
teutat3s force-pushed feat/grafana from 88a961e09e to d990db5bf0 2023-12-13 01:01:12 +00:00 Compare
teutat3s force-pushed feat/grafana from d990db5bf0 to 8c10839980 2023-12-13 01:12:21 +00:00 Compare
teutat3s force-pushed feat/grafana from 8c10839980 to 10bb3295de 2023-12-13 16:52:33 +00:00 Compare
teutat3s added 1 commit 2023-12-13 18:20:21 +00:00
feat(nachtigall): send logs to loki, https+basic auth
All checks were successful
Flake checks / Check (pull_request) Successful in 4m5s
Details
e3d4f61a42 
Use caddy as reverse proxy for loki on flora-6, add basic auth

Add promtail to nachtigall, push logs to flora-6
teutat3s added 1 commit 2023-12-13 19:45:42 +00:00
fix: new Greenbaum mail server is mail.greenbaum.zone
All checks were successful
Flake checks / Check (pull_request) Successful in 4m12s
Details
d734adce58
axeman approved these changes 2023-12-13 21:59:22 +00:00
axeman left a comment
Owner
Copy link

🪵🪵🪵 📈

🪵🪵🪵 📈
teutat3s merged commit f0fb575c81 into main 2023-12-13 23:21:32 +00:00
teutat3s deleted branch feat/grafana 2023-12-13 23:21:32 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
b12f
hensoko
axeman
Labels
Clear labels   
Bug

   
Docs

   
Feature request

   
Good for newcomers

   
Infra

   
Privacy

   
Refactoring or migration

   
Security
No labels
Bug
Docs
Feature request
Good for newcomers
Infra
Privacy
Refactoring or migration
Security
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
teutat3s
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pub-solar/infra#77
No description provided.
Delete branch "feat/grafana"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?