root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 250 Packages Projects Releases Wiki Activity
4,871 Commits 1,396 Branches 636 Tags 2.4 GiB
Commit Graph

121 Commits

Author SHA1 Message Date
Torkel Ödegaard b21fa2daa0 Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins 2015-11-19 11:05:27 +01:00
Torkel Ödegaard 32f9f8fcce fix(http api): correct return status code for /api/datasources/:id so it eturns 404 when not found, fixes #3217 2015-11-13 09:43:25 +01:00
woodsaj d503c5d83d refer to plugins are ExternalPlugin instead of thirdParty 2015-11-11 14:30:07 +08:00
Torkel Ödegaard 6fecb4bf3e fix(http route): fixed dashboard-solo route to not return 404, fixes #2979 2015-10-20 10:02:56 -04:00
Anthony Woods cf89b565a6 initial import of thirdParty route support 2015-10-15 04:14:09 +08:00
woodsaj 6488324cf1 enhance quota support. 
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
 2015-09-11 23:17:10 +08:00
woodsaj 555cbeffa5 allow all users to retrieve org and quota data. 2015-09-11 01:18:36 +08:00
woodsaj 0688050552 add quota middleware to enforce quotas. issue #321 
Conflicts:
	pkg/api/api.go
 2015-09-11 01:03:47 +08:00
woodsaj 9023171940 inital backend suport for quotas. issue #321 
Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go
 2015-09-11 01:01:36 +08:00
Torkel Ödegaard fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard 24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
Torkel Ödegaard 8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
Torkel Ödegaard 43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Torkel Ödegaard 775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
Torkel Ödegaard ab54971763 feat(invite): more progress on completing invite form and actually creating a real user, #2353 2015-07-20 17:46:48 +02:00
Torkel Ödegaard d75f96fdd5 feat(invite): more progress on invited / sigup view, #2353 2015-07-20 15:52:49 +02:00
Torkel Ödegaard 3242354a4b feat(invite): worked on pending invitations list, revoke invite now works, #2353 2015-07-20 10:57:39 +02:00
Torkel Ödegaard 4ac652b127 feat(invite): began work on invited signup view, also added backdrop to login view, #2353 2015-07-19 12:34:03 +02:00
Torkel Ödegaard 6088f83408 feat(invite): inital pass on sending new user invite email, #2353 2015-07-18 17:39:12 +02:00
Torkel Ödegaard 0ffcce1b5d feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353 2015-07-17 09:51:34 +02:00
Torkel Ödegaard 0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
Torkel Ödegaard 5962bcbc6c Do not show create org link when allow_org_create is set to false, Fixes #2135 2015-06-11 08:16:09 +02:00
Torkel Ödegaard 2266ef6809 Minor api refactoring / code clean up 2015-06-10 10:15:42 +02:00
Torkel Ödegaard c8bc0b3bf8 Lots of work on user password reset, #1456 2015-06-08 13:39:02 +02:00
Torkel Ödegaard aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
Torkel Ödegaard eb793f7feb Initial work on ldap support, #1450 2015-06-04 09:34:42 +02:00
Torkel Ödegaard e2f6633d57 Began work on data source test / validation, #1997 & #2043 2015-06-01 12:15:49 +02:00
Torkel Ödegaard 3354365177 Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling 2015-05-20 14:59:38 +02:00
Torkel Ödegaard 51af06edf7 Merge pull request #2022 from dalmatinerdb/proxy-url-fix 
fixing #2021
 2015-05-20 09:03:23 +02:00
Heinz N. Gies 7cf9046dc5 fixing #2021 
This tiny commit fixes a routing problem for proxy requests. The
router was expecting a url path behind the proxy id, if none was
given (read: the service proxied was at the root of a host) then
the router would return a 404. With this patch it now propperly
uses ProxyDataSourceRequest.
 2015-05-19 23:49:30 +02:00
Torkel Ödegaard a8aab0cb2b Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 2015-05-19 11:47:14 +02:00
Torkel Ödegaard 788e7fd36d Lots of api refactoring for org routes, #2014 2015-05-19 10:16:32 +02:00
Torkel Ödegaard 74bf1f23fb Small progress on #2014 2015-05-19 09:09:21 +02:00
Torkel Ödegaard f81bde5643 Refactoring some api handlers to use the new Response return object 2015-05-18 21:23:40 +02:00
Torkel Ödegaard fbc6bb2112 More refactoring of user http api, trying to reuse handlers for sign in user and admin operations 2015-05-18 19:06:19 +02:00
Torkel Ödegaard 5270c4bc74 refactorin api code for user routes, preparation for admin improvements, #2014 2015-05-18 17:52:23 +02:00
Torkel Ödegaard bb7d79e6d2 Refactoring search to support more than just db dashboards 2015-05-13 10:45:53 +02:00
Torkel Ödegaard b3be51f17f Lots of work on search and dashboard loading, trying to generalize concepts and code, #960 2015-05-12 14:11:30 +02:00
Torkel Ödegaard e771d8e944 Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 2015-05-01 09:48:07 +02:00
Torkel Ödegaard 836e4b4911 Dashboard snapshot: Should not require login to view snapshot, Fixes #1780 2015-04-15 10:39:03 +02:00
Torkel Ödegaard 22adf0d06e Datasource proxy & session timeout fix (casued 401 Unauthorized error after a while), Fixes #1667 2015-04-07 09:25:00 +02:00
Torkel Ödegaard 4322f29f34 Dashboard snapshot: added delete key which can be used to delete snapshots, #1623 2015-03-26 20:34:58 +01:00
Torkel Ödegaard 7614ddb318 Updated design for snapshot sharing dialog, #1596 2015-03-23 13:58:30 -04:00
Torkel Ödegaard 964f0861d6 more work on dashboard snapshots 2015-03-21 08:53:16 -04:00
Torkel Ödegaard 9710771f16 Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510 2015-03-02 09:58:35 +01:00
Torkel Ödegaard d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
Torkel Ödegaard 109dd3240a Work on new datasource plugin model, #1276 #1472 2015-02-28 08:25:13 +01:00
Torkel Ödegaard 6a2a6afc1d Merge branch 'develop' into apikey_hashed 
Conflicts:
	pkg/api/apikey.go
	pkg/services/sqlstore/migrations.go
 2015-02-26 15:48:54 +01:00
Torkel Ödegaard 7c241fd617 Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517 2015-02-26 15:43:48 +01:00