public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,898 Commits 655 Branches 650 Tags
7a96df875b7c272f7cf8cd366529ed056eb6a42e
Commit Graph

6373 Commits

Author SHA1 Message Date
Emil Tullstedt b68634fbb4 Tests: Batch of GoConvey to Testify conversions (#27008) 2020-08-14 14:43:25 +02:00
Sofia Papagiannaki 7ad1e3663c Playlists: Remove API validation for empty playlists and remove redundant API call (#26982) 
* Remove validation from empty playlists

* Remove redundant API call

Frontend used to call /api/playlists/:id/items directly after /api/playlists/:id but items are already included in the first response
 2020-08-14 11:59:50 +03:00
Kyle Brandt f9f60c9193 AzureMonitor: map more units (#26990) 
add BitsPerSecond and Seconds
 2020-08-13 12:57:16 -04:00
Arve Knudsen c63bbbaec3 InfluxDB: Close Flux query results (#26917) 
* InfluxDB: Drop ctxhttp usage
* InfluxDB: Clean up code
* InfluxDB: Close query results

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-13 17:50:53 +02:00
Joan López de la Franca Beltran ef631582ba Users: Improve conflict error handling (#26958) 
* API: Improve error handling (#26934)

* New ErrUserAlreadyExists error has been introduced

* Create user endpoint returns 412 Precondition Failed on ErrUserAlreadyExists errors

* Make ErrUserAlreadyExists error message clearer

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Use errors.Is instead of equality comparator on AdminCreateUser handler

* Improve sqlstore/user test definition

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Improve sqlstore/user tests for ErrUserAlreadyExists cases

* Remove no needed string fmt and err declaration on sqlstore/user tests

* Code improvements for sqlstore/user tests

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Use err.Error() instead of sentinel error value on AdminCreateUser

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add ErrUserAlreadyExists handling for signup & org invite use cases

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-13 14:38:54 +02:00
Emil Tullstedt d664853179 Tests: Change util GoConvey tests to use testify (#26724) 2020-08-13 11:10:48 +02:00
Arve Knudsen 9f159c5e3d grafana-cli: Fix file path processing, returning of errors (#26954) 
* grafana-cli: Fix file path processing, returning of errors
 2020-08-13 09:38:05 +02:00
Kyle Brandt f432e153ca Dataframe/Alerting: to tsdb.TimeSeriesSlice - accept "empty" time series (#26903) 
this is in order to trigger no data when used with alerting.
fixes #26897.

This is perhaps better solved in the SDK but that needs more thought and is tracked in grafana/grafana-plugin-sdk-go#214
 2020-08-12 12:30:45 -04:00
Arve Knudsen 1698c74ec1 Chore: Fix tests for Go 1.15 (#26957) 
* Chore: Fix tests for Go 1.15
 2020-08-12 17:45:03 +02:00
Adrián López 2093f7c1f0 grafana-cli: Fix installing of plugins missing directory entries in zip (#26945) 2020-08-12 17:08:12 +02:00
Benjamin Blattberg 3403db190d API: Support paging in the admin orgs list API (#26932) 
* Add page/limit to org search

* Update docs

* Fix test per PR feedback
 2020-08-12 10:59:07 +03:00
Arve Knudsen b1ddbaa395 CloudWatch: Fix sorting of metrics results (#26835) 
* CloudWatch: Fix sorting of metrics results
 2020-08-07 11:48:40 +02:00
Arve Knudsen 37c278c8f3 InfluxDB: Less chatty logging (#26850) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-07 09:18:57 +02:00
Kyle Brandt 62b103b843 Azuremonitor: do not set unit if literal "Unspecified" (#26839) 
part of #26828
 2020-08-06 16:03:25 -04:00
Arve Knudsen e6e5cc6e80 Chore: Simplify generic OAuth code (#26779) 
* Generic OAuth: Simplify

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

* Rename test variables for consistency

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-04 18:28:53 +02:00
Maksim Nabokikh b646a1d627 Provisioning: describe which folder caused an error while provisioning from files structure (#26771) 
* Provisioning: describe which folder caused an error while provisioning from files structure

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

* Apply suggestions from code review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Remove unused DashType constants

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-04 09:03:09 -07:00
Arve Knudsen e344ff01ec SQL: Fix missing org error messages (#26785) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-04 17:06:37 +02:00
Alexander Zobnin df11cdad62 Generic OAuth: customize login and id_token attributes (#26577) 
* OAuth: add login_attribute_path to generic oauth

* OAuth: remove default client_secret values (able to use empty client_secret)

* OAuth: allow to customize id_token attribute name

* Docs: describe how login_attribute_path and id_token_attribute_name params work

* Docs: review fixes

* Docs: review fixes

* Chore: fix go linter error

* Tests: fix test code style
 2020-08-03 17:33:27 +03:00
Sofia Papagiannaki 41f7bccb24 Cloud monitoring: do not create deep link if there are no timeseries (#26737) 2020-08-03 09:28:03 +03:00
Paul Sneddon a0c1e53fd0 Flux: Increase series limit for Flux queries (#26746) 2020-07-31 15:14:58 -07:00
Paul Sneddon ec756f3729 Flux: Ensure connections to InflxuDB are closed (#26735) 
* Flux: Ensure connections to InflxuDB are closed
 2020-07-31 23:11:51 +02:00
Arve Knudsen 7589b1b517 OAuth: Refactor user syncing (#26721) 
* OAuth: Refactor user syncing

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

* Don't ignore error

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 20:29:27 +02:00
Leonard Gram c266f45858 LDAP: users without org mappings are marked as disabled (#26650) 
* LDAP: users without org mappings are marked as disabled

* Update pkg/services/ldap/ldap.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* LDAP: verifies that unmapped users are tagged as isDisabled

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 14:41:31 +02:00
Arve Knudsen 35c67606ce Chore: Use errors.Is for comparing errors (#26719) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 10:16:49 +02:00
Arve Knudsen 16c185c3b9 Chore: Drop xerrors dependency (#26718) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 09:45:20 +02:00
Arve Knudsen 5a6afd9096 OAuth: Add some debug logs (#26716) 
* OAuth: Add some debug logs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 09:41:13 +02:00
Agnès Toulet 8dc75f79f7 API: Enrich endpoints with ID (#26691) 2020-07-31 08:22:09 +02:00
Maksim Nabokikh ba2524cd88 Provisioning: Add validation for missing organisations in datasource, dashboard, and notifier configurations (#26601) 
* Provisioning: Check that org. from config exists

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix some code after applying suggestions

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

* Add negative test case

Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-30 12:59:12 +03:00
Arve Knudsen e08972d567 login/social: Simplify test (#26679) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-29 19:52:26 +02:00
Agnès Toulet 7a5464fe10 Chore: use Wrap for all admin API (#26673) 
* Chore: use Wrap for all admin API

* API: fix admin tests
 2020-07-29 18:00:14 +02:00
waqark3389 642e904048 Show FileSystemId as a dimension key (#26662) 
FileSystemId can be used to filter by filesystem ID if needed. Right now it just returns blank
 2020-07-29 09:35:07 +03:00
Ryan McKinley 339138d61a Live: include a streaming event manager (#26537) 2020-07-27 00:26:16 -07:00
Torkel Ödegaard 3defb4441e Settings: Remove global variable (#26613) 2020-07-26 23:36:36 -07:00
Arve Knudsen 94d0934e90 CloudWatch: Fix a few API status codes (#26578) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-24 12:34:56 +02:00
Sofia Papagiannaki 5e73a92327 DashboardImport: Fix variable interpolation when property contains multiple variable expressions (#26574) 2020-07-24 11:12:44 +03:00
Arve Knudsen 2446ee08f1 CloudWatch: Fix passing of namespace for getting custom metrics (#26515) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-24 08:37:24 +02:00
Sofia Papagiannaki ad4f8b7091 Alerting: Change settings column type to mediumtext (#26549) 
* Alerting: Change settings column type to mediumtext

* Remove unnecessary newline
 2020-07-24 08:40:06 +03:00
Patrik Karlström 43ef052d57 cloudwatch: Consolidate client logic (#25555) 
* cloudwatch: Consolidate client logic

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 18:52:22 +02:00
Arve Knudsen 102448040d SQLite: Set 0640 permissions on SQLite database file (#26339) 
* SQLite: Set 640 permissions on SQLite database file
 2020-07-23 15:47:26 +02:00
Ruan Bekker b972963934 Cloudwatch: Add af-south-1 region (#26513) 
* Adds af-south-1 region to cloudwatch datasource

* Fix test

Co-authored-by: Sofia Papagiannaki <papagian@gmail.com>
 2020-07-23 14:02:25 +03:00
Agnès Toulet 1ba95183f6 HTTPServer: add possibility to use additional middlewares (#26514) 2020-07-23 09:54:07 +02:00
Arve Knudsen 415638cdda Chore: Use interfaces where possible (#26392) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 08:17:20 +02:00
Arve Knudsen 3a8854b1b9 API: Recognize dashboard errors when saving a folder (#26499) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 08:15:47 +02:00
Arve Knudsen 4c56eb3991 Chore: Enable goprintffuncname and nakedret linters (#26376) 
* Chore: Enable goprintffuncname linter
* Chore: Enable nakedret linter

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 08:14:39 +02:00
Josh Soref 7d08a8497a Chore: fix spelling of GitHub (#26182) 
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-07-22 08:12:50 -07:00
waqark3389 fabd879cbe CloudWatch: Add FreeStorageCapacity (#26503) 
* Add FreeStorageCapacity metric in AWS/FSx namespace
 2020-07-22 16:11:53 +02:00
Kyle Brandt fb5ff6a70f Azure: Insights metrics - do not sort if no data (#26486) 
fixes #26473
 2020-07-21 10:24:55 -04:00
gastonqiu f427f90a45 Chore: Aggregate save dashboard error (#26443) 
* Chore: Aggregate save dashboard error
* Use errors package for error detection

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-07-21 11:12:01 +02:00
Ryan McKinley 5d09e4539c Azure: convert azure units to grafana units (#26429) 2020-07-20 12:29:13 -07:00
Maksim Nabokikh a1f40195be Provisioning: Validate that datasource access field equals to direct or proxy (#26440) 
* Validate that datasource access field equals to allowed value (direct or proxy)
 2020-07-20 10:01:25 +02:00