bergquist
4fe72ebf69
feat(macaron): upgrades macaron version
2016-01-13 15:11:23 +01:00
Shaofeng Chen
dc427d5a2c
add get org by name api
2016-01-12 13:50:56 -08:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
bergquist
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
bergquist
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
bergquist
22c001c8a6
fix(playlist): implement api according to new standard
2016-01-08 14:21:30 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
Torkel Ödegaard
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
Carl Bergquist
280f9befae
Merge pull request #2949 from shoonoise/master
...
Add option to hide raintank share button
Fixes #2727
2015-12-14 17:29:09 +01:00
woodsaj
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
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
shoonoise
b4a2b96e32
Add options to manage snapshot publishing
2015-10-29 16:40:03 +03: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
Torkel Ödegaard
9e789e6d82
More work on organization / admin nav, views, #1506
2015-02-25 14:27:34 +01:00
Torkel Ödegaard
26e4809e2e
Big Backend Refatoring: Renamed Account -> Org
2015-02-23 20:07:49 +01:00
Torkel Ödegaard
e9e2fa2927
Started Account -> Organization rename
2015-02-23 18:29:01 +01:00
Torkel Ödegaard
1a106e5c38
Added change password ability to admin > edit user view, #1446
2015-02-23 11:24:22 +01:00
Torkel Ödegaard
47c6c6e1b7
Added change password feature, Closes #1455
2015-02-19 16:09:49 +01:00
Torkel Ödegaard
60ae4afe87
Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493
2015-02-18 14:06:44 +01:00
Torkel Ödegaard
f6c07fdabd
Rewrote and redesign how the data source edit views look and work so they conform better to how account views look, removed tabs and put top nav items to add data source etc, made list, edit and new seperate url routes, #1483
2015-02-14 10:04:34 +01:00
Torkel Ödegaard
e65a6cc063
added an inital admin settings view, very basic right now only displays all config options in grafana.ini
2015-02-12 15:46:14 +01:00
Torkel Ödegaard
71f09ddd94
Added delete user action to user admin api, and made it work in UI, Closes #1466 , #1446
2015-02-11 16:47:22 +01:00
Torkel Ödegaard
add4adeec9
Fixed links to user admin views, and backend html routes for user admin edit/create urls, Closes #1451
2015-02-10 16:26:23 +01:00
Torkel Ödegaard
e165e2af95
Worked on user admin features, can now create and edit users as a grafana admin user, #1446
2015-02-10 15:36:51 +01:00
Torkel Ödegaard
c5afcd8e09
Fixed issue with datasource proxying, it required account admin role when it should not
2015-02-10 10:19:43 +01:00
Torkel Ödegaard
5269422f7c
Began work on hashing api keys
2015-02-09 13:30:04 +01:00
Torkel Ödegaard
10820f31c2
Changed go package path
2015-02-05 10:37:13 +01:00
Torkel Ödegaard
076905d14e
Added isStarred to search result hit, very inefficient loading right now but can be cached later on
2015-02-05 09:49:00 +01:00
Torkel Ödegaard
42a5aefb23
Worked on home dashboard
2015-02-03 15:04:35 +01:00
Torkel Ödegaard
97758380e0
Worked on stars in search results
2015-02-02 17:17:57 +01:00
Torkel Ödegaard
ad3d15e28d
Worked on dashboard starring and unstarring, renamed favorite model to star
2015-02-02 11:32:32 +01:00
Torkel Ödegaard
04d03f73b3
Added disable user sign up feature
2015-01-29 15:46:54 +01:00
Torkel Ödegaard
1d6413bfae
More work on backend for user favorites
2015-01-29 12:10:34 +01:00
Torkel Ödegaard
1cff564483
Fontend handling of account role to hide user actions and links that the user does not have access to
2015-01-28 11:33:50 +01:00
Torkel Ödegaard
95305e7e11
Changed from goconfig to its new counter part go-ini
2015-01-27 10:09:54 +01:00
Torkel Ödegaard
951ce0a102
API token -> API key rename
2015-01-27 08:26:11 +01:00
Torkel Ödegaard
db371d2a5d
API: added admin role requirement for account changes, datasource admin, and api keys admin
2015-01-26 20:26:17 +01:00
Torkel Ödegaard
5ba2423626
Worked on account update view
2015-01-26 15:42:22 +01:00
Torkel Ödegaard
9a641ee7c0
Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up
2015-01-26 12:58:03 +01:00
Torkel Ödegaard
3c8c53194f
Sign up and login work
2015-01-21 09:52:40 +01:00
Torkel Ödegaard
9e6df378c3
worked on account creation
2015-01-20 16:29:48 +01:00
Torkel Ödegaard
581efa857b
Small fixes
2015-01-19 19:10:29 +01:00
Torkel Ödegaard
90925273a0
User / Account model split, User and account now seperate entities, collaborators are now AccountUsers
2015-01-19 18:01:04 +01:00
Torkel Ödegaard
2daffe2a15
Api import route updated
2015-01-18 08:56:19 +01:00
Torkel Ödegaard
c970e82758
Small update to update account command
2015-01-17 08:20:25 +01:00
Torkel Ödegaard
3912ed5023
Role checking when saving dashboard, making sure that the user has owner or editor role
2015-01-16 15:28:44 +01:00
Torkel Ödegaard
22156fe309
Big refactoring for context.User, and how current user info is fetching, now included collaborator role
2015-01-16 14:32:18 +01:00
Torkel Ödegaard
aa9ca68883
Tokens small fixes
2015-01-16 12:28:35 +01:00
Torkel Ödegaard
9feb8a73fd
Added binding to tokens api and role validation
2015-01-16 12:06:24 +01:00
Torkel Ödegaard
f858f6b621
Add collaborator now handles role, added macaron-contrib/binding for binding and validation
2015-01-16 11:54:19 +01:00
Torkel Ödegaard
04bbdbad12
Worked on account update, moved collaborats to its own api url and files
2015-01-15 19:14:47 +01:00
Torkel Ödegaard
804bff55ec
Accounts admin view/get api
2015-01-15 15:54:22 +01:00
Torkel Ödegaard
5ec07db143
Refactoring of auth middleware, and starting work on account admin
2015-01-15 12:16:54 +01:00
Torkel Ödegaard
6f63d63ee0
Working on account collaborators
2015-01-14 16:12:37 +01:00
Torkel Ödegaard
5e18afe916
Refactoring of api routes
2015-01-14 14:25:12 +01:00
Torkel Ödegaard
5833867b44
renamed register route to signup
2015-01-14 10:19:53 +01:00
woodsaj
7b17e38f5d
add Token authentication support
...
Added CRUD methods for Tokens.
Extend Auth Handler to check for the presence of a Bearer Authorization
header to authenticate against. If there is no header, or the token is not
valid, the Auth Handler falls back to looking for a Session.
2015-01-14 16:33:34 +08:00
Torkel Ödegaard
8e65f36131
Added system admin skeleton
2015-01-11 12:12:29 +01:00
Torkel Ödegaard
a81a5315e1
Added graphite docker and fig config
2015-01-08 17:34:41 +01:00
Torkel Ödegaard
d573ee22f1
Fixed missing godep dependency for unit tests
2015-01-08 09:23:34 +01:00
Torkel Ödegaard
3e07605260
added a /api/metrics/test query that returns random walk series
2015-01-06 09:11:00 +01:00
Torkel Ödegaard
f25a415a9e
Work on making grafana work in sub url
2015-01-04 21:03:40 +01:00
Torkel Ödegaard
ec98c201e4
Datasource options are now included in bootData
2014-12-28 19:30:14 +01:00
Torkel Ödegaard
f3132b4513
Trying a different approach to providing frontend settings
2014-12-28 18:37:39 +01:00
Torkel Ödegaard
a7c816c65e
Datasource proxy, switch to lookup by id
2014-12-19 07:27:25 +01:00
Torkel Ödegaard
a2a0e0394d
Work on data source proxying, #6
2014-12-18 20:26:06 +01:00
Torkel Ödegaard
d69258e28f
Backend can now generate config.js, the very basic stuff, more work needed
2014-12-18 15:41:38 +01:00
Torkel Ödegaard
ce947d4793
Update data sources now work, #8
2014-12-17 17:32:22 +01:00
Torkel Ödegaard
adf4e72cf8
More general backend work, in the middle of the night... Zzzz
2014-12-17 03:09:54 +01:00
Torkel Ödegaard
27f07e9de2
Progress on data source admin
2014-12-16 16:45:07 +01:00
Torkel Ödegaard
b70a3f0958
started work datasources admin
2014-12-16 12:04:08 +01:00
Torkel Ödegaard
705455d5d6
Set active account now works again
2014-12-15 21:56:16 +01:00
Torkel Ödegaard
973b9cad36
moved all http route handling into single package named api
2014-12-15 21:25:02 +01:00
Torkel Ödegaard
e750080f00
removed old code
2014-11-24 08:20:16 +01:00
Torkel Ödegaard
a4204880e8
started work on new arch
2014-10-04 13:33:20 +02:00
Torkel Ödegaard
5d120de70e
Filtered logging and url query helper
2014-10-03 09:03:16 +02:00
Torkel Ödegaard
b0b77d667c
added gravatar
2014-09-22 10:46:56 +02:00
Torkel Ödegaard
40ff57d8c4
Account stuff
2014-09-20 12:13:46 +02:00
Torkel Ödegaard
a9a06ad51d
Working on collaborators
2014-09-19 17:37:18 +02:00
Torkel Ödegaard
158b708eac
Small progress on adding collaborator
2014-09-18 12:03:46 +02:00
Torkel Ödegaard
4dfe8b6f69
Working on login user name state
2014-09-17 15:25:07 +02:00
Torkel Ödegaard
31fe471da5
working on account registration and more
2014-08-22 18:05:37 +02:00
Torkel Ödegaard
d8dca20332
updated
2014-08-17 12:25:37 +02:00
Torkel Ödegaard
9e30599f1f
rename backend to pkg
2014-08-12 20:45:41 +02:00