IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,535 Commits 892 Branches 731 Tags
8dd118bd8659f178326e95afa5e64fbb97ddf02d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 8dd118bd86 updated 2016-01-20 09:45:24 +01:00
Torkel Ödegaard 3e3b996963 feat(plugin): experimental work on plugin architecture 2016-01-19 21:57:58 +01: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 6b85a6fd78 feat(apps): minor design update for apps view 2016-01-19 11:54:35 +01:00
Torkel Ödegaard 510a21195a feat(influxdb): support for policy selection in query editor, closes #2018 2016-01-18 18:38:36 +01:00
Torkel Ödegaard 3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
Torkel Ödegaard 1d4803cff0 fix(singlestat): fixed issue with singlestat and drilldown link introduced in recent commit, fixes #3777 2016-01-18 16:18:04 +01:00
Torkel Ödegaard 6fc972ab1e feat(playlists): merge sync with RP 2016-01-18 16:05:38 +01:00
Torkel Ödegaard 66eebd1ac3 refactor(playlist): refactor of playlist feature, and PR #3776 2016-01-18 16:01:14 +01:00
Torkel Ödegaard 4ff7b0f49b Merge branch 'playlist_reload' of https://github.com/bergquist/grafana into bergquist-playlist_reload 2016-01-18 14:51:54 +01:00
Torkel Ödegaard 1e06f3f5f4 Merge branch 'master' of github.com:grafana/grafana 2016-01-18 12:19:54 +01:00
Torkel Ödegaard 00802d035a refactor(): refactoring submenu to directive 2016-01-18 12:19:46 +01:00
Torkel Ödegaard edcef7d078 fix(graph): fixed for graph series color selector popover, broken in recent 3.0-pre1 build, fixes #3774 2016-01-18 12:12:05 +01:00
Torkel Ödegaard 1adb7b286c updated 2016-01-18 07:28:01 +01:00
Torkel Ödegaard 30c19d525e ux(): minor page rename 2016-01-17 20:32:37 +01:00
Torkel Ödegaard 8161a0943d ux(password): minor fix for change password page 2016-01-17 20:16:39 +01:00
Torkel Ödegaard a8e3f731b7 feat(influxdb): began work on influxdb policy selector 2016-01-17 17:53:38 +01:00
Torkel Ödegaard 0cb68b86fc refactor(): minor change 2016-01-17 17:24:10 +01:00
Torkel Ödegaard 723be4f612 refactoring(): unified dashboard top nav to a single dashnav component, uses new navbar component 2016-01-17 11:34:51 +01:00
Torkel Ödegaard 070af40487 refactor(): began refactoring topnav directive to be more like the new style of components, and also make it usable on all pages including dashboard 2016-01-16 23:26:29 +01:00
Torkel Ödegaard 0a58404584 fix(build): minor build script fix, fixes #3756 2016-01-16 19:16:49 +01:00
Torkel Ödegaard c201f4c63e feat(sidemenu): added handling of click outside to hide sidemenu, also refactored grafana_ctrl to a more general grafana component 2016-01-16 18:55:13 +01:00
Torkel Ödegaard 317b5e6d86 fix(sidemenu): fixed issue with new sidemenu in optimized build, #3687 2016-01-16 16:17:29 +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 7ad72ba905 ux(): minor style fixes to pages 2016-01-15 15:51:30 +01:00
Torkel Ödegaard 36e8af05a2 ux(more style updates) 2016-01-15 15:05:13 +01:00
Torkel Ödegaard 2bfded3c5f ux(): general ux polish 2016-01-15 14:42:59 +01:00
Torkel Ödegaard 842a59535d feat(sidenav): more polish to new sidenamv 2016-01-15 13:20:32 +01:00
Torkel Ödegaard d4e1a715eb fix(datasources): many datasources did not work in optimized build due to missing ngInject comment 2016-01-15 12:51:55 +01:00
Torkel Ödegaard 954c0e9fae Merge branch 'master' into new-nav 2016-01-15 11:23:22 +01:00
Torkel Ödegaard f6a3b53fb5 fix(firefox): fixed js issue that made master build break in firefox 2016-01-15 11:23:08 +01:00
Torkel Ödegaard dfcb82d233 feat(sidenav): more work on new side nav 2016-01-15 11:13:02 +01:00
Torkel Ödegaard aa9a92d2e0 poc(new nav): added new menu button to other pages that dashboard 2016-01-14 22:30:39 +01:00
Torkel Ödegaard 4f227ae92e poc(new sidenav/topnaav) 2016-01-14 22:26:41 +01:00
Torkel Ödegaard cd0256d40d poc(new nav): beginings.... 2016-01-14 21:20:56 +01:00
Torkel Ödegaard 2ccc19185c fix(text panel): fix for text panel in optimized builds, introduced in recent commit due to plugin api changes 2016-01-14 19:14:02 +01:00
Torkel Ödegaard b4d595e561 feat(plugins): updated changelog with notice about plugin api changes 2016-01-14 19:01:13 +01:00
Torkel Ödegaard 88a132b878 Merge branch 'dynamic-directives' 2016-01-14 18:57:34 +01:00
Torkel Ödegaard b5726a8d5a feat(plugins): completed upgrade of all built in panels 2016-01-14 18:57:02 +01:00
Torkel Ödegaard 1d9ad9be33 feat(plugins): upgraded singlestat to new plugin format 2016-01-14 17:20:50 +01:00
Torkel Ödegaard a233570777 feat(plugins): upgraded opentsdb and prometheus to new plugin module return format 2016-01-14 16:01:17 +01:00
Torkel Ödegaard 6fae264222 feat(plugins): upgraded influxdb to new plugin format 2016-01-14 15:35:14 +01:00
Torkel Ödegaard 8699d49f93 feat(plugins): updated cloudwatch to new plugin style 2016-01-14 15:15:45 +01:00
Torkel Ödegaard c4ce3293a2 feat(plugins): now solved all cases of loading plugin directives, now just have to upgrade all panels and data sources 2016-01-14 14:37:04 +01:00
Torkel Ödegaard dbafc8c9db feat(plugins): work on plugin directive loading 2016-01-14 13:21:05 +01:00
Torkel Ödegaard 6c6c3a5081 feat(plugins): more work on how plugins expose directives 2016-01-14 12:35:31 +01:00
Torkel Ödegaard d420cb38d1 feat(plugins): work on plugin directives loading 2016-01-14 11:21:56 +01:00
Torkel Ödegaard b55f8215ec feat(apps): work on plugin directives loading 2016-01-13 22:31:29 +01:00
Torkel Ödegaard 08caf4bbde feat(tslint): more tslint work 2016-01-13 21:22:39 +01:00
Torkel Ödegaard 59c928acc2 feat(tslint): added more tslint rules 2016-01-13 21:07:57 +01:00
Torkel Ödegaard 8ff48c126a fix(merge): minor merge fix 2016-01-13 15:51:47 +01:00
Torkel Ödegaard 6da3af5e89 Merge branch 'new_macaron' 2016-01-13 15:48:49 +01:00
Torkel Ödegaard 77c362af8d fix(sidemenu): added missing login link 2016-01-13 15:48:12 +01:00
Torkel Ödegaard 2cf0dc2cb2 fix(gofmt): fixed non formated go file 2016-01-13 15:43:32 +01:00
Torkel Ödegaard bdb67d4909 fix(build): fixed dependency and build issue 2016-01-13 15:38:54 +01:00
Torkel Ödegaard 49fdf8427a fix(png rendering): removed --ssl-protocol=any phantomjs param 2016-01-13 15:07:03 +01:00
Torkel Ödegaard 534bc83173 temp work on dynamic directives 2016-01-13 14:03:50 +01:00
Torkel Ödegaard 87f6d7da11 Merge branch 'master' of github.com:grafana/grafana 2016-01-13 13:57:37 +01:00
Torkel Ödegaard cdd341af64 feat(packaging): added Restart=on-failure to systemd service spec file 2016-01-13 13:57:22 +01:00
Torkel Ödegaard ed989ecc8d Merge branch 'master' of github.com:grafana/grafana 2016-01-13 10:40:58 +01:00
Torkel Ödegaard a147015e96 fix(playlists): fixed url in playlist view when using sub url, fixes #3711 2016-01-13 10:36:00 +01:00
Torkel Ödegaard a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 2016-01-12 20:05:40 +01:00
Torkel Ödegaard 44f0242157 fix(build): fixed issue after merge 2016-01-12 15:45:55 +01:00
Torkel Ödegaard e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard a15984b663 feat(apps): pages work 2016-01-12 15:39:29 +01:00
Torkel Ödegaard 4c59e48cc2 feat(apps): worked on apps edit view styles 2016-01-12 12:25:07 +01:00
Torkel Ödegaard ae6cae0771 Merge branch 'master' of github.com:grafana/grafana 2016-01-12 10:32:49 +01:00
Torkel Ödegaard 2b99b64ec5 fix(table panel): fixed issue with table panel in optimized builds, closes #3702 2016-01-12 10:32:19 +01:00
Torkel Ödegaard ffe1407217 feat(apps): minor progress 2016-01-12 10:20:04 +01:00
Torkel Ödegaard 2fe58461d5 feat(apps): minor fix for images 2016-01-11 22:51:40 +01:00
Torkel Ödegaard e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
Torkel Ödegaard 882980ada7 changelog: updated with info about #3635 2016-01-11 16:39:22 +01:00
Torkel Ödegaard 66f7a2be15 Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation 2016-01-11 16:35:45 +01:00
Torkel Ödegaard 4da31291d2 feat(apps): minor progress to apps list 2016-01-11 10:44:04 +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 ab79348af5 feat(plugins): minor fix for external plugins with staticRoot 2016-01-09 23:56:39 +01:00
Torkel Ödegaard d83e24572a feat(plugins): more refactoring 2016-01-09 23:52:13 +01:00
Torkel Ödegaard 1ffcea1952 feat(plugins): major improvement in plugins golang code 2016-01-09 23:34:20 +01:00
Torkel Ödegaard 35f40b7312 feat(plugins): upgraded opentsdb 2016-01-09 21:54:03 +01:00
Torkel Ödegaard b76449d151 feat(plugins): upgraded influxdb to new data source plugin model 2016-01-09 21:42:26 +01:00
Torkel Ödegaard 15546dd84e feat(plugins): added better error message when trying to load data source plugin module that is missing datasource constructor 2016-01-09 19:14:59 +01:00
Torkel Ödegaard ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial 2016-01-09 19:03:03 +01:00
Torkel Ödegaard 36ebfc747a feat(plugins): more upgrading work 2016-01-09 18:44:13 +01:00
Torkel Ödegaard bc328cbed7 feat(plugins): upgraded Cloudwatch to new plugin schema 2016-01-09 18:36:25 +01:00
Torkel Ödegaard 7ae81a2195 feat(plugins): annotations view work again for elasticsearch 2016-01-09 18:20:43 +01:00
Torkel Ödegaard cf98a16db0 feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json 2016-01-09 18:07:42 +01:00
Torkel Ödegaard f813b4c58f feat(plugins): converted graphite plugin to new format 2016-01-09 13:30:02 +01:00
Torkel Ödegaard c5635f9c89 feat(plugins): changed what datasources should return, they should now return the datasource constructor 2016-01-09 13:21:16 +01:00
Torkel Ödegaard d932653c7f feat(apps): minor progress on apps edit view 2016-01-09 11:07:34 +01:00
Torkel Ödegaard 9943b9a226 feat(plugin): more work on plugin schema 2016-01-09 08:12:27 +01:00
Torkel Ödegaard 3bb20dbf2e feat(plugins): changed plugin schema, pluginType -> type, type -> id 2016-01-08 23:15:44 +01:00
Torkel Ödegaard 7a8b3c419b feat(apps): lots of progress 2016-01-08 20:57:58 +01:00
Torkel Ödegaard 60e7c6d150 Merge branch 'master' into apps 
Conflicts:
	public/app/partials/sidemenu.html
 2016-01-08 18:10:53 +01:00
Torkel Ödegaard a9aaa5ad73 Merge branch 'master' of github.com:grafana/grafana 2016-01-08 18:01:20 +01:00
Torkel Ödegaard 6c1fee736b feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687 2016-01-08 17:58:46 +01:00
Torkel Ödegaard f81d2595f9 Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation 2016-01-08 16:29:10 +01:00
Torkel Ödegaard 183f32390c Merge pull request #3683 from mtanda/cloudwatch_reuse_credentials 
(cloudwatch) reuse credentials
 2016-01-08 16:25:27 +01:00
Torkel Ödegaard f67563e9ee feat(apps): moving things around 2016-01-08 12:45:12 +01:00
Torkel Ödegaard 3362d6bc56 Merge branch 'docs-2.6' 2016-01-08 10:25:20 +01:00
Torkel Ödegaard e5f391ab53 docs: minor change to docs make file 2016-01-08 10:24:58 +01:00