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

exported dashboards for sharing, created dashboard export script, upload dashboard github action and updated documentation #641

Merged
merged 12 commits into from
May 16, 2024

Conversation

ehearneRedHat
Copy link
Contributor

@ehearneRedHat ehearneRedHat commented May 13, 2024

What (currently completed):

  • Exported dashboards for sharing publicly on Grafana site.
  • Created a script for creating a universal dashboard with a "Export for sharing manually" exported dashboard.
  • Added documentation on how to use script for creating a "universal" dashboard.
  • Created GitHub Action that will upload any changes made to the universal dashboards when merged on main branch.

Verify (currently completed):

  • Head over to https://grafana.com/grafana/dashboards/ and upload the changed files from this PR. They should all upload successfully, even as revisions. Feel free to delete afterwards.
  • Run the quickstart script and expose the grafana service within the kuadrant-local cluster to port 3000:3000, login with credentials admin/admin and export the following dashboards, ensuring the toggle "Export for sharing manually" is toggled:
    • App Developer
    • Business User
    • Platform Engineer
  • Follow the instructions in config/observability/README.md for running the script to create a universal dashboard. Test by importing into local Grafana instance, and uploading to Grafana Community Platform.

@david-martin david-martin self-requested a review May 13, 2024 11:20
@david-martin
Copy link
Member

I haven't attempted to upload any to grafana.com yet.
I have ran the quickstart locally to see how this version of the dashboards behave and I see a couple of errors related to the data source.
image

I wonder if there's a way to use the same exported version for both upload and import via configmap for our local environments.
If not, we may have to keep the source in the repo as it was before (not exported for sharing).
And use the option to export for sharing only when we need to update the latest dashboards in grafana.com

@ehearneRedHat
Copy link
Contributor Author

I wonder if there's a way to use the same exported version for both upload and import via configmap for our local environments. If not, we may have to keep the source in the repo as it was before (not exported for sharing). And use the option to export for sharing only when we need to update the latest dashboards in grafana.com

I will take a look and get back to you - good catch !

@ehearneRedHat
Copy link
Contributor Author

@david-martin it seems to be an issue with the data source within the JSON according to this forum thread. I'll see if I can find anything within the JSON that can be removed that will allow the dashboard template be uploaded to Grafana, but also allow the user uploading within their Grafana instance to select their own data source.

Copy link
Contributor Author

@ehearneRedHat ehearneRedHat left a comment

Choose a reason for hiding this comment

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

I believe this could be our problem. Let me see if I can change this back to datasource.

@ehearneRedHat
Copy link
Contributor Author

@david-martin made changes and tested to see if upload is okay on both Grafana instance and on Grafana Community Dashboards.

@ehearneRedHat ehearneRedHat marked this pull request as draft May 13, 2024 14:40
@ehearneRedHat ehearneRedHat changed the title exported dashboards for sharing [WIP] exported dashboards for sharing May 13, 2024
@ehearneRedHat
Copy link
Contributor Author

ehearneRedHat commented May 13, 2024

Feedback to implement from @david-martin :

  • Create documentation on how to export the dashboards for use on Grafana (for Community and Local use).
  • Create a Bash script that can parse through the JSON and convert an exported dashboard that can be uploaded both to Grafana instance and Grafana Community.
  • Create manual GitHub action that can upload the dashboards when changes merged to main branch.

@ehearneRedHat
Copy link
Contributor Author

ehearneRedHat commented May 14, 2024

Interesting find here that could help automate the process.

Not really - still doesn't export as needed.

@ehearneRedHat
Copy link
Contributor Author

@david-martin hope the changes suit :)

@ehearneRedHat ehearneRedHat force-pushed the github-action-dashboard branch from 133ae36 to 3719175 Compare May 16, 2024 07:55
@ehearneRedHat ehearneRedHat force-pushed the github-action-dashboard branch from 3719175 to cd20313 Compare May 16, 2024 07:59
@ehearneRedHat ehearneRedHat changed the title [WIP] exported dashboards for sharing exported dashboards for sharing, created dashboard export script, upload dashboard github action and updated documentation May 16, 2024
@ehearneRedHat ehearneRedHat marked this pull request as ready for review May 16, 2024 08:08
@ehearneRedHat
Copy link
Contributor Author

@david-martin Feel free to review - changes are ready for review :)

@ehearneRedHat
Copy link
Contributor Author

@david-martin I have added git diff within the action to check the changed files. Let me know if there's anything else I need to address. :)

@david-martin
Copy link
Member

/lgtm
/approve

Thanks for taking the time to make these improvements @ehearneRedHat

@ehearneRedHat ehearneRedHat merged commit 7efd1c3 into Kuadrant:main May 16, 2024
15 checks passed
@ehearneRedHat ehearneRedHat deleted the github-action-dashboard branch May 16, 2024 12:16
@ehearneRedHat
Copy link
Contributor Author

ehearneRedHat commented May 16, 2024 via email

laurafitzgerald pushed a commit to laurafitzgerald/kuadrant-operator that referenced this pull request Dec 20, 2024
* KuadrantGH-641 enforced condition on dnspolicy

* KuadrantGH-641 updating integration tests

* KuadrantGH-454 afregate statuses of the DNS records
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.

Publish all Kuadrant example grafana dashboards to grafana.com
2 participants