Skip to content
Snippets Groups Projects

Grafana

All threads resolved!
Merged Jelle van der Waa requested to merge grafana into master
All threads resolved!

Rewrite the Grafana role to login via OIDC and provision Grafana dashboard and datasources.

Merge request reports

Pipeline #1669 passed

Pipeline passed for 140d7d74 on grafana

Approved by

Merged by Jelle van der WaaJelle van der Waa 4 years ago (Sep 9, 2020 10:15pm UTC)

Merge details

  • Changes merged into master with 2f66c6b6.
  • Deleted the source branch.

Pipeline #1670 passed

Pipeline passed for 2f66c6b6 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Levente Polyak
  • Levente Polyak mentioned in merge request !72 (merged)

    mentioned in merge request !72 (merged)

  • Jelle van der Waa added 29 commits

    added 29 commits

    • 88f4c319...d16d80fb - 25 commits from branch master
    • d0770cbc - Don't install grafana-zabbix anymore
    • 1c1c095e - Set X-Forwarded-For header to show IP origin in grafana
    • f93892d7 - Setup Oauth for Grafana
    • 6d8a273f - Automatically provision Grafana dashboards and datasources

    Compare with previous version

  • added 8 commits

    • 6d8a273f...ff9358a9 - 4 commits from branch master
    • eff9748f - Don't install grafana-zabbix anymore
    • dfa701e2 - Set X-Forwarded-For header to show IP origin in grafana
    • eb721763 - Setup Oauth for Grafana
    • e8bddfa1 - Automatically provision Grafana dashboards and datasources

    Compare with previous version

  • Jelle van der Waa resolved all threads

    resolved all threads

  • added 13 commits

    • e8bddfa1...b2876d08 - 9 commits from branch master
    • 4d139a2a - Don't install grafana-zabbix anymore
    • abdcaf8f - Set X-Forwarded-For header to show IP origin in grafana
    • be9565ee - Setup Oauth for Grafana
    • 44a6a642 - Automatically provision Grafana dashboards and datasources

    Compare with previous version

  • I unblocked Keycloak so we're good to merge this now.

  • Author Developer

    Yes, except I still have two changes which are not in terraform. But I've modified them locally so only Grafana changes are deployed. Everything is re-deployed with the secret key change and dashboards emptied.

    Edited by Jelle van der Waa
  • added 6 commits

    • 44a6a642...9a096d9f - 2 commits from branch master
    • 34943953 - Don't install grafana-zabbix anymore
    • 1dffa980 - Set X-Forwarded-For header to show IP origin in grafana
    • 7183361c - Setup Oauth for Grafana
    • 140d7d74 - Automatically provision Grafana dashboards and datasources

    Compare with previous version

  • Sven-Hendrik Haase approved this merge request

    approved this merge request

  • mentioned in commit 2f66c6b6

  • Please register or sign in to reply
    Loading