IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,523 Commits 5,114 Branches 538 Tags 1.9 GiB
f5bb2b11e5
Commit Graph

494 Commits

Author SHA1 Message Date
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
Mitsuhiro Tanda
2c5abed2f1 (cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs 2016-03-11 12:11:01 +09:00
bergquist
c09d506245 feat(navigation): hide new and import for viewers 
closes #4326
 2016-03-10 16:38:16 +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
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
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
2a557f67d2 Do not set remember me cookie when days are set to zero 2016-03-07 17:26:31 +01:00
Torkel Ödegaard
135679096b feat(plugins): progress on plugin details page, # 4275 2016-03-07 14:31:17 +01:00
bergquist
dd7e215e78 feat(dashslist): make sure dashbords exists in recently viewd dashboards 
closes #4249
 2016-03-05 12:27:37 +01: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
Anthony Woods
74949d306f add supressNav property to plugin pages. 
This allows pages to be registered that dont show up in the
Navigation menu when the App is pinned.
 2016-03-01 18:07:51 +08:00
Peggy Li
773a5631c5 Fix typo in function name 2016-02-29 10:52:57 -08:00
Anthony Woods
35f7a71f9a fix app->plugin renamin in more places 2016-02-29 19:54:36 +08:00
Anthony Woods
4741152f05 correct path for app page links. 2016-02-29 19:37:35 +08:00
Torkel Ödegaard
bd2e1ef67e feat(plugins): fixed failing api test 2016-02-26 20:27:29 +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
bergquist
75454b02c0 fix(dataproxy): remove partially used cache 
closes #4044
 2016-02-23 13:05:47 +01:00
Carl Bergquist
f788c8cb37 Merge pull request #3632 from mtanda/cloudwatch_annotation_describe_alarms 
(cloudwatch) multiple CloudWatch alarm annotation support
 2016-02-23 07:41:10 +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
c94659f552 ux(color popover): refactored color popover to use drop lib 2016-02-22 18:46:58 +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
4ab041f79e ux(): added sass linter, almost no rules enabled yet 2016-02-20 18:31:09 +01:00
Matt
1144988443 Merged trent's styles and added admin submenu 2016-02-19 22:00:29 -05:00
Torkel Ödegaard
2f2326006d Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory 2016-02-18 13:37:31 +01:00
bergquist
d183c11e69 feat(cloudwatch): add more metrics for Route53 
Thank you https://github.com/aruetten for helping
us find the new metrics

closes #4053
 2016-02-18 13:09:50 +01:00
Dmitry Smirnov
3fd6ae597d minor spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-16 12:12:04 +11:00
bergquist
da8782a9d0 remove unused imports 2016-02-15 10:34:47 +01:00
bergquist
d523d45124 fix(playlist): dont swallow errors 2016-02-15 10:09:15 +01:00
Torkel Ödegaard
e32ee9f02e ux(admin): admin pages overhaul 2016-02-14 17:37:05 +01:00
Torkel Ödegaard
6cdc1e4d37 feat(ux): minor tweaks and fixes, added hover submenu dropdowns 2016-02-12 11:21:42 +01:00
Torkel Ödegaard
e7a202fe4d Merge branch 'master' into style-changes-bulletfactory 2016-02-12 10:14:06 +01:00
Torkel Ödegaard
53f5cb6553 fix(api): org name taken error now returns HTTP status code 409, closes 2016-02-12 10:01:52 +01:00
Torkel Ödegaard
2ea548850e Merge branch 'master' into style-changes-bulletfactory 
Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less
 2016-02-11 21:23:54 +01:00
Mitsuhiro Tanda
81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
Trent White
ff913333a2 update sidebar 2016-02-11 09:53:48 -05:00
Torkel Ödegaard
37c6a1ddf0 feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template 2016-02-10 16:43:35 +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
f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00