public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,232 Commits 655 Branches 650 Tags
38caa80acdbb3f18d2ade47f66ced9ab514b8fe5
Commit Graph

48 Commits

Author SHA1 Message Date
Arve Knudsen
ab078133bf Backend: Remove unused code (#28933) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-11 11:38:04 +01:00
Arve Knudsen
b5379c5335 Chore: Fix SQL related Go variable naming (#28887) 
* Chore: Fix variable naming

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-11 06:21:08 +01:00
Arve Knudsen
45adfe7732 Data sources: Use SQL store directly, not via bus (#27000) 
* Server: Make it possible to avoid getting SQL store via bus

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-08-21 09:30:06 +02:00
Arve Knudsen
a2fbffe48a Server: Add health check route (#26999) 
* Server: Add health check route

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Server: Remove health check middleware

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-18 14:58: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
Arve Knudsen
5070f7a75b Chore: Start harmonizing linting with plugin SDK (#25854) 
* Chore: Harmonize linting with plugin SDK

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Fix linting issues

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-06-29 14:08:32 +02:00
Andrej Ocenas
e5dd7efdee Provisioning: Allows specifying uid for datasource and use that in derived fields (#23585) 
* Add uid to datasource

* Fix uid passing when provisioning

* Better error handling and Uid column type change

* Fix test and strict null error counts

* Add backend tests

* Add tests

* Fix strict null checks

* Update test

* Improve tests

* Update pkg/services/sqlstore/datasource.go

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* Variable rename

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-20 15:48:38 +02:00
Noval Agung Prayogo
ea35ae4d1f Chore: Update the xorm dependency (#22376) 
* Upgrade xorm

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-04-01 15:57:21 +02:00
Carl Bergquist
f9962eabff chore: avoid aliasing imports in services (#22499) 2020-02-29 13:35:15 +01:00
Oleg Gaidarenko
75fa1f0207 Metrics: use consistent naming for exported variables (#18134) 
* Metrics: remove unused metrics

Metric `M_Grafana_Version` is not used anywhere, nor the mentioned
`M_Grafana_Build_Version`. Seems to be an artefact?

* Metrics: make the naming consistent

* Metrics: add comments to exported vars

* Metrics: use proper naming

Fixes #18110
 2019-07-16 16:58:46 +02:00
Andrej Ocenas
66f6e16916 Security: Store datasource passwords encrypted in secureJsonData (#16175) 
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
 2019-04-15 11:11:17 +02:00
Carl Bergquist
f3753712e0 Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
Carl Bergquist
71bfefa8fb Merge pull request #15608 from Maddin-619/fix-datasource-update 
Fix Datasource Update to no User/Password
 2019-03-05 14:38:32 +01:00
bergquist
ae9327ff3a remove UseBool since we use AllCols 2019-03-05 13:41:40 +01:00
Marcus Efraimsson
d49f0bedd3 fix: prevent datasource json data stored as nil (#15508) 
prevent datasource json data stored as nil

closes #14239
 2019-03-02 21:18:26 +01:00
bergquist
8a3a3cccc3 moves metric package to /infra 
ref #14679
 2019-02-24 21:12:51 +01:00
Maddin-619
09cd173e92 updates all cols except created so user and password 
of the database can be chaned to no user and password
 2019-02-22 14:19:15 +01:00
Baokun Lee
f51222027d Raise datasources number to 5000 2018-12-18 23:59:14 +08:00
Torkel Ödegaard
b3c78f1265 wip: data source permissions hooks 2018-10-01 15:38:55 +02:00
bergquist
1a041a2250 bug: return correct err message 
if the sql query failed has is false and the method will return
m.ErrDataSourceNotFound which is incorrect. We now return the
correct error message from the query

ref #10843
 2018-02-14 13:32:52 +01:00
bergquist
ebbfc529e0 datasource as cfg: support globbing 2017-11-15 14:30:32 +01:00
bergquist
0f136a940c datasource as cfg: enable editable ds's 2017-11-15 14:30:32 +01:00
bergquist
36676e23c1 datasource as cfg: adds readonly datasources 2017-11-15 14:30:32 +01:00
bergquist
0f29b8ac83 datasources as cfg: tests for insert/updating datasources 2017-11-15 14:30:32 +01:00
bergquist
d68bfaa8be datasource as cfg: typo 2017-10-25 12:21:06 +02:00
bergquist
da6430ac01 datasource as cfg: explain why cmd.version can be higher 2017-10-25 09:39:27 +02:00
bergquist
89923bf77a datasources: change to optimisic concurrency 
prerequisite for #9504
 2017-10-23 07:55:16 +02:00
bergquist
2de94d6548 convert old metrics to prom metrics 2017-09-14 14:26:32 +02:00
Torkel Ödegaard
4f9fbcc211 dataproxy: added caching of datasources when doing data proxy requests, #9078 2017-08-23 13:31:26 +02:00
Torkel Ödegaard
359421b5e8 refactor: sqlstore inTransaction consolidated to one version, fixes #8376 2017-05-23 10:56:23 +02:00
Torkel Ödegaard
4ce0bf4d16 mysql: improved mysql data source, added test feature when adding data source, fixed cache issue 2017-05-11 10:50:24 +02:00
huydx
143cbe921f (feat) support datasource delete by name api 2017-02-10 23:30:14 +09:00
Daniel Lee
c9b2c694f1 refactor(dataproxy): TLS Client Auth 
Use a SecureJsonData field for TLS
Client Auth instead of 3 new db
fields. Same model as used for
PluginSettings.

Saves and encrypts the pem file
content rather than just saving
the paths to the cert and key.
This allows for uploading from
the Edit Datasource page in
Grafana.
 2016-11-24 13:22:25 +01:00
Joe Lanford
56b7e2dfaf Added support for TLS client auth for datasource proxies (#5801) 2016-11-24 13:22:25 +01:00
Torkel Ödegaard
4a116ad4ad fix(build): fixed failing unit test 2016-10-01 17:36:56 +02:00
Torkel Ödegaard
a6918617ff feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes #6164 2016-10-01 16:41:27 +02:00
Rubycut
501f89e829 Increase datasource limit to 1000 #3910 2016-09-12 10:45:17 +02:00
Torkel Ödegaard
34e17f7282 feat(alerting): requests looks to be working again 2016-06-06 17:11:46 +02:00
Torkel Ödegaard
fcaf2bfdba fix(datasource): when addding data source withCredentials did not get set, fixes #4389 2016-03-16 15:16:28 +01:00
Mitsuhiro Tanda
6edd6c8f03 add with_credentials to datasource model 2015-12-09 14:44:28 +09:00
Torkel Ödegaard
5422d13607 Postgres fix update 2015-04-01 08:26:02 +02:00
Matt Robenolt
cedb11ebab Let xorm convert False into the right type 2015-03-30 18:11:39 -07:00
Torkel Ödegaard
9710771f16 Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510 2015-03-02 09:58:35 +01:00
Torkel Ödegaard
d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
Torkel Ödegaard
26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00
Jason Wilder
f443b7087c CLI: Add datasource:info command 
Describes the full datasource details given an account and
datasource name.
 2015-02-15 13:36:10 -07:00
Torkel Ödegaard
10820f31c2 Changed go package path 2015-02-05 10:37:13 +01:00
Torkel Ödegaard
fdfcc3ab2a Admin flagged users, create a default admin user on startup if missing 2015-01-15 14:44:15 +01:00