-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Publish RabbitMQ-Stream dashboard to grafana.com #3250
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
Conversation
Removed the Dockerfile and slimmed down the Makefile, all of this is now handled by https://github.com/rabbitmq/rabbitmq-server/blob/master/.github/workflows/oci.yaml cc @Zerpet @pjk25 More details here (including the steps used to publish to grafana.com): https://github.com/rabbitmq/release-engineering/issues/11#issuecomment-887627938 I don't want to hold up this PR, will invest in automating the steps described in the previous link another time. Time to 🚀 Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
Before this commit: > make overview metrics services.rmq1.ulimits.nofile.hard must be a integer make: *** [Makefile:68: overview] Error 15 Accoring to the docs https://docs.docker.com/compose/compose-file/compose-file-v3/#ulimits this must be an integer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This handles the scenario where rmq2 is not available, and stream-perf-test exits with a non-zero exit code. Good spot @ansd! Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
I'm trying out https://github.com/tibdex/backport for the first time. Let's see how well it works @pjk25 😉 |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v3.9.x v3.9.x
# Navigate to the new working tree
cd .worktrees/backport-v3.9.x
# Create a new branch
git switch --create backport-3250-to-v3.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 ee6aa3067e96632d9801e64b6c3f5a3eebf9a7da
# Push it to GitHub
git push --set-upstream origin backport-3250-to-v3.9.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.9.x Then, create a pull request where the |
Publish RabbitMQ-Stream dashboard to grafana.com (cherry picked from commit ee6aa30)
I'm not sure why the above backport failed. I could do the cherry-pick locally with no issues. The focus is on producing 3.9.1, so I'll stick with that and maybe come back to this later. For now I did a manual backport to |
It looks like the backport action might just be broken. Rather than spend much time investigating I'm tempted to give https://mergify.io/features/backports a try. I will reconfigure things when I have a chance. |
This breaks the docker-compose integration, but we need to move away from it anyways, the whole dev flow needs revisiting after our focus on K8s. $__rate_interval does not work with irate, dropping it in favour of 60s, same as all other dashboards. This is a follow-up to #3250 Thanks @ansd for mentioning about the post-import issues. It was uploaded as https://grafana.com/api/dashboards/14798/revisions/3/download Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
This breaks the docker-compose integration, but we need to move away from it anyways, the whole dev flow needs revisiting after our focus on K8s. $__rate_interval does not work with irate, dropping it in favour of 60s, same as all other dashboards. This is a follow-up to #3250 Thanks @ansd for mentioning about the post-import issues. It was uploaded as https://grafana.com/api/dashboards/14798/revisions/3/download Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk> (cherry picked from commit 65afbb9)
The associated action does not seem to work correctly (See #3250).
Before this commit, importing the dashboard via ConfigMap as seen in rabbitmq/cluster-operator@1eb1dc6 didn't work because DS_PROMETHEUS variable was undefined in Grafana. Related to #3250 Co-authored-by: Gerhard Lazu <gerhard@lazu.co.uk>
Before this commit, importing the dashboard via ConfigMap as seen in rabbitmq/cluster-operator@1eb1dc6 didn't work because DS_PROMETHEUS variable was undefined in Grafana. Related to #3250 Co-authored-by: Gerhard Lazu <gerhard@lazu.co.uk> (cherry picked from commit ea18c31)
All of this is now handled by https://github.com/rabbitmq/rabbitmq-server/blob/master/.github/workflows/oci.yaml
cc @Zerpet @pjk25
More details here (including the steps used to publish to grafana.com): https://github.com/rabbitmq/release-engineering/issues/11#issuecomment-887627938
I don't want to hold up this PR, will invest in automating the steps described in the previous link another time.