IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
20,165 Commits 5,416 Branches 554 Tags
931bece16ec4b04b0014f14e2803f5f0e6a5d799
Commit Graph

4435 Commits

Author SHA1 Message Date
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
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
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
Marcus Efraimsson
1bc2a0af70 use unique datasource id when registering mysql tls config 2019-02-08 18:08:07 +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
Marcus Efraimsson
afa87e6ab4 Merge pull request #15197 from SamuelToh/12546_annotation_nulls_existing_val 
Add http patch support for annotations
 2019-02-06 14:50:00 +01:00
Marcus Efraimsson
44275d9660 middleware fix 2019-02-06 08:45:01 +01:00
Marcus Efraimsson
d8658a765c enhanced expiration logic for lookup token 
tokens are not expired if created_at > now - LoginMaxLifetimeDays and
rotated_at > now - LoginMaxInactiveLifetimeDays
 2019-02-06 08:30:14 +01:00
Marcus Efraimsson
e87ff5a06d Merge pull request #15265 from larsjoergensen/cloudwatch/add-rds-aurora-serverlessdatabasecapacity-metrics 
Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics.
 2019-02-05 21:56:11 +01:00
SamuelToh
4de9e3598b Address review comments 2019-02-06 06:41:39 +10:00
Marcus Efraimsson
9483506590 auth token clean up job now runs on schedule and deletes all expired tokens 
delete tokens having created_at <= LoginMaxLifetimeDays or
rotated_at <= LoginMaxInactiveLifetimeDays
 2019-02-05 21:20:11 +01:00
Marcus Efraimsson
871c84d195 changes needed for api/middleware due to configuration settings 2019-02-05 21:14:23 +01:00
Marcus Efraimsson
0915f931ae change configuration settings in auth package 2019-02-05 21:12:30 +01:00
Marcus Efraimsson
3c2fd02bc0 refactor login/auth token configuration settings 
remove login section and reuse existing sections security and auth
 2019-02-05 21:09:55 +01:00
Marcus Efraimsson
1d1b617cee remove unused code 2019-02-05 21:08:55 +01:00
Lars Jørgensen
749320002b Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics. 2019-02-05 20:57:51 +01:00
jeroenvollenbrock
28aafcd789 cloudwatch: Add tests for resource_arn template query 2019-02-05 18:37:05 +01:00
jeroenvollenbrock
fa977ce090 cloudwatch: Add resource_arns template query function 
Implements feature request #8207
 2019-02-05 18:37:04 +01:00
Torkel Ödegaard
3d5ca99d53 Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:24:14 +01:00
SamuelToh
a7a964ec19 Added PATCH verb end point for annotation op 
Added new PATCH verb annotation endpoint

Removed unwanted fmt

Added test cases for PATCH verb annotation endpoint

Fixed formatting issue

Check arr len before proceeding

Updated doc to include PATCH verb annotation endpt
 2019-02-05 09:43:17 +10:00
Marcus Efraimsson
d53e64a32c move auth token middleware/hooks to middleware package 
fix/adds auth token middleware tests
 2019-02-05 00:21:05 +01:00
Marcus Efraimsson
7cd3cd6cd4 auth package refactoring 
moving middleware/hooks away from package
exposing public struct UserToken accessible from other packages
fix debug log lines so the same order and naming are used
 2019-02-05 00:10:56 +01:00
Torkel Ödegaard
70974c01f2 Added playlist controls to new react DashNav 2019-02-04 21:08:30 +01:00
Marcus Efraimsson
fb3c510178 Merge branch 'master' into delete_session_on_logout 2019-02-04 20:23:05 +01:00
Torkel Ödegaard
60d7d9c691 Merge pull request #15181 from marefr/fix_ping_unauthorized 
auth: /api/login/ping fixes
 2019-02-04 18:41:35 +01:00
Marcus Efraimsson
cfd8eb5167 now /api/login/ping returns Response 2019-02-04 17:37:07 +01:00
Marcus Efraimsson
d433ca7d40 fix util for splitting host and port 
Now you can provide both a default host and a default port
 2019-02-04 13:10:32 +01:00
Connor Patterson
48c8ff8899 Add AWS/Neptune to metricsMap and dimensionsMap 2019-02-03 16:29:35 -05:00
bergquist
a6bd2c73a0 introduce samesite setting for login cookie 
ref #15067
 2019-02-01 11:47:21 +01:00
bergquist
a1b3986532 always delete session cookie even if db delete fails 2019-02-01 09:59:53 +01:00
Marcus Efraimsson
dd5a8275f1 must return json response from /api/login/ping 
Even though http error 401 was returned, the result was still a http 200
 2019-02-01 01:21:23 +01:00
bergquist
91bd908e03 adds more tests signing out session 2019-01-31 22:24:04 +01:00
bergquist
11c4967bdc changes some info logging to debug 2019-01-31 21:51:14 +01:00