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
Carl Bergquist
412e7bcdae
Merge pull request #3664 from utkarshcmu/recorded
...
Improvized dashboard sorting UI
2016-01-07 10:19:13 +01:00
Carl Bergquist
3b65fc0107
Merge pull request #3665 from utkarshcmu/recorded2
...
Better heading
2016-01-07 10:14:40 +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
utkarshcmu
6a9f451091
Better heading
2016-01-06 22:50:25 -08:00
utkarshcmu
a559d59d80
Improvized dashboard sorting
2016-01-06 22:13:22 -08:00
Carl Bergquist
de20a8930e
Merge pull request #3649 from nikita-graf/playlist-sort
...
Playlist dashboards sort
2016-01-06 13:38:50 +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
nikita-graf
3fabd2ea1b
basic playlist dashboards sort support
2016-01-06 02:05:23 +03:00
bergquist
5de69b288f
feat(singlestat): make sparkline height dynamic
...
closes #3553
2016-01-05 19:21:12 +01:00
Carl Bergquist
5eea02b17a
Merge pull request #3634 from nikita-graf/dashboard-remove-playlist-sync
...
Playlist improvements
2016-01-05 10:07:48 +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
nikita-graf
ee400df930
remove dashboard from playlist when its destroyed
2016-01-05 04:14:39 +03: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
bergquist
be1fb13162
feat(playlist): minor ux changes for playlists
2016-01-04 15:11:05 +01:00
bergquist
aa83dc15e2
feat(playlist): add search result count
2016-01-04 14:23:24 +01:00
bergquist
7c482064df
feat(playlist): improve header
2016-01-04 10:16:00 +01:00
bergquist
c93a3ce227
feat(playlist): make default timespan placeholder
2016-01-04 09:17:47 +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
3d60d0dfa5
Merge pull request #3613 from utkarshcmu/recorded
...
Made Playlist UI user friendly
2015-12-29 11:33:19 +01:00
utkarshcmu
b68df56b03
Made Playlist UI user friendly
2015-12-28 04:24:38 -08:00
Carl Bergquist
6fbba13ab3
Merge pull request #3611 from utkarshcmu/recorded
...
Playlist enhancements
2015-12-28 10:40: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
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08: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
utkarshcmu
71febeb71f
Playlist can be run without saving too
2015-12-23 02:38:27 -08:00
utkarshcmu
a292aedd9c
Made playlist URL clickable
2015-12-23 02:15:28 -08:00
utkarshcmu
b58e605b99
Added play button
2015-12-23 02:02:48 -08:00
utkarshcmu
7776803890
Removed unused components
2015-12-23 01:46:23 -08: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
