899 Commits

Author SHA1 Message Date
0156a94a49 annotations: you can now read annoations via manually created annoation query 2017-04-12 15:46:41 +02:00
d553498a33 graph(add annotation): initial backend implementation #1286 2017-04-10 20:22:58 +03:00
1cd632cc43 plugins: added state property to plugins 2017-04-07 12:00:03 +02:00
d6d2080f11 mysql: minor progress on response processing 2017-03-31 11:45:25 +02:00
bd4f073425 mysql: minor update 2017-03-30 20:23:40 +02:00
8f90c6115d mysql: progress on mysql data source 2017-03-29 22:54:18 +02:00
6965064ea9 Merge branch 'master' into sql-proxy 2017-03-29 16:40:14 +02:00
319b8d8fca Configurable signout menu activation (#7968) 2017-03-29 11:33:28 +02:00
beb85f413a oauth: delete session key instead of set to empty
Adds the Delete function to the Session wrapper so that the Macaron
function for deleting keys from a Session can be used.

https://go-macaron.com/docs/middlewares/session#implement-provider-interface
2017-03-23 15:26:13 +01:00
79cef75fed Merge pull request #7426 from Altoros/altoros/authorization-errors
Add common type for oauth authorization errors
2017-03-23 15:25:35 +01:00
e99137598e Cloudwatch: Correctly obtain IAM roles within ECS container tasks. (#7892)
We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.

Fixes #6700.
2017-03-22 07:15:19 +01:00
970619ed52 Merge branch 'disable-login' 2017-03-20 11:18:41 +01:00
a67497e679 add new s3 metrics (#7846) 2017-03-20 09:09:08 +01:00
737c29ec8c disable inviting new users to orgs if login form is disabled 2017-03-17 16:35:05 -04:00
9efb6e76e9 users: adds search and pagination (#7753)
ref #7469. Follow up change that adds proper paging with 50 results
per page as well as a search box to search by name, login or email.
2017-03-07 16:03:54 +01:00
b387a8759e use session.NewSession() (#7745) 2017-03-06 21:08:16 +01:00
03354bc49a tech: replace context.TODO with background ctx 2017-02-24 09:20:28 +01:00
96a3ed0ac3 docs: new /api/users/search route
ref #7469. Description of new route that
adds paging for the users list.
2017-02-21 16:09:15 +01:00
70b36a02af Revert "tech: use context package over xperimental version"
This reverts commit 99f1c30071e770a30abfb86b00e5aaf2dd150253.
2017-02-20 22:04:51 +01:00
99f1c30071 tech: use context package over xperimental version 2017-02-20 21:44:15 +01:00
5174d050f2 middlware: change org when url contains orgid
closes #6948
ref #1613
2017-02-17 15:02:14 +01:00
12f1ea71fd chore: delete empty test 2017-02-17 12:07:46 +01:00
cf871b1284 http: close http server gracefully. 2017-02-17 10:33:47 +01:00
4fcd5eab29 Add advanced TLS settings to harden setup. (#7347)
* Hardcoded the most secured TLS options.
2017-02-15 14:29:20 +01:00
902cf5f889 fix(): google analytics fix 2017-02-15 14:26:57 +01:00
79cd48f64c Cloudwatch AWS/SES metrics (#7568) 2017-02-15 08:12:24 +01:00
193d468ed3 admin: adds paging to global user list
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.

Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.

Fixes #7469
2017-02-13 12:59:36 +01:00
7f4f38e773 Merge pull request #7519 from huydx/master
(feat) support datasource delete by name api
2017-02-10 15:53:34 +01:00
143cbe921f (feat) support datasource delete by name api 2017-02-10 23:30:14 +09:00
b22881c717 redirect user to requested url after login via oauth 2017-02-09 14:01:53 -05:00
2b2368b189 Merge pull request #7491 from grafana/sorting-datasources
Sorting datasources with case insensitive order
2017-02-08 12:01:31 +01:00
fbc3c3dd32 api: removes import alias + some unused fields 2017-02-08 11:57:05 +01:00
cbd1455c42 fix(api): case insensitive sort for datasources
The data source list is case sensitive when sorted. This changes the
sort to be case insensitive. The test only tests the handler, not the
routing or database query.
2017-02-07 22:15:52 +01:00
9ece10ef24 style(dataproxy): simplify expression 2017-02-07 11:03:57 +01:00
69566a23fc improve security of Prometheus datasource 2017-02-06 23:10:10 +09:00
30c334a2b8 Add common type for oauth authorization errors 2017-02-01 16:42:59 +03:00
01f1c1b8dc feat(): began refactoring PR #5364 2017-01-31 17:10:27 +01:00
8a95c563bb Merge branch 'master' into websocket 2017-01-31 08:56:49 +01:00
c400b5cf63 Merge branch 'master' of github.com:grafana/grafana 2017-01-31 07:48:44 +01:00
1a9aaa4138 feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264 2017-01-31 07:48:10 +01:00
830491fa66 Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image 2017-01-31 06:28:54 +01:00
3e741315b4 [3743] Adds support for user search based on login or email (#7334)
* [3743] Adds support for user search based on login or email

* Use query parameter instead

* Use macaron Query() instead
2017-01-31 06:25:55 +01:00
edba465a75 add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace (#7388) 2017-01-28 08:30:57 +01:00
2f4da15264 fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365 2017-01-26 08:54:51 +01:00
40d39f8a3e refactor(): renaming alerting hide ui option, #7318 2017-01-25 13:32:26 +01:00
fee4846429 Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui 2017-01-25 13:16:48 +01:00
9862c9ff40 feat(alerting): Show/hide alerting UI using configuration variable
Use configuration variable "show_alerting_ui" to show/hide alerting UI
2017-01-20 10:43:29 -05:00
e78da57e4d feat(alerting): shows when no_data triggered alerts
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
d4a96b9741 tech(dataproxy): make the code a little bit more defensive 2017-01-16 12:24:08 +01:00
dd84fb563a style(dataproxy): renames log functions 2017-01-16 12:23:49 +01:00