bergquist
27274f37e8
feat(alerting): update paths for alert state
2016-05-06 14:37:41 +02:00
Torkel Ödegaard
bb6f4fff87
feat(export/import): minor progress
2016-05-03 16:40:21 +02:00
bergquist
743a6fa37c
feat(alerting): add support for deleting alert rules
2016-05-02 16:07:19 +02:00
bergquist
f442adca47
feat(alerting): adds api endpoints for alerts per dashboard and panel
2016-04-28 15:13:42 +02:00
bergquist
ecfbc2edca
feat(alerting): adds alert history page
2016-04-28 11:42:03 +02:00
bergquist
0f0fa0c257
feat(alerting): adds endpoint for getting alert states log
2016-04-28 10:59:46 +02:00
bergquist
e7be7d2835
feat(alerting): add api endpoint for alert state
2016-04-28 08:23:50 +02:00
bergquist
6a5ecb3fca
feat(alerting): adds basic page for listing alerts
2016-04-27 13:02:28 +02:00
bergquist
973db1ac38
feat(alerting): add api route for alert changes
2016-04-27 08:59:33 +02:00
bergquist
9b50313f11
feat(alerting): add api endpoints for listing alerts
2016-04-26 17:36:50 +02:00
Torkel Ödegaard
d9ad4cf2fc
fix(): made plugin settings api call accessable for viewer roles
2016-04-13 13:03:41 -04:00
Torkel Ödegaard
10131aa8a0
fix(pluginlist): fixed issue with home dashboard and new pluginlist panel that casued permission denied error for non admin users, fixes #4686
2016-04-13 12:23:29 -04:00
Torkel Ödegaard
12800f831a
Merge branch 'master' into pluginlist
2016-04-09 15:01:39 -04:00
Torkel Ödegaard
370589d6c0
fix(org switch): fixed issue with switching orgs, fixes #4614
2016-04-09 13:27:06 -04:00
Torkel Ödegaard
d70ef90bdd
feat(): plugin list panel
2016-04-08 16:42:33 -04:00
Torkel Ödegaard
43ebc172cb
fix(profile): fixed change password link and page, fixes #4542
2016-04-04 13:52:41 -04:00
Torkel Ödegaard
ab1048b7ee
feat(preferences): theme and home dashbord settings now work work on profile and org settings page
2016-04-02 13:54:06 -07:00
Torkel Ödegaard
38a10f8be4
progress
2016-04-01 17:34:30 -07:00
Torkel Ödegaard
6ed9164c9d
Merge branch 'master' of github.com:grafana/grafana into preferences
2016-03-30 13:35:17 -07:00
Torkel Ödegaard
14326b626e
ux(): checkbox now works in dark and white theme
2016-03-28 13:10:42 +02:00
Torkel Ödegaard
c711fb67c8
Merge branch 'master' into websocket
2016-03-22 10:31:57 +01:00
Torkel Ödegaard
5e431149cd
feat(preferences): removed unused api prefernce methods, these need to be abstracted more from an http api perpsective, they are too low level for the http api, #4399
2016-03-20 11:54:24 +01:00
Torkel Ödegaard
9e98c86ae1
Merge branch 'master' into preferences
2016-03-20 11:27:49 +01:00
utkarshcmu
9d4fa87914
Viewer not able to delete snapshot
2016-03-18 01:13:34 -07:00
utkarshcmu
cb42cfc6af
Removed unwanted api, moved logic into backend
2016-03-17 02:29:34 -07:00
utkarshcmu
4fbe954a79
Home dashboard per user per org works
2016-03-17 01:38:18 -07:00
utkarshcmu
66621d762e
Added getDashboardSlugById api
2016-03-17 01:01:58 -07:00
utkarshcmu
9dd6aefcec
Minor corrections
2016-03-16 23:35:06 -07:00
utkarshcmu
749fd618a9
Saving home dashboard id in table
2016-03-16 23:22:27 -07:00
Torkel Ödegaard
e06756bcab
Merge branch 'preferences' of github.com:grafana/grafana into preferences
2016-03-15 22:15:27 +01:00
Torkel Ödegaard
9c222a445f
Merge branch 'master' into preferences
2016-03-15 22:14:35 +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
fbd94fc6ce
feat(websockets): inital work on websockets, #4355
2016-03-14 11:59:51 +01:00
utkarshcmu
e371e03696
Able to save preference version, created, updated fields
2016-03-14 03:12:52 -07:00
Torkel Ödegaard
5b6754ce6c
Merge branch 'master' into websocket
2016-03-14 10:33:11 +01:00
Torkel Ödegaard
581ffb862c
feat(plugins): polish to plugin page, better handling for reading readme file contents
2016-03-13 19:21:44 +01:00
Torkel Ödegaard
c5a817194a
more work on dashboard importing and templating
2016-03-11 17:31:57 +01:00
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08: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
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
utkarshcmu
8afd56575c
Moved api in correct group
2016-03-10 00:48:38 -08:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
utkarshcmu
1a39d93b4e
Implemented GetDataSourceByName API
2016-03-08 01:54:10 -08:00
utkarshcmu
8f42bec270
Implemented GetUserPreferences API
2016-03-06 11:42:15 -08:00
utkarshcmu
660d3fa1e9
Implemented savePreferences API
2016-03-06 03:47:39 -08:00
utkarshcmu
cf926134ef
Added savePreferencesAPI
2016-03-05 13:15:49 -08:00
Torkel Ödegaard
fc877ae0f4
poc(websockets): websocket poc
2016-03-03 23:05:08 +01:00
Anthony Woods
35f7a71f9a
fix app->plugin renamin in more places
2016-02-29 19:54:36 +08: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
08f7ccff38
feat(avatar): added server side proxy and cache of gravatar requests
2016-02-21 00:06:28 +01:00
Torkel Ödegaard
fcc960e9a2
Merge pull request #3792 from utkarshcmu/snapshot-view
...
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
Carl Bergquist
251bf7a2b4
Merge pull request #3840 from utkarshcmu/stats
...
Grafana stats view as mentioned in #3812
2016-01-27 19:41:10 +01:00
utkarshcmu
da67afa51e
Fixed api bugs, stats endpoint working
2016-01-24 21:18:17 -08:00
utkarshcmu
c7fae5386d
Added backend API for stats
2016-01-24 11:01:33 -08:00
Anthony Woods
f94599cd29
merge apiPlugins with appPlugins
2016-01-22 01:15:04 +08:00
utkarshcmu
ca55d1f315
Minor bug fixes
2016-01-19 05:05:24 -08:00
utkarshcmu
bcb44b7b31
UI and backend connectivity implemented
2016-01-19 05:02:22 -08:00
utkarshcmu
1ab1154010
Optimized backend queries
2016-01-19 04:09:57 -08:00
utkarshcmu
8f067a5ed2
Added backend functionality for searching snapshots
2016-01-19 01:37:36 -08:00
Torkel Ödegaard
66eebd1ac3
refactor(playlist): refactor of playlist feature, and PR #3776
2016-01-18 16:01:14 +01:00
Torkel Ödegaard
6da3af5e89
Merge branch 'new_macaron'
2016-01-13 15:48:49 +01:00
Torkel Ödegaard
bdb67d4909
fix(build): fixed dependency and build issue
2016-01-13 15:38:54 +01:00
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