Skip to content

Update grafana to v10 using Ark rpms #664

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

Merged
merged 10 commits into from
May 7, 2025
Merged

Update grafana to v10 using Ark rpms #664

merged 10 commits into from
May 7, 2025

Conversation

sjpb
Copy link
Collaborator

@sjpb sjpb commented May 2, 2025

Bumps grafana to v10 and uses Ark for stackhpc build, as upstream grafana repos appear to have removed 9.5.21 on or after 2025-04-25. As ark was in on-demand mode the packages are not there either.

Also makes it possible to change whether Packer cleans up resources from failed builds or not on a per-run basis.

Notes:

  1. Ark is now in immediate mode for grafana, see Sync grafana repository content immediately stackhpc-release-train#399.
  2. All Granfana dashboards are showing warnings for Angular depreciation, needs to be fixed before moving to v11.
  3. The (forked) cloudalchemy.grafana role creates a repofile, and does so disabled to work around previous issues with grafana repos being unavaiable. In order to make minimal changes, this adds a custom repofile with the same content which is generated by the dnf_repos role.
  4. Although a single repo is used for both RockyLinux 8 & 9, separate repo structures and snapshots have been added in case these need to diverge in future, and for consistency with other repo definitions.

@sjpb sjpb marked this pull request as ready for review May 2, 2025 13:51
@sjpb sjpb requested a review from a team as a code owner May 2, 2025 13:51
@sjpb
Copy link
Collaborator Author

sjpb commented May 2, 2025

@sjpb
Copy link
Collaborator Author

sjpb commented May 2, 2025

Testing the above build manually failed, repo logic is wrong.

Fatimage build: https://github.com/stackhpc/ansible-slurm-appliance/actions/runs/14797550985

@sjpb
Copy link
Collaborator Author

sjpb commented May 6, 2025

@sjpb sjpb changed the title Use pulp/ark for grafana rpms Update grafana to v10 using Ark rpms May 6, 2025
@sjpb sjpb requested a review from wtripp180901 May 6, 2025 10:06
@sjpb
Copy link
Collaborator Author

sjpb commented May 6, 2025

Tested all dashboards at this commit. All worked, all warned re. angular.

Copy link
Contributor

@wtripp180901 wtripp180901 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're duplicating the repofile in the Grafana role, we'll need some way of protecting Ark creds

@sjpb
Copy link
Collaborator Author

sjpb commented May 6, 2025

@sjpb sjpb requested a review from wtripp180901 May 6, 2025 12:04
wtripp180901
wtripp180901 previously approved these changes May 6, 2025
Copy link
Contributor

@wtripp180901 wtripp180901 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

[edit added from Slack chat:] there is still one potential case where creds can get leaked, if you have dnf_repos_password defined but dnf_repos not in groups [then the check in bootstrap doesn't get run]. If you're using creds to do a local build from Ark directly, you could then run site without removing the creds, where dnf_repos wouldn't be in groups since iirc its just set to builder

@sjpb
Copy link
Collaborator Author

sjpb commented May 6, 2025

@sjpb sjpb force-pushed the fix/grafana-repos branch from ea41295 to abb6394 Compare May 6, 2025 12:50
@sjpb
Copy link
Collaborator Author

sjpb commented May 6, 2025

Copy link
Contributor

@wtripp180901 wtripp180901 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sjpb sjpb merged commit 6c8bf78 into main May 7, 2025
7 checks passed
@sjpb sjpb deleted the fix/grafana-repos branch May 7, 2025 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants