Log Toolforge tool output to a Loki instance.
Description
Details
| Subject | Repo | Branch | Lines +/- | |
|---|---|---|---|---|
| P:toolforge::prometheus: Add scrape rules for Loki/Alloy | operations/puppet | production | +12 -0 | |
| toolforge: Add cookbook to mirror Loki-related images | cloud/wmcs-cookbooks | main | +117 -0 |
| Title | Reference | Author | Source Branch | Dest Branch | |
|---|---|---|---|---|---|
| logging: alloy: Deploy cluster-wide on tools | repos/cloud/toolforge/toolforge-deploy!871 | taavi | main-I7a4ff905e57696ed6534226596428a9294a1e3f6 | main | |
| logging: alloy: Deploy to double the workers | repos/cloud/toolforge/toolforge-deploy!869 | taavi | main-I3094dc7db753f36154b35cc9c9b3b693a23bc4dc | main | |
| logging: alloy: Deploy to even more nodes | repos/cloud/toolforge/toolforge-deploy!864 | taavi | main-Ifb17bf62ef6f5cf8a6e186c692ce6a456b163b3b | main | |
| logging: alloy: Deploy to more workers | repos/cloud/toolforge/toolforge-deploy!862 | taavi | main-I395644a8e25e1cdef253a09d25320464fa696d6e | main | |
| Deploy logging stack by default | repos/cloud/toolforge/lima-kilo!253 | taavi | main-I72ab6ba788ca68e9b86bf3bbdb338b15c913eaee | main | |
| logging: alloy: Deploy to two more tools workers | repos/cloud/toolforge/toolforge-deploy!858 | taavi | main-I0b5a86931095bf9a951e14c9b38540df97e7f0df | main | |
| logging: Deploy to tools | repos/cloud/toolforge/toolforge-deploy!856 | taavi | main-I2a75f16c20f737eaae579a36b0a927a037469c0f | main | |
| logging: alloy: Allow running on the entire cluster | repos/cloud/toolforge/toolforge-deploy!836 | taavi | main-I7c5569f698935ca9794d6455fb76ea376d1f9b83 | main-I156a2539de7b40a8aeeed3933fe37d01c93d17a5 | |
| logging: alloy: Add routing for infrastructure logs | repos/cloud/toolforge/toolforge-deploy!835 | taavi | main-I156a2539de7b40a8aeeed3933fe37d01c93d17a5 | main-Ie19e6900e99bd48acbbcf8b86491318b614e8abe | |
| logging: loki: Add second Loki instance for infrastructure logs | repos/cloud/toolforge/toolforge-deploy!834 | taavi | main-Ie19e6900e99bd48acbbcf8b86491318b614e8abe | main | |
| logging: loki: Add network policy rule for object storage access | repos/cloud/toolforge/toolforge-deploy!827 | taavi | main-I729571e8337cbbf6b433eb5d6180b7dc6d3e4bb7 | main | |
| logging: alloy: Fix loki write service name | repos/cloud/toolforge/toolforge-deploy!826 | taavi | main-I7a15f3e0883a50d8c4cb808fe6f055f09b446c1b | main | |
| logging: loki: Set nameOverride | repos/cloud/toolforge/toolforge-deploy!825 | taavi | main-I59df6ccd608477f2810572f634ad259d9d9c0320 | main | |
| logging: loki: Add missing emptyDir mounts in toolsbeta | repos/cloud/toolforge/toolforge-deploy!824 | taavi | main-I3639ecc2f5ab9b2b4de99d3e2ce13878ea98f62e | main | |
| logging: Fix path to get_secret.sh | repos/cloud/toolforge/toolforge-deploy!823 | taavi | main-Ia5b1c14eb31da968d2010289033c6b5b53b07311 | main | |
| logging: Add values to deploy to toolsbeta | repos/cloud/toolforge/toolforge-deploy!821 | taavi | main-I054208e27e5db1902a411d3b8df9a317c7aa5488 | main | |
| logging: Add basic rate limiting and retention config | repos/cloud/toolforge/toolforge-deploy!807 | taavi | main-Ieb3604c5872169a2e8cd173b52177f46a0ef13fe | main | |
| logging: Init component | repos/cloud/toolforge/toolforge-deploy!796 | taavi | main-If8f503514316703ce91f966fb6ad40b04ef8fdd0 | main | |
| Adding loki to install | repos/cloud/toolforge/toolforge-deploy!669 | rook | T386480 | main | |
| Adding loki | repos/cloud/toolforge/lima-kilo!226 | rook | T386480 | main |
Event Timeline
I believe
https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/tree/T386480?ref_type=heads
and
https://gitlab.wikimedia.org/repos/cloud/toolforge/lima-kilo/-/tree/T386480?ref_type=heads
Will get loki installed in lima-kilo. @aborrero @dcaro @Andrew @Raymond_Ndibe opinions?
I fussed a little with the git clone in roles/k8s/tasks/toolforge-deploy_components.yaml to pull T386480 as it isn't merged yet, so I don't really have a full test of the patch. Is there a way to do a true test of a patch like this that I'm not realizing?
Thanks!
I fussed a little with the git clone in roles/k8s/tasks/toolforge-deploy_components.yaml to pull T386480 as it isn't merged yet, so I don't really have a full test of the patch. Is there a way to do a true test of a patch like this that I'm not realizing?
Depends on your definition of true test :)
For a full lima-kilo rebuild with the new code, you can pass the value lima_kilo_toolforge_deploy_repo.ref (defined under lima-klio roles/k8s/defaults/main.yaml), either editing the file or passing --extra-vars lima_kilo_toolforge_deploy_repo.ref=new/value when running start-devenv.sh.
If you just want to try the toolforge-deploy part of it you can apply the patch on the clone inside lima-kilo (under ~/toolforge-deploy) and run the deploy script ~/toolforge-deploy/deploy.sh by hand.
If you want to test also the lima-kilo changes without rebuilding, you can re-run ansible from within lima-kilo with toolforge_ansible_run.sh -t k8s (or fulling without params)
Will get loki installed in lima-kilo. @aborrero @dcaro @Andrew @Raymond_Ndibe opinions?
The patches look ok to me (have not tested them yet, testing something else...), they have no extra config for loki yet right?
Correct this is installing a stock loki. Do we think we should merge these and continue from here or take a different approach?
rook opened https://gitlab.wikimedia.org/repos/cloud/toolforge/lima-kilo/-/merge_requests/226
Adding loki
rook opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/669
Adding loki to install
Do we think we should merge these and continue from here or take a different approach?
It should be ok, we could not install loki by default too and avoid people that don't need it yet from getting it installed, depends on how soon you expect to start integrating it with the rest of toolforge.
As I consider it more I guess it doesn't make much of a difference if it is merged now, as about the biggest "risk" of not merging is that I eventually push a toolforge-deploy_components.yaml that is set to pull T386480. So perhaps it is better to wait until we decide more exactly what we want before merging.
taavi closed https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/669
Adding loki to install
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/796
logging: Init component
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/807
logging: Add basic rate limiting and retention config
Change #1154802 had a related patch set uploaded (by Majavah; author: Majavah):
[cloud/wmcs-cookbooks@main] toolforge: Add cookbook to mirror Loki-related images
Change #1154802 merged by jenkins-bot:
[cloud/wmcs-cookbooks@main] toolforge: Add cookbook to mirror Loki-related images
taavi closed https://gitlab.wikimedia.org/repos/cloud/toolforge/lima-kilo/-/merge_requests/226
Adding loki
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/796
logging: Init component
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/807
logging: Add basic rate limiting and retention config
taavi updated https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/821
logging: Add values to deploy to toolsbeta
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/821
logging: Add values to deploy to toolsbeta
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/823
logging: Fix path to get_secret.sh
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/824
logging: loki: Add missing emptyDir mounts in toolsbeta
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/825
logging: loki: Set nameOverride
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/827
logging: loki: Add network policy rule for object storage access
taavi updated https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/826
logging: alloy: Fix loki write service name
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/tofu-provisioning/-/merge_requests/55
logging: Deploy remaining Loki buckets
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/834
logging: loki: Add second Loki instance for infrastructure logs
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/835
logging: alloy: Add routing for infrastructure logs
Change #1163729 had a related patch set uploaded (by Majavah; author: Majavah):
[operations/puppet@production] P:toolforge::prometheus: Add scrape rules for Loki/Alloy
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/823
logging: Fix path to get_secret.sh
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/824
logging: loki: Add missing emptyDir mounts in toolsbeta
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/825
logging: loki: Set nameOverride
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/826
logging: alloy: Fix loki write service name
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/827
logging: loki: Add network policy rule for object storage access
taavi updated https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/836
logging: alloy: Allow running on the entire cluster
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/856
logging: Deploy to tools
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/856
logging: Deploy to tools
Change #1163729 merged by Majavah:
[operations/puppet@production] P:toolforge::prometheus: Add scrape rules for Loki/Alloy
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/858
logging: alloy: Deploy to two more tools workers
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/858
logging: alloy: Deploy to two more tools workers
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/lima-kilo/-/merge_requests/253
Deploy logging stack by default
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/862
logging: alloy: Deploy to more workers
dcaro merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/862
logging: alloy: Deploy to more workers
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/864
logging: alloy: Deploy to even more nodes
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/864
logging: alloy: Deploy to even more nodes
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/869
logging: alloy: Deploy to double the workers
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/869
logging: alloy: Deploy to double the workers
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/lima-kilo/-/merge_requests/253
Deploy logging stack by default
taavi opened https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/871
logging: alloy: Deploy cluster-wide on tools
taavi merged https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-deploy/-/merge_requests/871
logging: alloy: Deploy cluster-wide on tools