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

migrate stable/grafana here #3

Closed
8 tasks done
torstenwalter opened this issue Sep 4, 2020 · 1 comment
Closed
8 tasks done

migrate stable/grafana here #3

torstenwalter opened this issue Sep 4, 2020 · 1 comment

Comments

@torstenwalter
Copy link
Collaborator

torstenwalter commented Sep 4, 2020

This issue documents the steps executed for the migration

@zanhsieh

Migration of git history

git clone git@github.com:helm/charts.git grafana-helm-charts
cd grafana-helm-charts
git filter-repo --path-glob 'stable/grafana/*' --path-rename stable/:charts/ --path LICENSE
git checkout -b main
# do not migrate deprecation PR
git reset --hard b984f87e1d932b6b1856910890068dac666c957e
git remote add origin git@github.com:grafana/helm2-grafana.git
git push origin main

With this we now have the complete history of the stable/grafana chart in the main branch of this repository.
I took main as I did not want to force push anything to master. The idea is to make main the default branch of this repository.

Check diff of master and main

git clone git@github.com:grafana/helm2-grafana.git
cd helm2-grafana
git checkout master
cd ..
git clone git@github.com:grafana/helm2-grafana.git helm-grafana
cd helm-grafana
git checkout main
cd ..

Looks as if main and master are already in sync except the deprecation, which was not merged by intention.

diff -r helm2-grafana/ helm-grafana/charts/grafana/                                                                                                     1 ↵
Only in helm2-grafana/: .git

Create empty gh-pages branch

This is needed as it will act as helm chart repository.

git checkout --orphan gh-pages
git rm -rf .
git commit --allow-empty -m "root commit"
git push origin gh-pages

Next steps

  • create PR which contains the following changes First release in new repository #4

    • new version of the chart
    • updated README
    • ci pipeline
  • make main default branch in the repositoy

  • protect main branch

  • protect gh-pages branch
    prevent force push and deletions
    image

  • rename repository to helm-charts

@torstenwalter
Copy link
Collaborator Author

Migration completed ;-)

torstenwalter pushed a commit to torstenwalter/grafana-helm-charts that referenced this issue Oct 3, 2020
* Adds frontend to Loki.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Improves tests.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes sneaky bug in entries sorting.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes the split by interval.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Tweak jsonnet deployments and add a way to lint/fmt.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* lint.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* fix timezone issue.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Improve tests and rollback change in loghttp package.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes a flaky test that might run one more goroutine.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes windows build.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Improve tracing in the split by interval.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Add test stream to proto conversion.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes flappy retry test.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Remove err shadowing in stopQueryFrontend as it was confusing.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Refactor grpc message size in the libsonnet config file.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Don't check auth header for GRPC  TransferChunks.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Query frontend (grafana#3)

* frontend codec merging optimizations

* codec benchmarks

* removes unused bounds code in queryrange ordering

* [wip] splitby uses channels instead of sub batching intervals

* splitBy channel limit test

* single allocation for merging entries from a single stream

* skip merging loki responses when limit is already hit

* removes checks for unlimited queries in queryrange

* removes splitByInterval{,.interval} spans

* removes interval_batch_size from jsonnet lib

* moves benchmark utils to own file

* renames markers -> entries

* priority queue comments

* Removes unused logRequest.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Sets the cache interval to the same split interval.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Missing import libsonnet for the frontend.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Frontend should not be a cluster IP.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
unguiculus added a commit to unguiculus/grafana-helm-charts that referenced this issue Dec 9, 2020
This enables using a PVC for the query cache.

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
unguiculus added a commit to unguiculus/grafana-helm-charts that referenced this issue Dec 10, 2020
This enables using a PVC for the query cache.

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
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

No branches or pull requests

1 participant