root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 30 Packages Projects Releases Wiki Activity
5,334 Commits 1,401 Branches 636 Tags 2.5 GiB
Commit Graph

5334 Commits

Author SHA1 Message Date
Torkel Ödegaard 69d0e82453 Merge branch 'master' into apps 
Conflicts:
	pkg/services/sqlstore/migrations/migrations.go
 2016-01-08 10:20:46 +01:00
Torkel Ödegaard 8a2af9b818 Merge branch 'v2.6.x' 2016-01-07 22:00:21 +01:00
Torkel Ödegaard 255901ca7c fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554 2016-01-07 21:59:55 +01:00
Torkel Ödegaard 52644bb28a fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs 2016-01-07 20:52:48 +01:00
bergquist 7cad3c89d3 Merge branch 'hcooper-hover-order' 2016-01-07 18:10:42 +01:00
bergquist bcdddfe4e8 style(tooltip): removed comment and extrated sort 2016-01-07 18:09:51 +01:00
bergquist c4ca1444f9 Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order 2016-01-07 17:43:04 +01:00
bergquist f5565d4814 docs(changelog): add note about ssl support for mysql 2016-01-07 17:39:25 +01:00
bergquist f20ee6b482 Merge branch 'improbable-io-ssl-for-mysql' 2016-01-07 17:09:14 +01:00
bergquist 6c8d084664 Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql 2016-01-07 17:08:31 +01:00
bergquist 5792a16222 fix(plugins): removes warnings for missing folder 
Remove warnings when scanning for plugins in the default
catalog data/plugins

closes #3663
 2016-01-07 08:51:31 +01:00
bergquist 9343b0378d feat(plugins): adds warn log for scanning folders 
symlinks outside to plugin folder can cause problems.
This commit makes sure to warn about it in the logs
 2016-01-06 11:57:17 +01:00
bergquist 5de69b288f feat(singlestat): make sparkline height dynamic 
closes #3553
 2016-01-05 19:21:12 +01:00
Carl Bergquist 5c0812ab6f Merge pull request #3636 from henridf/docs-es-filter-in-template 
Docs: add example with filter in ES template
 2016-01-05 08:58:26 +01:00
Henri DF 5af3fe93f2 Docs: add example with filter in ES template 2016-01-04 21:48:47 -08:00
Carl Bergquist 09b8401324 Merge pull request #3624 from mtanda/prometheus_link_fix 
(prometheus) fix Prometheus link
 2016-01-04 17:43:55 +01:00
Carl Bergquist 03c10ef885 Merge pull request #3626 from aqnouch/patch-1 
Updated copyright to 2016
 2016-01-04 07:54:22 +01:00
AQNOUCH Mohammed cc1ed98fc4 Updated copyright to 2016 2016-01-01 01:30:43 +00:00
Mitsuhiro Tanda ebf0bd5fc9 fix end time of Prometheus link 2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda be48caf59f fix Prometheus link, expand template variable in expression 2015-12-31 16:05:04 +09:00
Qtax c0cf0cb802 Added an option to set a min-width for the graphs side table/area. 2015-12-29 14:42:52 +01:00
Carl Bergquist 311624beaa Merge pull request #3598 from eddawley/ISSUE-2818 
Fixes #2818.  Adds support for mysql backends via unix sockets
 2015-12-28 10:33:49 +01:00
Torkel Ödegaard 69eb62c09f Merge pull request #3597 from eddawley/ISSUE-3461 
Issue 3461: Session table is now created automatically
 2015-12-24 09:59:34 +01:00
Ed Dawley ec36e28368 Small typo in comment 2015-12-23 15:15:59 -06:00
Ed Dawley 4da56b65ab Fixes #2818. Adds support for mysql backends via unix sockets 2015-12-23 15:06:28 -06:00
Ed Dawley cd23ab9955 Issue 3461: Session table is now created automatically 2015-12-23 01:33:46 -06:00
Torkel Ödegaard aa32459bc2 feat(apps): mini update to apps config view 2015-12-22 17:00:21 +01:00
Torkel Ödegaard 41a0995db7 feat(apps): minor progress on app meta data 2015-12-22 16:32:17 +01:00
Daniel Low 3f9f0679ec gofmt 2015-12-22 13:10:34 +00:00
Torkel Ödegaard d1145ed3fb Merge branch 'master' into apps 2015-12-22 13:59:25 +01:00
Torkel Ödegaard f074c1eaff refactor(lodash): changed how lodash is referenced from typescript 2015-12-22 13:59:11 +01:00
Daniel Low ea566fff24 Add TLS for mysql 
Use ssl_mode for mysql and add docs
add docs for the new parameters in config

Tolerate ssl_mode without client authentication

Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
 2015-12-22 12:42:52 +00:00
Torkel Ödegaard b8cb5e0367 feat(apps): WIP progress app views 2015-12-22 13:42:48 +01:00
Torkel Ödegaard 7a87c900ee Merge branch 'master' into apps 2015-12-22 12:41:52 +01:00
Torkel Ödegaard e95170e9fd tech(angularjs): upgrade to angularjs 1.5 2015-12-22 12:24:36 +01:00
Torkel Ödegaard d0dead0a08 feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript 2015-12-22 12:13:55 +01:00
Torkel Ödegaard 71d718a6e2 fix(systemjs): systemjs config fix for plugins 2015-12-22 11:46:41 +01:00
Torkel Ödegaard ad94f99d57 refactor(apps): more WIP work on apps 2015-12-22 11:37:44 +01:00
Carl Bergquist 3dc3d363fd Merge pull request #3581 from bergquist/zoomout_on_doubleclick 
Zoom out on double click in graphs
 2015-12-22 10:04:28 +01:00
bergquist 690a6e1a59 feat(graphs): zoom out on double click 2015-12-22 09:56:24 +01:00
Torkel Ödegaard eacc46da6d feat(plugins): WIP on new apps concept 2015-12-21 23:09:27 +01: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
Torkel Ödegaard c19a2e5b45 fix(influxdb): systemjs fix 2015-12-21 16:48:12 +01:00
Torkel Ödegaard 10a764c4f2 fix(less): minor less fix 2015-12-21 16:42:28 +01:00
Torkel Ödegaard 0a9f705308 tech(systemjs): more fixes for optmized build 2015-12-21 16:34:18 +01:00
Torkel Ödegaard dabd680d6b tech(systemjs): merged sync with master, all tests are passing 2015-12-21 16:13:24 +01:00
Torkel Ödegaard 4522b02925 tech(systemjs): almost all tests are passing 2015-12-21 16:00:58 +01:00
Carl Bergquist fabaf5cc04 Merge pull request #3575 from piotr1212/no_username_in_render_logging 
Fix empty username in http log for /render calls
 2015-12-21 13:31:10 +01:00
Torkel Ödegaard f7888886e9 tech(systemjs): working on getting tests to work 2015-12-21 11:10:16 +01:00
Torkel Ödegaard dfd5413b10 tech(systemjs): worked on making optimized builds work with systemjs builder 2015-12-21 10:02:39 +01:00