IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 12:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,728 Commits 5,105 Branches 538 Tags 1.9 GiB
4871a8f43e
Commit Graph

964 Commits

Author SHA1 Message Date
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
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
Anthony Woods
a8c10dbc08 update json field name of suppressNav 2016-03-01 18:17:40 +08: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
bergquist
77f93886da fix(cli): add latest version to list-remote command 
closes #4205
 2016-03-01 10:55:59 +01:00
Peggy Li
773a5631c5 Fix typo in function name 2016-02-29 10:52:57 -08:00
Torkel Ödegaard
d3c022f89e Merge branch 'master' of github.com:grafana/grafana 2016-02-29 13:43:18 +01:00
Torkel Ödegaard
56c080417a fix(logging): only log to xorm.log when in dev mode, fixes #4182 2016-02-29 13:42:07 +01: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
Robert McLeod
4c3048964d removed unused import: errors 2016-02-19 16:09:40 +13:00
Robert McLeod
cacf14a41e Fixed bug that wasn't showing the StaticRootPath when validation failed 2016-02-19 16:00:51 +13: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
Dieter Plaetinck
5d7d165be5 allow setting level on logger. 
performance workaround, see https://github.com/grafana/grafana/issues/4055
 2016-02-18 16:46:47 +11:00
bergquist
6a7e9134a5 fix(renderer): add .exe for phantomjs on windows 
closes #3657
 2016-02-16 10:12:17 +01:00
Carl Bergquist
3f0679896b Merge pull request #4037 from grafana/cmd 
Move grafana/grafana-cli into grafana/grafana
 2016-02-16 09:31:15 +01:00
bergquist
4131d8b57a feat(cli): add command for upgrading one plugin 2016-02-16 08:49:27 +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
ea9ac0d2d2 chore(cli): improve unittests 2016-02-15 18:32:36 +01:00
bergquist
746257710b fix(cli): align code with core grafana 2016-02-15 16:11:37 +01:00
bergquist
5adac86b43 fix(cli): remove dev text values 2016-02-15 14:19:59 +01:00
bergquist
d59beec354 feat(cli): move cli into main repo 2016-02-15 14:09:34 +01:00
bergquist
6e7813f2f8 feat(build): move grafana into grafana-server 2016-02-15 11:15:38 +01: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
b5dc1727d2 fix(postgres): If password or user is empty use empty quotes for connection string, #3985 2016-02-12 10:10:07 +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
257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 2016-02-10 11:03:12 +01:00
Torkel Ödegaard
baff9b0267 feat(apps): lots of work making apps easier to develop, module paths are handled automatically 2016-02-09 22:10:36 +01:00
Torkel Ödegaard
fe2e6b8a80 feat(apps): began work on support for apps that contain data sources 2016-02-09 18:37:08 +01:00
Torkel Ödegaard
fb74ebb4ea :Merge branch 'master' of github.com:grafana/grafana 2016-02-09 18:17:43 +01:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
woodsaj
f953033ba7 add support for screenshots in plugins. 
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
 2016-02-09 22:36:42 +08: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
Torkel Ödegaard
18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
Torkel Ödegaard
99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00