Skip to content

merge development back to master #83

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 54 commits into from
Dec 6, 2019
Merged

merge development back to master #83

merged 54 commits into from
Dec 6, 2019

Conversation

@pb82
Copy link
Collaborator

@pb82 pb82 commented Dec 1, 2019

merge development back to master. this will become the 3.0.0 release.

Changes:

  • use go modules instead of dep
  • update to latest grafana image (6.5.1)
  • dashboards are no longer stored in a configmap but imported using the Grafana API
  • dashboards and datasources no longer use finalizers
  • update reconciliation strategy, no longer uses templates, all resources are always kept up to date
  • reworked ini config: changes are detected more reliably, only settings present in the CR are written to the ini. Other settings are left blank and get their default values from Grafana.
  • generated resources are much more customizable: labels, annotations, resource requirements, ingress/route settings, service settings...

pb82 and others added 30 commits December 2, 2019 00:08
@pb82
wip: rewrite reconciliation loop, migrate to go modules and use grafa…
df95743 
…na client
@R-Lawton @pb82
INTLY-4183-Updating grafana version
ff96602
@pb82
travis should work with go modules
ce79073
@pb82
update go version requirement
b1cc302
@pb82
update modules
dfa0309
@pb82
update Dockerfile, remove templates
d8573a2
@pb82
basic dashboard api create/update/delete implemented
f52fbc5
@pb82
implement dashboard logic: resync and updates
e7f3de0
@pb82
enable metrics
40ff24a
@pb82
cleanup and version update
b6a092b
@pb82
feat: import dashboards after grafana reinstall, improve unavailabili…
e297fc1 
…ty handling
@pb82
wip - plugin installation
addeba5
@pb82
wip: start working on a way to reset dashboards
8b7bb76
@pb82
wip: resilient dashboards (should survive restarts)
2c1b8da
@pb82
remove dashboard wait time because it prevents updating plugins
211d1c2
@pb82
add oauth example
f15e6b3
@pb82
fix: persist admin user back to cr to prevent deploymetn from getting…
820a8d6 
… constantly updated
@pb82
mount extra containers when specified in the cr
350b9b5
@pb82
fix: missing arg to read grafana deployment
b480615
@pb82
wip: set default resource requests and limits, hide empty config sect…
3bb2ba8 
…ions
@pb82
feat: grafana admin credentials from secret
9acb449
@pb82
gofmt fixes
63db388
@R-Lawton @pb82
graffanaServiceAccount modifications
f45c0f9
@pb82
update autogenerated code
f6a2413
@StevenTobin @pb82
add datasources
b65d461
@pb82
delete datasources
2d25d10
@R-Lawton @pb82
adding permissions
fa462fd
@StevenTobin @pb82
add grafanadatasourceconfig to model
275331e
@StevenTobin @pb82
mount datasources volume to provisioning directory
de46e59
@StevenTobin @pb82
fix codee checks
6789289
@pb82 pb82 requested a review from R-Lawton December 2, 2019 09:40
@pb82 pb82 changed the title WIP: merge development back to master merge development back to master Dec 6, 2019
@pb82 pb82 merged commit f551d38 into master Dec 6, 2019
@davidkirwan davidkirwan deleted the development branch December 6, 2019 08:58
@davidkirwan davidkirwan restored the development branch December 6, 2019 08:58
@hubeadmin hubeadmin deleted the development branch February 23, 2021 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@david-martin david-martin Awaiting requested review from david-martin

@davidkirwan davidkirwan Awaiting requested review from davidkirwan

@StevenTobin StevenTobin Awaiting requested review from StevenTobin

@R-Lawton R-Lawton Awaiting requested review from R-Lawton

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@pb82 @R-Lawton @StevenTobin