Torkel Ödegaard
6ed9164c9d
Merge branch 'master' of github.com:grafana/grafana into preferences
2016-03-30 13:35:17 -07:00
Torkel Ödegaard
c711fb67c8
Merge branch 'master' into websocket
2016-03-22 10:31:57 +01:00
Torkel Ödegaard
10df9dc8c3
feat(plugins): finished app navigation enhancements, closes #4434
2016-03-22 10:15:47 +01:00
Torkel Ödegaard
65c0937741
ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434
2016-03-21 19:07:08 +01:00
Torkel Ödegaard
7023dedc05
feat(preferences): refactoring PR #4399
2016-03-20 11:52:19 +01:00
Torkel Ödegaard
9e98c86ae1
Merge branch 'master' into preferences
2016-03-20 11:27:49 +01:00
utkarshcmu
66621d762e
Added getDashboardSlugById api
2016-03-17 01:01:58 -07:00
Torkel Ödegaard
0f6579801d
Merge branch 'master' into websocket
...
Conflicts:
public/app/core/core.ts
2016-03-16 15:19:32 +01:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01:00
Torkel Ödegaard
e4c0c39fbf
ux(): began work on updating data source list to cards view
2016-03-15 20:29:35 +01:00
Torkel Ödegaard
1abdd170d3
ux(): fixes to cards and sorting plugin list, #4364
2016-03-15 15:52:29 +01:00
Torkel Ödegaard
2e1f26096f
feat(grafana_live): more work pushing data to websocket, #4355
2016-03-14 22:26:43 +01:00
Torkel Ödegaard
3d5251d9a5
feat(websocket): more work websocket ds, # 4355
2016-03-14 17:32:48 +01:00
Torkel Ödegaard
195be2742c
feat(live): wip work
2016-03-14 16:18:07 +01:00
Torkel Ödegaard
0398face05
feat(plugins): dashboard import for data sources is working! #4298
2016-03-12 10:13:49 +01:00
Torkel Ödegaard
1f9f439acb
lib(): added simplejson lib
2016-03-11 23:28:33 +01:00
Torkel Ödegaard
c5a817194a
more work on dashboard importing and templating
2016-03-11 17:31:57 +01:00
Torkel Ödegaard
ece8a925a6
Merge branch 'master' of github.com:grafana/grafana
...
Conflicts:
examples/nginx-app/package.json
examples/nginx-app/plugin.json
2016-03-11 12:39:10 +01:00
Torkel Ödegaard
fc54c01f01
feat(plugins): more work on plugin dashboard install, #4298
2016-03-11 12:31:56 +01:00
Torkel Ödegaard
2de439bd1e
feat(plugins): progress on dashboard installs , #4298
2016-03-11 09:57:20 +01:00
utkarshcmu
4fbff99186
Implemented GetDataSourceIdByName API
2016-03-10 01:31:10 -08:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
Torkel Ödegaard
135679096b
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:31:17 +01:00
Torkel Ödegaard
c148d89004
feat(plugins): progress on plugins page
2016-02-26 18:25:39 +01:00
Torkel Ödegaard
c521182ceb
feat(plugins): more work on plugins list/edit view
2016-02-25 15:56:28 +01:00
Torkel Ödegaard
8db7cf49a6
feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins
2016-02-25 14:55:31 +01:00
Torkel Ödegaard
acfc119409
ux(): added New and Import under divider to dashboard subnav
2016-02-22 21:51:31 +01:00
Torkel Ödegaard
08f7ccff38
feat(avatar): added server side proxy and cache of gravatar requests
2016-02-21 00:06:28 +01:00
Torkel Ödegaard
ae39ec8585
feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk
2016-02-10 13:09:39 +01:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
Torkel Ödegaard
9dcfe6dc39
feat(apps): more work on app pages and sidemenu subnav
2016-02-09 14:06:23 +01:00
Torkel Ödegaard
18eb9d6076
feat(apps): began work on app pages
2016-02-09 11:17:49 +01:00
utkarshcmu
00a6efa15e
Excluded total calculations from backend
2016-02-01 23:26:11 -08:00
utkarshcmu
972ac99b7c
Added more metadata
2016-01-28 09:53:19 -08:00
utkarshcmu
b30dcce4bc
Added dtos and UI for more metadata
2016-01-28 00:52:52 -08:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
Anthony Woods
1bca28ad12
include the jsonData in the AppSettings DTO
2016-01-21 02:23:24 +08:00
Torkel Ödegaard
7a26d309b1
feat(apps): more work on apps and how apps can include panels
2016-01-19 18:18:53 +01:00
Torkel Ödegaard
38ddc88b20
fix(api): do not include null jsonData field in /api/datasources resource, closes #3755
2016-01-15 15:57:00 +01:00
Torkel Ödegaard
534bc83173
temp work on dynamic directives
2016-01-13 14:03:50 +01:00
Torkel Ödegaard
a15984b663
feat(apps): pages work
2016-01-12 15:39:29 +01:00
Torkel Ödegaard
e081a5c5a0
feat(apps): worked on pinning apps
2016-01-11 18:03:08 +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
Torkel Ödegaard
7a8b3c419b
feat(apps): lots of progress
2016-01-08 20:57:58 +01:00
Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01: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
utkarshcmu
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +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
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
Mitsuhiro Tanda
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
woodsaj
fd392a2422
Merge remote-tracking branch 'upstream/external-plugins' into externalPlugin
...
Conflicts:
public/views/index.html
2015-12-03 12:47:58 +08:00
woodsaj
13864853a8
support separate css files for light/dark themes.
2015-12-03 12:29:57 +08:00
Torkel Ödegaard
ee0e4d2b69
Merge branch 'master' into external-plugins
...
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
2015-12-02 18:30:48 +01:00
utkarshcmu
5559ad1238
Return correct updated+created timestamps to frontend
2015-11-21 05:03:00 -08:00
Torkel Ödegaard
df0bc7bbc4
feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185
2015-11-20 09:43:10 +01: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
de0f04ec3c
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 15:14:24 +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
d25624a8ad
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
2015-08-27 13:59:58 +02:00
Torkel Ödegaard
3d37c9c9a3
feat(tagmanager): support to add google tagmanager id, closes #2569
2015-08-21 09:30:39 +02:00
Torkel Ödegaard
e53c1e39d3
feat(invite): can now add org user with sername again, #2353
2015-08-10 14:03:08 +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
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
3675b3fcaa
Fixed issue with clearing admin permissions, Fixes #2143
2015-06-11 08:29:12 +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
85c3a0aa14
Panel menu now hides edit actions for users with role Viewer, Closes #1826
2015-06-01 16:36:15 +02:00
Torkel Ödegaard
187834b17c
Trying to get dashboard loading and dashboard meta flags like canSave, canStar more managable
2015-05-13 09:58:45 +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
e5c1169120
HTTP API: GET /api/dashboards/db/:slug response changed property to to match the POST request nameing, Fixes #1928
2015-05-04 08:36:44 +02:00
Torkel Ödegaard
e7c43bf614
expose org id to frontend, Closes #1907
2015-04-29 09:26:12 +02:00
Torkel Ödegaard
236c4e65f8
Began work on dashboard: editable flag, that actually stops users from changing anything, #1834
2015-04-23 15:26:48 +02:00
Torkel Ödegaard
8e9a0eddf5
Custom snapshot topnav header, new custom dashboard snapshot icon, #1623
2015-03-28 17:53:52 +01:00
Torkel Ödegaard
f48f5428e5
Adding snapshot storage and route, #1623
2015-03-21 10:56:26 -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
04ca85fe89
Moved dashboard theme option from the dashboard to a persisted user setting, #1458
2015-02-28 14:30:08 +01:00
Torkel Ödegaard
c198242292
A lot of work on backend plugin model for frontend components, right now for data sources, will enable dropin plugins for data sources and panels, #1472
2015-02-27 22:29:00 +01:00
Torkel Ödegaard
c75aa23092
New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440
2015-02-26 17:23:28 +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
26e4809e2e
Big Backend Refatoring: Renamed Account -> Org
2015-02-23 20:07:49 +01:00
Torkel Ödegaard
5b2715515f
Began work on Account -> Organization rethink, #1506
2015-02-23 16:40:04 +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
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
727fc9d3a6
Updated search result view, removed delete link, added delete action from dashboard cogs dropdown
2015-02-07 20:25:53 +01:00
Torkel Ödegaard
10820f31c2
Changed go package path
2015-02-05 10:37:13 +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
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
3c8c53194f
Sign up and login work
2015-01-21 09:52:40 +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
fdfcc3ab2a
Admin flagged users, create a default admin user on startup if missing
2015-01-15 14:44:15 +01:00
Torkel Ödegaard
68cc3f86dd
Handle default datasource management
2015-01-09 16:36:23 +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
a55a606a55
Refactoring dashboard data access
2014-12-22 12:25:08 +01:00
Torkel Ödegaard
e5811e29b1
Added username, site and password for influxdb datasources
2014-12-19 08:19:12 +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
973b9cad36
moved all http route handling into single package named api
2014-12-15 21:25:02 +01:00
