Skip to content

Accept user-defined dashboard uids in Grafana embeds

Sarah Yasonik requested to merge sy-grafana-fix-uid into master

What does this MR do?

We support the ability to grafana dashboard panels in GFM. https://docs.gitlab.com/ee/user/project/integrations/prometheus.html#embedding-charts-via-integration-with-grafana-http-api

The implementation unfortunately assumed that the unique identifier for grafana dashboards used only word-characters (ABC, 1-9, underscores), but a user-defined unique identifier could have any character. This change updates the regex which identifies the a dashboard's unique identifier from the URL.

I also added a bunch of tests to the relevant parsers to make it easy to account for this sort of scenario in our unit tests in future as well.

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Sarah Yasonik

Merge request reports