Patrick O'Carroll
59cebca4b2
converted influx-series to TS, converted test to jest
2017-11-20 14:31:51 +01:00
Alexander Zobnin
10e3b63ddb
Merge remote-tracking branch 'upstream/develop' into feat-9887
2017-11-20 15:51:49 +03:00
Torkel Ödegaard
6c5e19c1e0
dashboard search
2017-11-20 13:37:26 +01:00
Torkel Ödegaard
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
Ryan McKinley
b1de1e6f26
Move the loading flag to PanelCtrl ( #9929 )
2017-11-20 11:27:18 +01:00
Alexander Zobnin
f54547776d
graph: disable zoom in non-timeseries modes ( #9914 )
2017-11-20 10:06:34 +01:00
Patrick O'Carroll
66e4297816
changed padding to pixels, fixes #9916 ( #9924 )
2017-11-20 10:05:18 +01:00
Maytee Chinavanichkit
c1e5f5be87
Use correct moments format for Showing last us time instead of value test ( #9923 )
...
Fixes this issue:
PhantomJS 2.1.1 (Mac OS X 0.0.0) SingleStatCtrl showing last us time
instead of value should set formatted value FAILED
expected '09/17/2017 4:56:37 pm' to equal '09/17/2017 16:56:37 pm'
2017-11-20 10:00:56 +01:00
Carl Bergquist
3351f959d0
Merge pull request #9913 from tomwilkie/dashboard-json-configmaps
...
Don't import JSON dashboards from hidden directories.
2017-11-20 08:31:05 +01:00
Tom Wilkie
0015183a7b
Don't import JSON dashboards from hidden directories.
2017-11-17 17:21:49 +00:00
Torkel Ödegaard
0fe4229023
Merge branch 'develop' into develop-search
2017-11-17 16:37:09 +01:00
Torkel Ödegaard
8160e68f93
fix: build & tests
2017-11-17 16:18:30 +01:00
Torkel Ödegaard
7b17d134fc
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-17 15:49:47 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Daniel Lee
7c74111187
search: add expanded folders
2017-11-17 15:30:21 +01:00
Torkel Ödegaard
6595be95eb
influxdb: another minor refactor of #9474
2017-11-17 15:23:45 +01:00
Torkel Ödegaard
37409163b9
refactor: refactoring InfluxDB query builder with policy PR #9473
2017-11-17 15:16:36 +01:00
Torkel Ödegaard
bcb52417db
refactor: refactoring InfluxDB query builder with policy PR #9473
2017-11-17 15:16:04 +01:00
Torkel Ödegaard
4b76c6d652
Merge branch 'master' of https://github.com/omki2005/grafana into omki2005-master
2017-11-17 14:57:44 +01:00
Torkel Ödegaard
153a9bf43a
docs: added versions_to_keep to config docs, #9671
2017-11-17 14:53:08 +01:00
Torkel Ödegaard
36c9b7df53
Update CHANGELOG.md
2017-11-17 14:45:38 +01:00
Torkel Ödegaard
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
Torkel Ödegaard
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
Torkel Ödegaard
908be13c03
Update CHANGELOG.md
2017-11-17 13:26:36 +01:00
Torkel Ödegaard
b481ff27b2
Update CHANGELOG.md
2017-11-17 13:22:49 +01:00
Torkel Ödegaard
303e3de488
fix: fix for avatar images when gzip is turned on, fixes #5952
2017-11-17 13:13:58 +01:00
Torkel Ödegaard
7ccc8ae298
elasticsearch: default version to 5.x
2017-11-17 12:23:40 +01:00
Torkel Ödegaard
f591bea696
Merge branch 'graphite-series-by-tags'
2017-11-17 12:15:21 +01:00
Alexander Zobnin
490b8fc50f
panels: add css tweaks for scrollable panels
2017-11-17 12:13:56 +03:00
Alexander Zobnin
a55be07ea5
dashboard history clean up: avoid potential SQL injections
2017-11-17 10:51:50 +03:00
Daniel Lee
f47673ab5c
search: refactor search sql into a builder class
2017-11-17 00:16:33 +01:00
bergquist
fe42f81441
changelog: note about closing #9798
2017-11-16 16:55:02 +01:00
bergquist
0f69e06fcf
removes invalid comment
2017-11-16 16:55:02 +01:00
Carl Bergquist
03c23dd9c1
Merge pull request #9901 from grafana/fix_annotations_api
...
fix: return id from api when creating new annotation, fixes #9798
2017-11-16 16:51:41 +01:00
Marcus Efraimsson
909601d6ab
api: fix so that datasources functions returns Response
2017-11-16 16:29:05 +01:00
bergquist
dcffcbb6d3
changelog: note about closing #1789
2017-11-16 16:21:14 +01:00
Torkel Ödegaard
26577ab600
Merge branch 'master' into graphite-series-by-tags
2017-11-16 16:20:44 +01:00
Marcus Efraimsson
89b27b35ba
fix: Use Response as return type
2017-11-16 16:19:01 +01:00
Marcus Efraimsson
540d540ea9
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
...
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
2017-11-16 16:19:01 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg
...
Datasources as configuration
2017-11-16 16:13:02 +01:00
bergquist
c60915c146
datasources as cfg: adds docs for all jsondata and secure_json fields
2017-11-16 14:22:52 +01:00
Torkel Ödegaard
3ae0cfa1d0
graphite: minor changes
2017-11-16 14:16:37 +01:00
Alexander Zobnin
126f3703dc
text panel: make scrollable
2017-11-16 15:43:04 +03:00
Alexander Zobnin
4b88cc0226
panels: general property which makes panel scrollable
2017-11-16 15:38:52 +03:00
bergquist
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +01:00
Torkel Ödegaard
119f5427af
fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876
2017-11-16 13:06:24 +01:00
Alexander Zobnin
fd046428b4
dashlist: css adjustments for scrollbar
2017-11-16 14:41:42 +03:00
Alexander Zobnin
e89e64e94e
dashlist: fix resizing after mode switching
2017-11-16 14:40:09 +03:00
Alexander Zobnin
7d8b2cb05f
dashlist: add scrollbar
2017-11-16 14:11:01 +03:00
Alexander Zobnin
06622088a1
dashlist: fix panel resizing
2017-11-16 14:10:28 +03:00
