public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,246 Commits 655 Branches 650 Tags
61ba4eeb8cb3bbfd3e722c729c681e37566dcfae
Commit Graph

26 Commits

Author SHA1 Message Date
Andrew Mattheisen 4430ca2317 build paths in an os independent way (#29143) 
Use filepath instead of path to manipulate filename paths in a way compatible with the target operating system-defined file paths.
 2020-11-17 08:03:16 +01:00
Maksim Nabokikh 6e3e0dead8 Provisioning: Remove provisioned dashboards without parental reader (#26143) 2020-09-11 09:19:44 +02:00
Marcus Efraimsson b97d1f4170 Provisioning: Fix bug when provision app plugins using Enterprise edition (#26340) 
In OSS provisioning service init after plugin registration, but in
Enterprise it's the opposite order and installed app plugin check
fails. This adjusts service registry init priority to make sure plugins
are registered before provisioning inits.

Which issue(s) this PR fixes:
Fixes #26336
 2020-07-16 10:36:08 +02:00
Arve Knudsen 41d432b5ae Chore: Enable whitespace linter (#25903) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-06 20:17:28 +02:00
Marcus Efraimsson cc95754e0d Provisioning: Adds support for enabling app plugins (#25649) 
Adds support for enabling app plugins using provisioning. 

Ref #11409

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-06-22 17:49:13 +02:00
Carl Bergquist 80f40040b0 Linting fixes for dashboard provsioning (#23576) 2020-04-15 08:12:52 +02:00
Artur Kondas 9f2af718dc Provisioning: Validate that dashboard providers have unique names (#22898) 
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: bergquist <carl.bergquist@gmail.com>
 2020-04-14 20:54:00 +02:00
huanggze 69c5efcf00 Cleanup: move interface ProvisioningService into provisioning package (#23061) 2020-03-25 14:14:24 +01:00
Marcus Efraimsson ca84829647 Provisioning: Start provision dashboards after Grafana server have started (#21564) 
6.2-beta1 changed so that data sources, dashboards and alert notifiers 
are provisioned on service Init where's before only data sources and 
alert notifiers was provisioned on service Init and dashboards was first
provisioned in service Run which happens after Grafana server have 
started.
This change reverts so that dashboard provisioning are first happening 
in service Run, after Grafana server have started.

Fixes #21133
 2020-01-17 13:39:41 +01:00
Jon Gyllenswärd a45ce36566 Allow saving of provisioned dashboards (#19820) 
Allows saving of provisioned dashboards if the config value allowUiUpdates is set to true

Fixes #11778
 2019-10-31 14:27:31 +01:00
Carl Bergquist c55e6016bf backend: replace /pkg/errors with errutil (#17065) 2019-05-15 12:20:17 +02:00
zhulongcheng 2fff8f77dc move log package to /infra (#17023) 
ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
 2019-05-13 08:45:54 +02:00
Andrej Ocenas eb82a75668 Provisioning: Show file path of provisioning file in save/delete dialogs (#16706) 
* Add file path to metadata and show it in dialogs

* Make path relative to config directory

* Fix tests

* Add test for the relative path

* Refactor to use path relative to provisioner path

* Change return types

* Rename attribute

* Small fixes from review
 2019-04-30 13:32:18 +02:00
Torkel Ödegaard 9b68952482 Provisioning: Trying to fix failing test (#16800) 
* Provisioning: Trying to fix test

* Use better sync strategy for test

* Lower the timeout

* Remove commented code

Co-Authored-By: aocenas <mr.ocenas@gmail.com>
 2019-04-30 10:35:54 +02:00
Andrej Ocenas 42b745a098 Provisioning: Add API endpoint to reload provisioning configs (#16579) 
* Add api to reaload provisioning

* Refactor and simplify the polling code

* Add test for the provisioning service

* Fix provider initialization and move some code to file reader

* Simplify the code and move initialization

* Remove unused code

* Update comment

* Add comment

* Change error messages

* Add DashboardProvisionerFactory type

* Update imports

* Use new assert lib

* Use mutext for synchronizing the reloading

* Fix typo

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Add docs about the new api
 2019-04-25 09:06:44 +02:00
bergquist 7c93335d28 gofmt issue 2019-01-28 21:04:08 +01:00
bergquist 8f0e65a150 renames alert_notifications -> notifiers 2019-01-28 20:39:09 +01:00
Pavel Bakulev 6e3e9a337d Added alert_notification configuration 2019-01-16 16:45:42 +02:00
Torkel Ödegaard 053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Karsten Weiss be2d635078 Simplify error returns (gosimple) 
This fixes:
pkg/api/avatar/avatar.go:261:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/log/file.go:102:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/metrics/graphitebridge/graphite.go:298:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/provisioning/provisioning.go:23:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard.go:351:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard.go:435:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/stats.go:22:2: 'if err != nil { return err }; return err' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/team.go:213:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
 2018-04-16 21:04:57 +02:00
bergquist 2e610cb256 dashboards as cfg: move dash/ds config files to /provisioning/* 2017-12-07 15:27:01 +01:00
bergquist 9cebb23e01 dashboards as cfg: revert minor changes 2017-12-07 15:27:01 +01:00
bergquist dc0fb8be06 dashboards as cfg: code cleanup 2017-12-07 15:27:01 +01:00
bergquist d69b63cbc0 dashboards as cfg: read first cfg version 2017-12-07 15:27:01 +01:00
bergquist ebbfc529e0 datasource as cfg: support globbing 2017-11-15 14:30:32 +01:00
bergquist 665df676a5 datasource as cfg: rename feature to provisioning 2017-11-15 14:30:32 +01:00