bergquist
485a377800
fix(cli): adds support for local plugin folder
...
closes #4572
2016-04-19 08:27:26 +02:00
bergquist
daa5468801
feat(alerting): parses dashboard alerts
2016-04-18 14:15:03 +02:00
bergquist
769016783f
feat(alerting): add aggregator field
2016-04-18 11:10:52 +02:00
bergquist
bcf10a6483
Merge branch 'master' into alerting_definitions
2016-04-18 10:28:40 +02:00
Torkel Ödegaard
d98839fc19
Revert "feat(cli): detects plugin folder for dev env"
...
This reverts commit a5eda6a87b
2016-04-15 09:01:27 -04: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
bergquist
91a1a823e2
feat(alerting): add basic tables for alerting definitions
2016-04-13 10:33:45 +02:00
Torkel Ödegaard
47bba71d7f
fixed update check
2016-04-12 10:28:32 -04:00
Torkel Ödegaard
e7626befc5
updated version
2016-04-12 10:17:39 -04:00
Torkel Ödegaard
51aed2dbc6
Merge branch 'master' of github.com:grafana/grafana
2016-04-11 21:11:08 -04:00
Torkel Ödegaard
497e9343aa
Merge branch 'pluginlist'
2016-04-11 21:10:54 -04:00
Torkel Ödegaard
6ce934f1dd
feat(pluginlist): worked on plugin list
2016-04-11 20:33:58 -04:00
Torkel Ödegaard
f1ff044967
Merge branch 'master' of github.com:grafana/grafana
2016-04-11 18:16:57 -04:00
Torkel Ödegaard
9c14b9672f
fix(): admin stats and postgres
2016-04-11 18:16:35 -04:00
Torkel Ödegaard
f93b039e42
change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases
2016-04-11 18:05:28 -04:00
Torkel Ödegaard
3849b59627
feat(updates): changed to new api
2016-04-11 17:16:52 -04:00
bergquist
a5eda6a87b
feat(cli): detects plugin folder for dev env
...
closes #4572
2016-04-11 22:32:46 +02:00
Torkel Ödegaard
c518fdc155
Merge branch 'updatecheck' into pluginlist
2016-04-11 13:43:29 -04:00
Torkel Ödegaard
ab34b174f9
Added update notice to plugin list
2016-04-11 13:42:52 -04:00
Torkel Ödegaard
6ac3bd4c7c
feat(): update checks starting to work
2016-04-11 12:47:04 -04:00
Torkel Ödegaard
b4a8c227cc
feat(update checks): started work on update checks
2016-04-11 12:21:48 -04:00
bergquist
eeb7524c0f
feat(cli): improve helptext for cli
2016-04-11 14:50:34 +02:00
bergquist
2fd25f0093
feat(cli): add uninstall alias for remove
2016-04-11 14:49:12 +02:00
Torkel Ödegaard
8047f902a5
stats(): updated stats
2016-04-10 18:36:54 -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
bergquist
583c0f09a8
feat(cli): adds better support for plugin folder in dev
2016-04-08 11:59:45 +02:00
Torkel Ödegaard
9b30634217
fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558
2016-04-05 11:24:21 -04:00
bergquist
676e950fa3
fix(cli): improve error message for not using sudo
...
closes #4562
2016-04-05 15:37:09 +02:00
Torkel Ödegaard
43ebc172cb
fix(profile): fixed change password link and page, fixes #4542
2016-04-04 13:52:41 -04:00
Torkel Ödegaard
cab859a0e4
Merge branch 'master' into preferences
2016-04-03 05:33:11 -07:00
Torkel Ödegaard
a2c6469d41
fix(): A Datasource with null jsonData would make Grafana fail to load page, fixes #4536
2016-04-03 05:32:15 -07: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
Anthony Woods
036f407d6a
gofmt
2016-03-29 16:04:24 +08:00
Anthony Woods
2c60dbd4fb
handle errors when requesting plugin list. fixes #4494
2016-03-29 15:35:08 +08:00
Torkel Ödegaard
1e44ee9e9b
feat(grafana-cli): minor changes
2016-03-28 21:42:26 +02:00
Torkel Ödegaard
b3bda2aa64
Merge branch 'master' of github.com:grafana/grafana
2016-03-28 20:44:54 +02:00
Anthony Woods
776af45c09
update default repo url in grafana-cli
2016-03-28 23:36:27 +08:00
Torkel Ödegaard
14326b626e
ux(): checkbox now works in dark and white theme
2016-03-28 13:10:42 +02:00
Torkel Ödegaard
f27ce7e1e4
Merge pull request #4461 from dfwarden/ldap_nested_groups
...
LDAP Nested Groups
2016-03-28 11:19:28 +02:00
Torkel Ödegaard
b7d198793f
refactor(): minor refactoring of #4455
2016-03-23 15:09:48 +01:00
David Warden
87aca5bf1b
new config option for source of %s in group_search_filter, useful for nested LDAP groups
2016-03-23 08:21:25 -04: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
bergquist
14df3c6249
feat(cli): use built in envvar support
2016-03-21 10:11:08 +01:00
bergquist
7f8643efde
feat(cli): make all plugin commands subcommands
2016-03-21 10:01:07 +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
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
Torkel Ödegaard
e63ff1c762
feat(dataproxy): set flush interval, need a setting for this
2016-03-19 11:09:26 +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
Torkel Ödegaard
9ddf22ea93
Merge branch 'master' into websocket
2016-03-17 10:16:05 +01:00
Torkel Ödegaard
b2fe7e518f
ux(): added specific fallback logos for plugin depending on type, polished layout selector style
2016-03-17 10:15:16 +01: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
0f6579801d
Merge branch 'master' into websocket
...
Conflicts:
public/app/core/core.ts
2016-03-16 15:19:32 +01:00
Torkel Ödegaard
fcaf2bfdba
fix(datasource): when addding data source withCredentials did not get set, fixes #4389
2016-03-16 15:16:28 +01:00
Torkel Ödegaard
4144f71e23
Merge branch 'datasource-lists-cards'
2016-03-16 15:05:46 +01:00
bergquist
1a11f1e8c6
Merge branch 'master' into cli_colors
2016-03-16 14:17:35 +01:00
bergquist
a12f5376b5
feat(cli): adds some colors to ls command
2016-03-16 14:09:30 +01:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01: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
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
Carl Bergquist
0b3ccaff27
Merge pull request #4361 from bergquist/remove_staticRoot
...
plugin.json: remove staticRoot field
2016-03-15 10:07:08 +01:00
Torkel Ödegaard
b273cd1339
Merge branch 'master' into websocket
2016-03-15 09:52:36 +01:00
Torkel Ödegaard
82eb32a71e
ux(): initial pass at new card / list design, #4364
2016-03-15 09:15:24 +01:00
bergquist
e905c2c6b5
feat(plugin.json): remove staticRoot field
2016-03-15 09:00:55 +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
2adc4d12be
feat(live): work on websocket data source, #3455
2016-03-14 13:20:55 +01:00
Torkel Ödegaard
8d7b7009c3
Merge branch 'master' into websocket
2016-03-14 12:01:43 +01:00
Torkel Ödegaard
ca5a34ad1e
fix(datasource): filter out built in data sources from data source type dropdown
2016-03-14 12:00:56 +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
2527289e3e
Merge branch 'master' of github.com:grafana/grafana
2016-03-13 19:21:56 +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
bergquist
8e70e9c1c3
feat(cli): improve error message for missing permission
2016-03-13 11:29:43 +01:00
Torkel Ödegaard
d575a5ce12
feat(plugins): added prometheus dashboard to prometheus data source, #4298
2016-03-12 10:40:55 +01:00
Torkel Ödegaard
53dc145ce7
Merge branch 'dashboard-install'
2016-03-12 10:13:59 +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
3fb0b71822
refactor(): refactoring json usage
2016-03-12 00:13:06 +01:00
Torkel Ödegaard
40b2f00dc5
fix(): fixed from db -> json
2016-03-11 23:39:42 +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
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08:00
bergquist
740478344b
Merge branch 'master' into cli_colors
2016-03-11 14:43:12 +01:00
bergquist
5094c1db2a
feat(cli): improves error message for 401 requests
2016-03-11 14:34:48 +01:00
bergquist
f5bb2b11e5
feat(cli): improve error handling for missing plugin dir
2016-03-11 14:11:25 +01:00
bergquist
8da702c2e7
feat(cli): add grafana net url
2016-03-11 13:59:09 +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
bergquist
69013ef8ad
Merge branch 'master' of github.com:grafana/grafana
2016-03-11 08:35:24 +01:00
Mitsuhiro Tanda
2c5abed2f1
(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs
2016-03-11 12:11:01 +09:00
Torkel Ödegaard
60adcedebe
feat(plugins): worked on plugin dashboard import handling
2016-03-10 19:57:48 +01:00
bergquist
95de5f6fe1
feat(cli): adds some amazing colors
2016-03-10 17:33:44 +01:00
bergquist
788aafff3c
feat(cli): disable dependecy downloads until needed
2016-03-10 17:16:01 +01:00
bergquist
c09d506245
feat(navigation): hide new and import for viewers
...
closes #4326
2016-03-10 16:38:16 +01:00
bergquist
fee0745e98
feat(cli): support for asking grafana net about plugins
2016-03-10 16:25:34 +01:00
bergquist
43073da7eb
feat(renderer): add timeout for the renderer api
...
closes #4325
2016-03-10 16:02:10 +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
bergquist
6670e6cd29
feat(cli): allow redirect for plugin-repo.json
2016-03-09 16:10:46 +01:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
Torkel Ödegaard
74ebc2d3b0
Merge branch 'master' of github.com:grafana/grafana
2016-03-08 15:32:15 +01:00
bergquist
95f3e52064
feat(cli): use commandline object all the way
2016-03-08 14:54:18 +01:00
bergquist
2fcb8b849e
style(cli): fixed typos
2016-03-08 14:30:25 +01:00
bergquist
d7a72e30c0
gofmt
2016-03-08 13:29:42 +01:00
bergquist
f397d0ddd7
fix(cli): retry download when panicing
...
Will retry to download plugins once if the zip lib panics.
closes #4068
2016-03-08 13:16:58 +01:00
utkarshcmu
f20f4d130b
Pulled out the common code
2016-03-08 02:51:03 -08:00
Torkel Ödegaard
f80c2406a8
feat(plugins): remove app bundled plugins from plugins list
2016-03-08 11:29:36 +01:00
utkarshcmu
1a39d93b4e
Implemented GetDataSourceByName API
2016-03-08 01:54:10 -08:00
Torkel Ödegaard
d2aaa2211e
fix(plugins): fixed failing unit tests, fixes #4280
2016-03-07 21:45:49 +01:00
Torkel Ödegaard
4cd4ce504d
feat(plugins): worked on markdown support for plugin page, #4275
2016-03-07 18:03:45 +01:00
Torkel Ödegaard
a6c6b00d7e
Merge branch 'master' of github.com:grafana/grafana
2016-03-07 17:26:57 +01:00
Torkel Ödegaard
2a557f67d2
Do not set remember me cookie when days are set to zero
2016-03-07 17:26:31 +01:00
bergquist
1a6af064b0
fix(cli): improve logging when folders does not exists
2016-03-07 16:41:22 +01:00
bergquist
7ef62d28a5
feat(cli): add logging to catch panics
2016-03-07 16:11:28 +01:00
Torkel Ödegaard
135679096b
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:31:17 +01:00
bergquist
1ff428087e
feat(cli): add suppot for plugindir as environment variable
2016-03-07 14:20:51 +01:00
bergquist
f6c5242a93
feat(cli): make repo url a parameter
...
this is a quick hack to support repo url as parameter. Will refactor
later
2016-03-07 13:29:45 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
utkarshcmu
9c8d508247
Made API handling better, removed unused components
2016-03-06 12:32:22 -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
1ef332e82c
preferences UI poc
2016-03-05 23:44:56 -08:00
utkarshcmu
cf926134ef
Added savePreferencesAPI
2016-03-05 13:15:49 -08:00
bergquist
dd7e215e78
feat(dashslist): make sure dashbords exists in recently viewd dashboards
...
closes #4249
2016-03-05 12:27:37 +01:00
Torkel Ödegaard
35fc5007c8
Merge pull request #4251 from utkarshcmu/pref-migrations
...
Preferences table migration
2016-03-04 10:46:13 +01:00
utkarshcmu
ac499b3aff
Minor Pre-PR fixes
2016-03-04 01:29:46 -08:00
Torkel Ödegaard
fc877ae0f4
poc(websockets): websocket poc
2016-03-03 23:05:08 +01:00
utkarshcmu
662579e9a9
Added preferences migrations
2016-03-03 02:08:51 -08:00
bergquist
00dd0e8a9d
fix(plugins): fixes missed dist loading for plugindir
...
closes #4230
2016-03-03 11:04:26 +01:00
bergquist
4c83dba183
go fmt....
2016-03-02 17:32:54 +01:00
bergquist
eb79436ab7
feat(plugins): mounts dist folder if exists in plugin
...
closes #4230
2016-03-02 15:13:19 +01:00
Tom Dyas
d557beb5f1
redact settings containing 'secret' besides 'password'
...
Ensure that settings with the word 'secret' in the name are redacted just
as ones with 'password' in the name are. For example, the Google Auth
client secret should be redacted now.
2016-03-01 13:50:45 -05:00
Anthony Woods
91ca5b6f2a
Merge pull request #4208 from raintank/suppressNav
...
add supressNav property to plugin pages.
2016-03-01 20:56:31 +08:00
bergquist
00dc078311
feat(playlist): render playlists if playlist id is invalid
...
close #4209
2016-03-01 13:50:55 +01:00
