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

Merged
merged 54 commits into from
Dec 6, 2019
Merged

merge development back to master #83

Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
df95743
wip: rewrite reconciliation loop, migrate to go modules and use grafa…
pb82 Nov 10, 2019
ff96602
INTLY-4183-Updating grafana version
R-Lawton Nov 20, 2019
ce79073
travis should work with go modules
pb82 Nov 20, 2019
b1cc302
update go version requirement
pb82 Nov 20, 2019
dfa0309
update modules
pb82 Nov 20, 2019
d8573a2
update Dockerfile, remove templates
pb82 Nov 20, 2019
f52fbc5
basic dashboard api create/update/delete implemented
pb82 Nov 22, 2019
e7f3de0
implement dashboard logic: resync and updates
pb82 Nov 24, 2019
40ff24a
enable metrics
pb82 Nov 24, 2019
b6a092b
cleanup and version update
pb82 Nov 24, 2019
e297fc1
feat: import dashboards after grafana reinstall, improve unavailabili…
pb82 Nov 24, 2019
addeba5
wip - plugin installation
pb82 Nov 24, 2019
8b7bb76
wip: start working on a way to reset dashboards
pb82 Nov 25, 2019
2c1b8da
wip: resilient dashboards (should survive restarts)
pb82 Nov 25, 2019
211d1c2
remove dashboard wait time because it prevents updating plugins
pb82 Nov 25, 2019
f15e6b3
add oauth example
pb82 Nov 25, 2019
820a8d6
fix: persist admin user back to cr to prevent deploymetn from getting…
pb82 Nov 25, 2019
350b9b5
mount extra containers when specified in the cr
pb82 Nov 25, 2019
b480615
fix: missing arg to read grafana deployment
pb82 Nov 25, 2019
3bb2ba8
wip: set default resource requests and limits, hide empty config sect…
pb82 Nov 26, 2019
9acb449
feat: grafana admin credentials from secret
pb82 Nov 26, 2019
63db388
gofmt fixes
pb82 Nov 26, 2019
f45c0f9
graffanaServiceAccount modifications
R-Lawton Nov 28, 2019
f6a2413
update autogenerated code
pb82 Nov 28, 2019
b65d461
add datasources
StevenTobin Nov 29, 2019
2d25d10
delete datasources
pb82 Nov 29, 2019
fa462fd
adding permissions
R-Lawton Nov 29, 2019
275331e
add grafanadatasourceconfig to model
StevenTobin Nov 29, 2019
de46e59
mount datasources volume to provisioning directory
StevenTobin Nov 29, 2019
6789289
fix codee checks
StevenTobin Nov 29, 2019
08c705a
fixing forrmatting error
R-Lawton Nov 29, 2019
44302f9
comment changes and hardcode provisioning path
StevenTobin Nov 29, 2019
cae6afe
code check fixes
StevenTobin Nov 29, 2019
9cad949
updates to ensure new reconciler and grafana api work on vanilla kube
pb82 Nov 30, 2019
d33fc49
update permissions
pb82 Nov 30, 2019
8677d17
restart grafana on datasource change, do not reconcile datasources wh…
pb82 Dec 1, 2019
f63d7a6
implement datasource hashing
pb82 Dec 1, 2019
e711e83
improve datasource update handling
pb82 Dec 1, 2019
8b80abc
allow configuration of service ports and route target ports
pb82 Dec 1, 2019
908aede
wip: ensure config defaults
pb82 Dec 1, 2019
4a83a2e
wip: rework ini configuration
pb82 Dec 1, 2019
b2a6143
add client configuration options
pb82 Dec 1, 2019
318f7cd
update examples, only update datasource status if they have changed
pb82 Dec 1, 2019
ce9f3c2
rewrite ini config system
pb82 Dec 1, 2019
a757d2a
update oauth example
pb82 Dec 1, 2019
8d799f2
fix: service ports did not return existing
pb82 Dec 1, 2019
a5724f4
remove unused code
pb82 Dec 1, 2019
021347a
remove ini dependency
pb82 Dec 2, 2019
95fa747
add backwards compatibility options
pb82 Dec 2, 2019
74437bc
fix: correctly identify dashboards when scan all is enabled
pb82 Dec 2, 2019
63577da
update documentation
pb82 Dec 5, 2019
aac4c49
add changelog
pb82 Dec 5, 2019
df00168
add a note about the Grafana version
pb82 Dec 6, 2019
dee56ca
bump version to 3.0.0
pb82 Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: service ports did not return existing
  • Loading branch information
@pb82
pb82 committed Dec 1, 2019
commit 8d799f27dd034acc82783d4dd80c905fde94921f
2 changes: 1 addition & 1 deletion pkg/controller/model/grafanaService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func getServicePorts(cr *v1alpha1.Grafana) []v1.ServicePort {
defaultPorts = append(defaultPorts, port)
}

return cr.Spec.Service.Ports
return defaultPorts
}

func GrafanaService(cr *v1alpha1.Grafana) *v1.Service {
Expand Down