Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Upgrade monitoring stack #1071

Merged
merged 3 commits into from
Apr 9, 2024

Conversation

gtirloni
Copy link
Contributor

@gtirloni gtirloni commented Apr 8, 2024

Loki 2.7.3 wasn't playing well with some queries from Grafana 10.3 and updating it to 2.9.6 fixed the issues.

While at it, I've updated Vector and Grafana/Prometheus as well.

Tested it in a live environment and also AIO. No new errors noticed in the logs.

Vector is a bit more noisy about issues but it doesn't prevent logs from being forwarded (especially, it complains when a log event is missing expected labels.. whereas before it would just ignore it).

@gtirloni gtirloni changed the title Upgrade monitoring stack feat: Upgrade monitoring stack Apr 8, 2024
@mnaser
Copy link
Member

mnaser commented Apr 8, 2024

This is awesome, but I'd like this to be a test on how we do cherry-picks, since I'd like to have this in stable/zed too since monitoring stack updates are non-user affecting.

@mnaser
Copy link
Member

mnaser commented Apr 8, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/zed in a new PR and assign it to you.

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mnaser
Copy link
Member

mnaser commented Apr 8, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/zed in a new PR and assign it to you.

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mnaser
Copy link
Member

mnaser commented Apr 9, 2024

régate

@mnaser
Copy link
Member

mnaser commented Apr 9, 2024

regate

@mnaser mnaser added gate and removed gate labels Apr 9, 2024
@mnaser mnaser merged commit 59219b6 into vexxhost:main Apr 9, 2024
6 of 7 checks passed
@vexxhost-bot
Copy link
Collaborator

@mnaser: #1071 failed to apply on top of branch "stable/zed":

Applying: feat(monitoring): Update to kube-prometheus-stack 58.0.0
Using index info to reconstruct a base tree...
M	roles/defaults/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/defaults/vars/main.yml
CONFLICT (content): Merge conflict in roles/defaults/vars/main.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat(monitoring): Update to kube-prometheus-stack 58.0.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mnaser
Copy link
Member

mnaser commented Apr 9, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: #1071 failed to apply on top of branch "stable/zed":

Applying: feat(monitoring): Update to kube-prometheus-stack 58.0.0
Using index info to reconstruct a base tree...
M	roles/defaults/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/defaults/vars/main.yml
CONFLICT (content): Merge conflict in roles/defaults/vars/main.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat(monitoring): Update to kube-prometheus-stack 58.0.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #1075

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@gtirloni gtirloni self-assigned this Apr 12, 2024
gtirloni added a commit to gtirloni/atmosphere that referenced this pull request Apr 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants