IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
20,970 Commits 5,450 Branches 554 Tags 1.9 GiB
f3c52710df
Commit Graph

4541 Commits

Author SHA1 Message Date
Sean Lafferty
f3c52710df Make recently used auth_module test more robust by adding another 'log in' 2019-03-14 08:40:19 -04: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
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
Torkel Ödegaard
3f574d3e57
Merge pull request #15685 from utkarshcmu/fix-#15562 
Fixed alias in Cloudwatch Expressions
 2019-03-11 10:49:30 +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
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
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