root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 30 Packages Projects Releases Wiki Activity
22,499 Commits 1,401 Branches 636 Tags 2.5 GiB
Commit Graph

4874 Commits

Author SHA1 Message Date
Torkel Ödegaard 75f9adf44f
Build: adding dependency used by extensions (#16622) 2019-04-16 15:26:39 +02:00
Oleg Gaidarenko 318182ccc9 Chore: refactor auth proxy (#16504) 
* Chore: refactor auth proxy

Introduced the helper struct for auth_proxy middleware.
Added couple unit-tests, but it seems "integration" tests already cover
most of the code paths.

Although it might be good idea to test every bit of it, hm.
Haven't refactored the extraction of the header logic that much

Fixes #16147

* Fix: make linters happy
 2019-04-16 14:09:18 +02:00
Carl Bergquist 68f5ddf18c
replace dep with go modules (#16017) 
- guide shamelessly stolen from prometheus/prometheus
- updates local interface of oauth exchange
- updates local impl of hclogger
- bump jaeger client version

closes #16088
 2019-04-16 12:00:55 +02:00
Carl Bergquist 490515aec6
build: partially replace gometalinter with golangci-lint (#16610) 
we still use gometalinter for goconst since it doesn't 
report errors for duplicated in test files
 2019-04-16 10:27:07 +02:00
Mitsuhiro Tanda 864a6262fe CloudWatch: GetMetricData refactoring & fix label handling (#16383) 
* fix label handling

* SEARCH() results could have multiple namespace, remove from legend

* divide GetMetricStatistics related code

* divide GetMetricData related code

* divide parseGetMetricDataResponse()

* divide parseGetMetricDataQuery()

* divide test code

* add test for GetMetricData

* add test for GetMetricData parse response

* fix bug of terminating gap

* fix gofmt
 2019-04-15 17:55:07 +02:00
Oleg Gaidarenko b37ee65bd3
Chore: prepare our SQL for cockroach db (#16471) 
This is basically implementation of the https://github.com/grafana/grafana/issues/8900#issuecomment-435437167
points, except for the type conversion bit.

I tried to implement idea mentioned in cockroachdb ticket (see below).
And it is possible, but it complicates things as lot - not only we have to
have 4 SQL statements instead of one, but we would have to copy the column
structure as well - PK, FG, indexes and stuff, plus there will
be additional downtime with this approach.

So idea for this pull is to prepare our SQL as much as possible, so when
cockroachdb will add support for full type conversions, we could easilly add
support for it as well.

* Add `CASCADE` to `DROP INDEX` statement

* Make string conversions explicit

Thanks @Luit

Ref #8900
Ref cockroach/cockroach#9851
 2019-04-15 18:49:24 +03: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 9134251417
build: upgrades to golang 1.12.4 (#16545) 
fix govet issue in golang 1.12.4
 2019-04-15 09:18:28 +02:00
Hofls c17226af95 Pushover alert, support for different sound for OK (#16525) 
Closes #15889
 2019-04-12 14:57:17 +02:00
Ryan McKinley 3c21a121eb Plugins: Unifying alpha state & options for all plugins (#16530) 
* app pages

* app pages

* workign example

* started alpha support

* remove app stuff

* show warning on alpha/beta panels

* put app back on plugin file

* fix go

* add enum for PluginType and PluginIncludeType

* Refactoring and moving settings to plugins section

fixes #16529
 2019-04-12 13:46:42 +02:00
Carl Bergquist 30dcf0f6c5
Revert "Build: Upgrades to go 1.12.3 (#16491)" (#16544) 
This reverts commit 44b365028f.
 2019-04-12 11:17:31 +02:00
Carl Bergquist 44b365028f
Build: Upgrades to go 1.12.3 (#16491) 
fixes go vet issue that 1.12.3 detects
 2019-04-12 09:44:02 +02:00
Dan Cech b9cc476eb7 Update jwt regexp to include = (#16521) 
Fixes #16501
 2019-04-11 15:30:55 +02:00
Ryan McKinley d6887bf77f Plugins: Optionally preload some plugins during frontend app boot (#15266) 
* auto load

* update comments

* gofmt

* use preload from json

* fix formatting

* change general plugin loader to app

* Refactoring: Plugin preloading #15266
 2019-04-11 08:02:22 +02:00
Andrej Ocenas 2d7fc55df7
Provisioning: Do not allow deletion of provisioned dashboards (#16211) 
* Unprovision dashboard in case of DisableDeletion = true

* Rename command struct

* Handle removed provision files

* Allow html in confirm-modal

* Do not show confirm button without onConfirm

* Show dialog on deleting provisioned dashboard

* Changed DeleteDashboard to DeleteProvisionedDashboard

* Remove unreachable return

* Add provisioned checks to API

* Remove filter func

* Fix and add tests for deleting dashboards

* Change delete confirm text

* Added and used pkg/errors for error wrapping
 2019-04-10 13:29:10 +02:00
Oleg Gaidarenko 67cbc7d4cf
Chore: use remote cache instead of session storage (#16114) 
Replaces session storage in auth_proxy middleware with remote cache

Fixes #15161
 2019-04-08 14:31:46 +03:00
Marcus Efraimsson 5da1faf454
Alerting: Notification channel http api fixes (#16379) 
Fixes so it's possible to create new notification channel and providing uid.
Fixes better error/result handling when updating a notifcation channel.

Fixes #16372
Ref #16219 #16012
 2019-04-04 17:52:40 +02:00
Andrej Ocenas 08ce7f6c93
Chore: Add task to find FocusConvey tests (#16381) 2019-04-04 14:48:11 +02:00
The Rock Guy 335aa7c9f2 CloudWatch: Update AWS/IoT metric and dimensions (#16337) 
Closes #16334
 2019-04-04 12:54:20 +02:00
Marcus Efraimsson 79b86466fd Fix: Alerting Notification channel http api fixes (#16288) 
Fix so that uid can be changed when updating notification
channels through the http api.
Update documentation
 2019-03-29 09:42:38 +01:00
Zzy 1b84a924a3 Alerting: Makes timeouts and retries configurable (#16259) 
Adds new alert settings for configuring timeouts and retries named 
evaluation_timeout_seconds, notification_timeout_seconds 
and max_attempts.

Closes #16240
 2019-03-29 12:58:37 +07:00
Oleg Gaidarenko 1d955a8762
Chore: Implement gosec (#16261) 
See https://github.com/securego/gosec for more info.

Disabled a lot of rules. I guess we should go through them
and recheck if we really need to disable some

Fixes #16204
 2019-03-28 14:17:07 +01:00
Oleg Gaidarenko 04b3afcd15
Chore: Implement revive (#16200) 
Since we do not like some of the default golint rules,
this commit proposes to use https://github.com/mgechev/revive.

And potential revive speed-up should't hurt :).

Right now, presented config (./conf/revive.toml) is permissive,
we might improve it over time however. Fixes for found revive
issues in the code are very limited so it wouldn't be large to review.

Also in this commit:

* Add annotations for makefile commands and declare phony targets

* Rename "gometalinter" script and CI command to "lint"
  since we are doing there a bit more then using gometalinter package

* Add Makefile rules to .editorconfig

* Documentation which mentioned "golint" replaced with revive

Fixes #16109
Ref #16160
 2019-03-27 17:53:49 +01:00
Floyd May 33d1d427bc InfluxDB: Fix tag names with periods in alerting (#16255) 
Updates regex to match tag names with periods when generating
series names in alerting evaluation (backend).

Fixes #9148
 2019-03-27 23:13:12 +07:00
Navaneesh Kumar 5ea823a65a Fix: Alert email variable name typo fixed (#16232) 2019-03-27 09:42:20 +01:00
Marcus Efraimsson 2ae63e70c0
Alerting: Notification channel http api enhancements (#16219) 
Now returns uid in response to get notification channel by id.
Adds GET/PUT/DELETE support for notification channel by uid, 
  /api/alert-notifications/uid/:uid.
Break apart alerting and alert notification http api docs in two 
  pages and update documentation to make it up to date
  with current implementation.

Fixes #16012
 2019-03-26 18:37:02 +07:00
Marcus Efraimsson 6b8e3122f8
chore(influx): no point of reading response when bad status (#16212) 
There's no point in reading the body response without using
the result so removing it.

Fixes #9199
Ref #16207
 2019-03-26 12:10:24 +07:00
Daniel Lee fda7e686f3
Merge pull request #15205 from seanlaff/12556-oauth-pass-thru 
Add oauth pass-thru option for datasources
 2019-03-25 21:52:20 +01:00
Ramon Carvalho Maciel d791a6211d fix(InfluxDB): Reads body and close request body even for error status codes (#16207) 2019-03-25 17:42:26 +01:00
Torkel Ödegaard 7c81f4dfd8
fix(Alerting): Fixed alert rules with eval in day units, fixes #16174 (#16182) 2019-03-25 16:27:58 +01:00
Daniel Lee c7d108264d
Merge pull request #16137 from mtanda/cloudwatch_update_metrics_list 
update cloudwatch metrics/dimensions list
 2019-03-25 14:42:15 +01:00
Torkel Ödegaard 46a75099d8
Merge pull request #16116 from SGI495/master 
Don't include non-existing image in MS Teams alert
 2019-03-22 09:34:56 +01:00
Mitsuhiro Tanda 4d8eb76dca update cloudwatch metrics/dimensions list 2019-03-22 00:08:17 +09:00
Sean Lafferty 50c5854430 Use grafana's logger implementation 2019-03-21 08:13:03 -04:00
Mitsuhiro Tanda 56251ca546 Update CloudWatch metrics/dimension list (#16102) 
update cloudWatch metrics/dimension list
 2019-03-21 11:13:06 +01:00
Sean Lafferty b3461c9806 Remove sleeps in test code by overriding time.Now() 2019-03-20 15:34:31 -04:00
Sean Lafferty 3b9b6c571a Abstract encrypt/encode and decode/decrypt into their own functions 2019-03-20 15:18:22 -04:00
Sean Lafferty b696492891 Rename dispatched commands to make them easy to grok 2019-03-20 14:32:41 -04:00
Sean Lafferty be6e76ee35 Use structured logging instead of printf 2019-03-20 14:25:26 -04:00
Magnus Berglund e6623de6b2 Rewrote creation of images tag 2019-03-20 18:59:13 +01:00
Magnus Berglund 0511095303 Added missing commas 2019-03-20 18:42:48 +01:00
Magnus Berglund 0de77598d7 Don't include non-existing image in MS Teams alert 
If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.

Closes #16082
 2019-03-20 18:23:36 +01:00
Oleg Gaidarenko 30f0c35006
Merge pull request #16104 from markelog/remotecache-small-fix 
Correct table names of sql storage for remotecache
 2019-03-20 14:08:02 +01:00
Oleg Gaidarenko c5bc723a6e Correct table names of sql storage for remotecache 2019-03-20 13:24:56 +01:00
Torkel Ödegaard d11695b8b5 Fixed gofmt issue in PR #16093 2019-03-20 10:58:20 +01:00
Sai Ram Gupta 6929593eb6
Update org_user.go 
Add check for, if current role is ROLE_VIEWER, return true if the role I'm checking for is ROLE_VIEWER. Fixes #16092
 2019-03-19 11:31:55 -07:00
Leonard Gram 978c20a604 teams: explains the external property of a team membership. 2019-03-19 14:01:22 +01:00
Hugo Häggmark 53c74fa2f5 teams: refactor so that you can only delete teams if you are team admin 2019-03-19 14:01:21 +01:00
Leonard Gram a615b78f8a permissions: removes global access to bus from MakeUserAdmin. 2019-03-19 14:01:20 +01:00
Leonard Gram adf0390b2c teams: local access to bus, moving away from dep on global. 2019-03-19 14:01:20 +01:00
Leonard Gram 6589a4e55f teams: better names for api permissions. 2019-03-19 14:01:20 +01:00
Leonard Gram 9f33f00343 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram 9f8e43916d permissions: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram b796027bc6 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram d1481cac50 teams: refactored db code. 2019-03-19 14:01:18 +01:00
Hugo Häggmark 6a63725df0 teams: comment explaining input validation 
Co-Authored-By: xlson <leo@xlson.com>
 2019-03-19 14:01:17 +01:00
Leonard Gram 3f57a81c47 teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram ccfd6789ca teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram fc0461134f dashboards: simplified code. 2019-03-19 14:01:15 +01:00
Hugo Häggmark b60e71c28b teams: moved logic for searchteams to backend 2019-03-19 14:01:15 +01:00
Hugo Häggmark 782b5b6a3a teams: viewers and editors can view teams 2019-03-19 14:01:14 +01:00
Leonard Gram c420af16b1 teams: editor/viewer team admin cant remove the last admin. 2019-03-19 14:01:14 +01:00
Hugo Häggmark 246e128048 teams: changed permission to permission type instead of int 2019-03-19 14:01:14 +01:00
Hugo Häggmark c826f39a8b teams: defaulting invalid permission level to member permission level 2019-03-19 14:01:13 +01:00
Leonard Gram c823ad5de7 team: uses PermissionType instead of int64 for permissions. 2019-03-19 14:01:13 +01:00
Leonard Gram 21d3d27452 teams: editors can't remove the last admin from a team. 2019-03-19 14:01:13 +01:00
Leonard Gram b783fa7039 team: renames teams.CanUpdate teamguardian.CanAdmin 2019-03-19 14:01:12 +01:00
Hugo Häggmark a90b3e331e config: updated feature toggle name 2019-03-19 13:59:39 +01:00
Leonard Gram a6a3d698da teams: cleanup. 2019-03-19 13:57:30 +01:00
Leonard Gram 0b209de5d1 dashboard: only admin permission added to dashboard in folder. 2019-03-19 13:57:30 +01:00
Leonard Gram d593ffe3c1 dashboards: better error handling 2019-03-19 13:57:30 +01:00
Leonard Gram 89d4db8eb6 teams: team listing shows only your teams (editors). 2019-03-19 13:57:29 +01:00
Leonard Gram 1f949e58e1 teams: teams guard on all teams update methods. 2019-03-19 13:57:29 +01:00
Leonard Gram 23231e6d51 teams: added delete team guard 2019-03-19 13:57:29 +01:00
Leonard Gram 8e7a8282c1 teams: removed feature toggle as it is already in middleware 2019-03-19 13:57:28 +01:00
Leonard Gram d668550aa2 teams: added feature toggle and refactor tests 2019-03-19 13:57:28 +01:00
Leonard Gram 0d61f89577 teams: cleanup. 2019-03-19 13:57:28 +01:00
Leonard Gram 3be1d71f1f teams: test refactorings. 2019-03-19 13:57:27 +01:00
Leonard Gram 319879cfa8 teams: bugfix, user pointer. 2019-03-19 13:57:27 +01:00
Leonard Gram 90e9fda90c teams: start of team update guardian for editors 2019-03-19 13:57:26 +01:00
Hugo Häggmark 5adde259d3 teams: team update test 2019-03-19 13:57:26 +01:00
Hugo Häggmark 3c46b786d2 teams: change back to permissionlevel for Member to 0 2019-03-19 13:57:26 +01:00
Hugo Häggmark 3c74ac3044 teams: update only the selected user 2019-03-19 13:57:25 +01:00
Hugo Häggmark 074ebf0f48 teams: only write error message if error 2019-03-19 13:57:25 +01:00
Leonard Gram aedc478208 teams: test for update team member. 2019-03-19 13:57:24 +01:00
Leonard Gram 2a88052c14 teams: can update team members permission. 2019-03-19 13:57:23 +01:00
Hugo Häggmark 7888457aae teams: basic ui for permission in team members view 2019-03-19 13:57:23 +01:00
Leonard Gram af4994ba16 teams: editor added as admin for created teams. 2019-03-19 13:57:22 +01:00
Leonard Gram 22e098b830 teams: editors can work with teams. 2019-03-19 13:57:22 +01:00
Hugo Häggmark efbd93f824 teams: show teams and plugins for editors that can own 2019-03-19 13:57:22 +01:00
Hugo Häggmark 124fb743e8 teams: make test cases pass again 2019-03-19 13:57:21 +01:00
Leonard Gram da3dcd1918 folder: uses service to make user admin of created folder. 2019-03-19 13:57:21 +01:00
Leonard Gram c8c004095c permissions: broken out func for making creator admin. 2019-03-19 13:57:21 +01:00
Leonard Gram e174f7c20b folders: admin for created folders 2019-03-19 13:57:20 +01:00
Leonard Gram e294252e92 dashboards: user automatically becomes admin for created dashboards 2019-03-19 13:57:20 +01:00
ryan bd811b4a95 dont test exists in the test... it will fail if not found 2019-03-15 12:36:55 -07:00
ryan 24ead3a4a4 add random_walk_table scenario 2019-03-15 12:33:45 -07:00
ryan 2b5ac6bafa add test file 2019-03-15 11:07:20 -07:00
ryan e787176bca add startAt to random walk scenario 2019-03-15 11:02:41 -07:00
Andrej Ocenas 09b9b595b2 Add check for Env before log 2019-03-15 11:53:30 +01:00
Sean Lafferty 3f9a19dcd5 Merge branch 'master' into 12556-oauth-pass-thru 2019-03-14 13:18:00 -04:00
Andrej Ocenas 8221c4273f
Merge pull request #15998 from grafana/add-grafana-user-proxy-header 
Add custom header with grafana user when using proxy
 2019-03-14 17:29:06 +01:00
Carl Bergquist 23852b59c9
Merge pull request #15839 from grafana/15836_revoke_auth_tokens 
Support list and revoke of user auth tokens in HTTP API
 2019-03-14 17:12:49 +01:00
Andrej Ocenas 697a87b7b2 Add check so that header is not sent for anonymous users 2019-03-14 16:33:21 +01:00
Andrej Ocenas bbdc1c0e64 Add custom header with grafana user and a config switch for it 2019-03-14 16:33:19 +01:00
Carl Bergquist 291ffcb75b
Merge pull request #15457 from bergquist/distributed_cache 
Distributed cache
 2019-03-14 16:16:39 +01:00
bergquist 6d42d43b22 use constants for cache type 2019-03-14 15:48:20 +01:00
Sean Lafferty f3c52710df Make recently used auth_module test more robust by adding another 'log in' 2019-03-14 08:40:19 -04:00
bergquist 0a86a1d7b6 updates old distcache names 2019-03-14 09:23:35 +01:00
bergquist c001cfe1d9 dont allow inifinite expiration 2019-03-14 09:22:03 +01:00
bergquist 5186273731 return error if cache type is invalid 2019-03-14 08:57:38 +01:00
zhulongcheng 755f60358b Add more info to victorOps alert notifications 2019-03-14 15:47:11 +08:00
Sean Lafferty fcc18d8121 Change import path for social in the tests 2019-03-13 14:55:22 -04:00
Sean Lafferty 8d8119aa98 Change import path for social since it has moved 2019-03-13 14:34:55 -04:00
Sean Lafferty 8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
Sean Lafferty de338338bf Remove todo about index on user_id in user_auth because it exists 2019-03-13 13:46:49 -04:00
Sean Lafferty 7e62394d01 Add function in ds_proxy to handle oauthPassThru headers 2019-03-13 13:45:32 -04:00
Sean Lafferty 4324a7f51a Remove auth module from ds_proxy oauth test 2019-03-13 13:28:49 -04:00
Sean Lafferty 3b15e110a5 Get most recent oauth token from db, rather than lookup by auth_module 2019-03-13 13:22:22 -04:00
Sean Lafferty f17307bb97 Always return most recently used auth_module from GetAuthInfo 2019-03-13 11:29:13 -04:00
Torkel Ödegaard 9e7d1f4275
Merge pull request #15466 from grafana/bar-gauge-poc 
New Bar Gauge panel
 2019-03-13 11:12:33 +01:00
bergquist f13263eb54 reduce loglevel to debug 2019-03-13 09:01:45 +01:00
Torkel Ödegaard 71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
Sean Lafferty d922285ab8 Move oauth token migrations in user_auth_mig 2019-03-11 09:31:03 -04:00
Torkel Ödegaard 647cb6ddae Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master 2019-03-11 13:10:45 +01:00
bergquist 7aeab0a235 use `Get` instead of `Find` 2019-03-11 11:04:56 +01:00
Torkel Ödegaard 90a3bc2203
Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix 
Fix: #14706 Incorrect index pattern padding in alerting queries
 2019-03-11 11:01:22 +01:00
Torkel Ödegaard 5fab1e89d3
Merge pull request #15897 from grafana/revert-15608-fix-datasource-update 
Revert "Fix Datasource Update to no User/Password"
 2019-03-11 10:58:28 +01:00
bergquist b2967fbb37 avoid exposing cache client directly 2019-03-11 10:49:56 +01:00
bergquist 7e7427637c renames distcache -> remotecache 2019-03-11 10:49:55 +01:00
bergquist 66e71b66dd renames key to cache_key 
apparently key is a reserved keyword in mysql.
and the error messages doesnt mention that.
can I please have 6h back?
 2019-03-11 10:49:55 +01:00
bergquist daa3b17951 code layouts and comments 2019-03-11 10:49:42 +01:00
Torkel Ödegaard 3f574d3e57
Merge pull request #15685 from utkarshcmu/fix-#15562 
Fixed alias in Cloudwatch Expressions
 2019-03-11 10:49:30 +01:00
bergquist 9a78c23165 rename put -> set 2019-03-11 10:49:10 +01:00
bergquist 98f5432659 `memcache` -> `memcached` 
https://github.com/memcached/memcached
 2019-03-11 10:49:09 +01:00
bergquist 995647be2c removes memory as distcache option 
if database caching is to expensive if should
not use distcache in the first place.
 2019-03-11 10:49:09 +01:00
bergquist b933b4efc8 test redis and memcached during integration tests 2019-03-11 10:49:09 +01:00
bergquist 196cdf9710 adds config to default settings 2019-03-11 10:49:09 +01:00
bergquist f9f2d9fcf3 avoid exporting test helpers 2019-03-11 10:49:09 +01:00
bergquist 33935b09f0 uses set instead of add for memcache 
set always sets the value regardless.
 2019-03-11 10:49:09 +01:00
bergquist 8db2864fee adds memory as dist storage alt 2019-03-11 10:49:09 +01:00
bergquist a60bb83a70 extract tests into seperate files 2019-03-11 10:49:09 +01:00
bergquist c8ff698d90 avoid exposing internal structs and functions 2019-03-11 10:49:04 +01:00
Carl Bergquist f3753712e0
Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
genofire 6d578dd372
fix imageurl in notification test 
skip unnecessary http -> https redirect, which could make problems on some notifiers
 2019-03-11 00:23:07 +01:00
Torkel Ödegaard 570187384b
Merge pull request #13825 from athurg/optimize_dingding_alert_message 
Optimize dingding alert message
 2019-03-08 15:33:24 +01:00
Marcus Efraimsson 0cd5a6772d
feat(api): support list/revoke auth token in admin/current user api 2019-03-08 15:15:38 +01:00
Marcus Efraimsson 8029e48588
support get user tokens/revoke all user tokens in UserTokenService 2019-03-08 15:15:17 +01:00
Marcus Efraimsson 4f48ed3350
Merge pull request #15872 from grafana/15643_fix2 
fix allow anonymous server bind for ldap search
 2019-03-08 14:25:58 +01:00
Marcus Efraimsson e3b3062107
add nil/length check when delete old login attempts 2019-03-08 13:31:46 +01:00
Marcus Efraimsson c242d38301
fix allow anonymous server bind for ldap search 2019-03-08 13:16:35 +01:00
bergquist 11d671c637 add support for memcached 2019-03-08 09:09:28 +01:00
bergquist 5ced863f75 add support for redis storage 2019-03-08 09:09:27 +01:00
bergquist d99af23946 add garbage collector for database cache 2019-03-08 09:09:27 +01:00
bergquist 996d5059b1 test at interface level instead impl 2019-03-08 09:09:27 +01:00
bergquist d4f5789660 cache: initial version of db cache 2019-03-08 09:09:27 +01:00
Woodward, Joshua 946e542412 Make password hint configurable from settings/defaults.ini 2019-03-07 14:00:04 -08:00
Torkel Ödegaard 64a7d8cefe
Merge pull request #15833 from grafana/15694_fix 
fix discord notifier so it doesn't crash when there are no image generated
 2019-03-06 17:32:34 +01:00
Marcus Efraimsson f21c976b27
fix discord notifier so it doesn't crash when there are no image generated 2019-03-06 17:03:14 +01:00
Torkel Ödegaard 71311b1e79
Merge pull request #15827 from grafana/12926_fix 
Fix restore to current folder when restoring old dashboard version
 2019-03-06 15:38:06 +01:00
Torkel Ödegaard 8ba4eb47e7
Merge pull request #15769 from grafana/15768_xorm_upgrade 
upgrade xorm packages to latest versions
 2019-03-06 15:11:06 +01:00
Marcus Efraimsson cf500f3157
restore to current folder when restoring old dashboard version 2019-03-06 14:38:40 +01:00
Marcus Efraimsson 36f3accf0d
log phantomjs output even if it timeout and include orgId when render alert 2019-03-06 13:53:23 +01:00
Marcus Efraimsson f845a3b841
upgrade xorm packages to latest versions 2019-03-05 21:11:23 +01:00
Marcus Efraimsson 3b9f0e6ef2
fix allow anonymous initial bind for ldap search 2019-03-05 18:03:07 +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
Hugo Häggmark d3642a3e91
Moved Server Admin and children to separate menu item on Side Menu (#15592) 
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
 2019-03-05 13:02:41 +01:00
Johannes Schill a81d5486b0 Viewers with viewers_can_edit should be able to access /explore (#15787) 
* fix: Viewers with viewers_can_edit should be able to access /explore #15773

* refactoring initial PR a bit to simplify function and reduce duplication
 2019-03-05 12:41:01 +01:00
Torkel Ödegaard b787811da8
Merge pull request #15761 from grafana/15708_access 
fix: limit access to org admin and alerting pages
 2019-03-05 09:17:20 +01:00
Marcus Efraimsson 5638c67be8
org admins should only be able to access org admin pages 2019-03-04 15:51:18 +01:00
Marcus Efraimsson a29b99b96b
only editor/admin should have access to alert list/notifications pages 2019-03-04 15:48:07 +01:00
Bryan T. Richardson ae23773db3 Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics. 2019-03-04 07:38:36 -07:00
Torkel Ödegaard b4df0e73cd
Merge pull request #15706 from grafana/15656-playlists-with-tags-rebased 
wip: Fix playlists "by tags"
 2019-03-04 09:00:28 +00:00
sandeep e04218e550 Fix: #14706 Incorrect index pattern padding in alerting queries 
When weekly index pattern is used, indices names contain single digit week number for week 1-9
This fix makes sure indice names always contain 2 digit week number for weekly pattern
 2019-03-03 18:10:38 +05:30
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
Samuel 41024c29bb Return 404 on user not found (#15606) 
Return 404 on user not found

closes #10506
 2019-03-02 20:34:48 +01:00
Johannes Schill 8d5ccc7831 fix: Return url when query dashboards by tag 2019-02-28 10:44:39 +01:00
utkarshcmu 37033080b7 Removed commented code 2019-02-27 00:33:40 -08:00
utkarshcmu 8ef3aebc29 Fixed alias in Cloudwatch Expressions 2019-02-27 00:20:29 -08:00
Leonard Gram 36788183d8 service: fix for disabled internal metrics. 
Update of the internal metrics for Grafana was
disabled by mistake when refactoring the code.

Fixes #15651
 2019-02-26 11:41:55 +01:00
Carl Bergquist 369aa2d5dd
Merge pull request #15628 from bergquist/move_tracing_infra 
moves tracing packge into /infra
 2019-02-25 16:16:45 +01:00
bergquist 60fef31748 moves social package to /login 
ref #14679
 2019-02-25 15:30:40 +01:00
bergquist 0c67194b45 moves tracing packge into /infra 2019-02-25 15:29:25 +01:00
Carl Bergquist 0aa61c8e12
Merge pull request #15629 from bergquist/moves_metrics_to_infra 
moves metric package to /infra
 2019-02-25 02:44:09 +01:00
bergquist 8a3a3cccc3 moves metric package to /infra 
ref #14679
 2019-02-24 21:12:51 +01:00
Daniel Lee d1e249a803 stackdriver: fix for float64 bounds for distribution metrics 
Adds support for explicit distribution metrics and float64 bounds

Fixes #14509
 2019-02-24 17:37:26 +01:00
Hugo Häggmark 769ad21e16 Moved variable to config struct after PR comments 2019-02-22 14:39:22 +01:00
Hugo Häggmark 9c9691f7af Added feature toggle editors_can_own 2019-02-22 14:39:22 +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
Hugo Häggmark dafcfd70a7 Fixed bug with getting teams for user 2019-02-22 14:07:18 +01:00
Peter Holmberg 5f56a07a23 Merge branch 'master' into bar-gauge-poc 2019-02-19 15:43:08 +01:00
bergquist 7754c37a1f reduce loglevel to debug 2019-02-19 08:22:33 +01:00
Torkel Ödegaard 9d78960c5e
Merge pull request #15503 from grafana/explore-icon 
Updated explore icon and style tweaks
 2019-02-18 18:37:51 +01:00
Torkel Ödegaard df170aee16 Updated explore icon and style tweaks 
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
 2019-02-18 18:26:24 +01:00
Daniel Lee 56c965e5df cli: chmod 755 for backend plugin binaries 
Fixes #15500. Does a simple filename check if the binary names ends
with _linux_amd64 or _darwin_amd64 then sets the file mode to 755.
 2019-02-18 15:05:34 +01:00
Torkel Ödegaard 3dae915b23 Bar gauge icon updated 2019-02-16 15:47:35 +01:00
Torkel Ödegaard 1adc1a6097
Merge pull request #15455 from grafana/fixed-handling-of-alert-urls 
Fixed handling of alert urls with true flags
 2019-02-15 16:27:23 +01:00
Torkel Ödegaard 4c28ec83b3
Merge pull request #15444 from max-neverov/percent_diff_null 
Fix percent_diff calculation when points are nulls
 2019-02-15 13:03:19 +01:00
Torkel Ödegaard 7699706e65 fixed handling of alert urls with true flags, fixes #15454 2019-02-15 11:23:31 +01:00
Maxim Neverov 28eaac3a9c Extracted common code for diff calculation 2019-02-14 21:52:59 +01:00
Torkel Ödegaard 0256a4dd47
Merge pull request #15417 from kiran3394/master 
added support for influxdb non_negative_difference function in tsdb
 2019-02-14 18:49:32 +01:00
Torkel Ödegaard cd8f5835ec
Merge pull request #15395 from briangann/20190212_adjust_notifier_render_timeout 
allow 90 percent of alertTimeout for rendering to complete vs 50 percent
 2019-02-14 17:21:40 +01:00
Maxim Neverov 3c2f6094b2 Fix percent_diff calculation when points are nulls 2019-02-14 16:31:15 +01:00
Brian Gann c98b00c302 allow 90 percent of alertTimeout for rendering to complete vs 50 percent 2019-02-13 09:56:37 -06:00
z0029c4 13974cdd28 added support for influxdb non_negative_difference function in tsdb 2019-02-13 18:12:35 +05:30
z0029c4 8cb1e5b918 added support for influxdb non_negative_difference function in tsdb for alerting 2019-02-13 17:55:31 +05:30
Torkel Ödegaard 3b0ae4bd0a
Merge pull request #15368 from grafana/15217-panels-without-queries 
POC: Panels without queries can skip DataPanel
 2019-02-13 08:06:25 +01:00
Torkel Ödegaard a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Carl Bergquist dcec61e1b4
Merge pull request #15378 from grafana/auth_token_quotas 
use authTokenService for session quotas restrictions
 2019-02-12 15:38:57 +01:00
bergquist e163aadfe4 use authtoken for session quota restrictions 
closes #15360
 2019-02-12 15:10:55 +01:00
bergquist 1310d356fc removes unused session code 2019-02-12 12:33:54 +01:00
Johannes Schill 075fb8e91c chore: Rename isDataPanel to noQueries 2019-02-12 12:28:53 +01:00
Johannes Schill c4b2dcefbe feat: Introduce IsDataPanel attribute to plugin.json 2019-02-12 12:28:53 +01:00
Daniel Lee 18615a3357
Merge pull request #15363 from bergquist/edition_to_build_info 
adds edition to build_info metric
 2019-02-11 16:46:53 +01:00
bergquist e4e42fcd08 adds edition to build_info metric 2019-02-11 15:42:12 +01:00
Daniel Lee 1c364b57b5
Merge pull request #15353 from grafana/14623-azure-monitor-alerting 
Adds alerting for the Azure Monitor API in the Azure Monitor datasource
 2019-02-11 15:16:32 +01:00
Daniel Lee ac345312a4 azuremonitor: don't use make for maps and array 2019-02-11 14:42:12 +01:00
Marcus Efraimsson c13e302cde
Merge pull request #15356 from grafana/15258_fix 
revert ds_proxy timeout and implement dataproxy timeout correctly
 2019-02-11 14:05:51 +01:00
Marcus Efraimsson a1cd550df4
revert ds_proxy timeout and implement dataproxy timeout correctly 2019-02-11 13:42:05 +01:00
Carl Bergquist 1f7a1f807e
Merge pull request #15299 from grafana/15295_fux 
Make sure alert notifier provisioning directory are created for deb and rpm packages
 2019-02-11 13:31:51 +01:00
Daniel Lee 0b74860f55 azuremonitor: fix auto interval calculation on backend 
Not needed for alerting (as the query intervalms will always be 0) but needed
later when being called from the frontend)
 2019-02-11 13:27:08 +01:00
Daniel Lee a54484638d interval: make the FormatDuration function public 
A useful function that was ported from kbn.ts and can be used
to convert milliseconds into a kbn unit
 2019-02-11 11:25:51 +01:00
bergquist 3ce99bca66 renames usage state name for auth token 
as noted, sessions might not be a good name for this metrics.
while devices would be a better name for users I think we should
align the name with the code as much as possible. The ui listing
all auth_tokens per user should probarbly say "devices" instead
 2019-02-11 11:08:31 +01:00
Carl Bergquist 396a5a947f
Merge pull request #15300 from bergquist/token_usage_stats 
adds usage stats for sessions
 2019-02-11 10:31:57 +01:00
Marcus Efraimsson 75f89ecf1f
Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource 
MySQL SSL CA in datasource connector
 2019-02-11 09:00:18 +01:00
Daniel Lee d6904ba9b4 azuremonitor: small refactoring 2019-02-11 01:22:15 +01:00
Daniel Lee 60327953a2 azuremonitor: handles timegrain set to auto on backend 2019-02-11 01:17:37 +01:00
Daniel Lee 452c4f5b9b azuremonitor: add test for dimension filter 2019-02-10 01:47:38 +01:00
Daniel Lee b94de101cd azuremonitor: refactor azure monitor api code into own file 2019-02-10 01:18:16 +01:00
Daniel Lee b816f35c41 azuremonitor: handle multi-dimensions on backend 2019-02-10 00:23:12 +01:00
Daniel Lee a5e5db20e1 azuremonitor: add support for aggregations on backend 2019-02-09 21:52:44 +01:00
Connor Patterson d2aed7e075 Fix formatting 2019-02-09 14:13:15 -05:00
Connor Patterson 2987a47a9b Add aws ec2 api metrics for cloudwatch 2019-02-09 13:47:08 -05:00
Daniel Lee 10194df112 azuremonitor: simple alerting for Azure Monitor API 
Lots of edge cases and functionality left to implement but
a simple query works for alerting now.
 2019-02-08 18:15:17 +01:00
Marcus Efraimsson 1bc2a0af70
use unique datasource id when registering mysql tls config 2019-02-08 18:08:07 +01:00
Daniel Lee 0e228d582d azuremonitor: builds a query and sends it to Azure on the backend 
Lots of edge cases not covered and the response is not parsed. It only
handles one service and will have to be refactored to handle multiple
 2019-02-08 17:20:31 +01:00
Leonard Gram b32d420a75 ldap: refactoring. 2019-02-08 08:18:24 +01:00
Daniel Lee 21a1507c77 ldap: fixes #14432. Fix for IPA v4.6.4 
IPA v4.6.4 introduced a fix that does not allow empty attributes
to be sent in a search request. This fix only adds attributes to
the request if they are mapped in the ldap toml file.
 2019-02-08 08:18:24 +01:00
bergquist 2be60887ca adds usage stats for sessions 2019-02-07 16:27:40 +01:00
Marcus Efraimsson b4267eafb8
log root cause error when reading from provisioning directories 2019-02-07 15:46:57 +01:00
bergquist 6e7941d396 moves usage stats sender to new package 2019-02-07 14:59:50 +01:00
Marcus Efraimsson c71904e326
Merge pull request #15239 from grafana/auth_token_middleware_refactor 
Auth token package and middleware refactoring
 2019-02-07 14:24:23 +01:00
Torkel Ödegaard 78ea7ae783
Merge pull request #15212 from grafana/dashboard-react-page 
Dashboard react page
 2019-02-07 14:23:44 +01:00
bergquist 170783c292 make hourly cleanup the default behavior 2019-02-07 10:51:35 +01:00
Marcus Efraimsson 1a140ee199
run token cleanup job when grafana starts, then each hour 2019-02-06 22:27:08 +01:00
Marcus Efraimsson 836501186f
fix 2019-02-06 17:30:17 +01:00
Marcus Efraimsson 8ae066ab5d
move authtoken package into auth package 2019-02-06 17:02:57 +01:00
Marcus Efraimsson 8678620730
move UserToken and UserTokenService to models package 2019-02-06 16:55:12 +01:00
Marcus Efraimsson a60124a88c
change UserToken from interface to struct 2019-02-06 16:30:50 +01:00