Skip to content

intergral/grafana

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Intergral Grafana

This is a modified version of Grafana used by Intergral on FusionReactor Cloud platform.

Update process

To update this project when a new version of Grafana is released follow these steps:

  1. CheckOut this project locally
  git checkout git@github.com:intergral/grafana.git
  1. Add a new remote for the upstream grafana/grafana project
 git remote add grafana git@github.com:grafana/grafana.git
  1. Fetch the upstream tags etc
git fetch grafana
  1. Create a new branch for the new update
git checkout -b update_v10_4 tags/v10.4.1
  1. Push branch to create PR
git push -u orign updaate_v10_4
  1. Create PR in Github
  2. ReMerge our changes from origin/main - (I recommend using IDE to perform this action)
git pull origin main --no-rebase

ide_merge.png

It will be necessary to manually resolve the conflicts.

The above steps will create a new branch with a PR with all the changes from the old version to the new version. It is then necessary to check for custom changes on the main branch made by us.

Known changes

Below are some changes that we have made for this project vs grafana/grafana

Build

The build workflows have been re worked to support our needs when updating do not accept any changes from upstream.

License

Grafana is distributed under AGPL-3.0-only. For Apache-2.0 exceptions, see LICENSING.md.