Brandon Arp
cffbcb504d
allow ssl renegotiation for datasources
2017-09-13 16:20:24 -07:00
Daniel Lee
29de6387cb
plugins: add styles for ol tags in markdown
2017-09-13 17:13:53 +02:00
Torkel Ödegaard
a76f3fba2e
docs: minor fixes to images
2017-09-13 17:11:10 +02:00
Patrick O'Carroll
d71456b96f
Docs image updates ( #9225 )
...
* replaced old images and gifs with new ones
* replaced images, changed some text especially for column styles
* replaced and added images and gifs
2017-09-13 16:29:53 +02:00
Torkel Ödegaard
85bd1861d6
fix: improve behavior when switching back and forth between x-axis modes, fixes #9229
2017-09-13 14:38:22 +02:00
Torkel Ödegaard
1a53d6453b
Merge branch 'v4.4.x'
2017-09-13 10:02:04 +02:00
Torkel Ödegaard
10f058036c
Merge branch 'master' of github.com:grafana/grafana
2017-09-13 09:48:56 +02:00
Torkel Ödegaard
73248d6687
fixes for metrics tab when data source was not found
2017-09-13 09:48:50 +02:00
Mitsuhiro Tanda
b349b3ef55
provide ace editor for external datasource plugin ( #9224 )
2017-09-13 09:29:53 +02:00
Torkel Ödegaard
dd67c9d420
Merge branch 'master' of github.com:grafana/grafana
2017-09-12 11:36:47 +02:00
Torkel Ödegaard
968ba30fa5
ux: increased code editor auto complete width from 320px to 550px, fixes #9203
2017-09-12 11:36:30 +02:00
Daniel Lee
379f984293
docs: windows - add note about ini comments
2017-09-12 11:08:28 +02:00
Torkel Ödegaard
3c16230158
prometheus: added completer unit test, #9208
2017-09-12 11:05:32 +02:00
Torkel Ödegaard
fd76c855f9
Merge branch 'master' of github.com:grafana/grafana
2017-09-12 10:32:02 +02:00
Torkel Ödegaard
e16cadaa27
docs: minor update
2017-09-12 10:31:53 +02:00
Daniel Lee
665fef0114
docs: kiosk mode options add to playlist doc
2017-09-12 10:31:13 +02:00
Daniel Lee
ff4cd1aef6
influxdb: small css fix for order by in query editor
2017-09-12 09:24:54 +02:00
Torkel Ödegaard
0e18c82d95
style: corrected indentation in sass file
2017-09-12 09:21:17 +02:00
Patrick O'Carroll
a7b0a01b13
replaced old images and gifs with new ones ( #9217 )
2017-09-12 09:07:36 +02:00
Torkel Ödegaard
18cfe1b192
Merge branch 'master' of github.com:grafana/grafana
2017-09-12 09:05:47 +02:00
Torkel Ödegaard
f6100dd8eb
ux: success/error alerts refactoring, #9214
2017-09-12 09:05:32 +02:00
bergquist
ee4bbf61a9
remove node restriction from package.json
...
yarn requires correct node version in package.json
and wont install with 4.x. removing since we dont
care about it.
2017-09-12 08:15:48 +02:00
Torkel Ödegaard
7164183739
Merge branch 'master' of github.com:grafana/grafana
2017-09-12 08:01:51 +02:00
Patrick O'Carroll
90602942f5
New alert design ( #9214 )
...
* ux: updated alert design
* fixed bg-color for alerts
* more changes to alerts, index fixed
2017-09-12 08:01:44 +02:00
Torkel Ödegaard
6e344f6eea
api: tsdb api orgId fix
2017-09-12 08:01:34 +02:00
bergquist
057b8a6b2d
improve error message for timeouts
...
closes #9220
2017-09-11 20:07:57 +02:00
Torkel Ödegaard
e5f84484eb
prometheus: another prometheus syntax highlight fix, #9212 , #9167
2017-09-11 16:36:53 +02:00
Alexander Zobnin
b1580bf385
ace: fix braces highlight in prometheus ( #9212 )
2017-09-11 15:49:15 +02:00
Torkel Ödegaard
293daf2ca1
fix: removed text option from text panel edit options, was by mistake not removed from settings dropdown, fixes #9204
2017-09-11 10:45:00 +02:00
Torkel Ödegaard
75c4c4d8b5
fix: query ctrl unit tests now pass as before
2017-09-08 13:52:28 +02:00
Torkel Ödegaard
2953d64429
prometheus: minor update to focus editor PR, #9201
2017-09-08 11:43:29 +02:00
Torkel Ödegaard
4b851de648
Merge branch 'prom_give_focus' of https://github.com/mtanda/grafana into mtanda-prom_give_focus
2017-09-08 10:55:50 +02:00
Alin Sinpalean
1076b75a21
Fix rounding of intervals ( #9197 )
...
* Prometheus: Fix actual step computation logic when a min_step is specified and the range is longer than min_step * 11000.
* Fix kbn.round_interval for exact intervals.
* Remove redundant 1d return, fix a couple of comments.
* Be more cautious with values close to 1d not rounding up to 1d. They may, because of the way the calculation uses 2 potentially different current time values.
2017-09-08 10:37:57 +02:00
Daniel Lee
b1506a2b09
securejson: decrypt should not modify src
...
When decrypting a source securejson byte array, should not
modify the source and now passes back a new dest byte array.
2017-09-08 10:19:07 +02:00
Mitsuhiro Tanda
e13575eaef
add AWS/NATGateway metrics ( #9202 )
2017-09-08 09:04:15 +02:00
Mitsuhiro Tanda
7c566a6539
fix to focus first query
2017-09-08 12:33:36 +09:00
Mitsuhiro Tanda
d971eddc7a
copy from give-focus
2017-09-08 11:49:44 +09:00
Mitsuhiro Tanda
ce0de35a6c
set give focus in code editor
2017-09-08 11:49:41 +09:00
Torkel Ödegaard
93be16b106
docs: minor docs update
2017-09-07 16:55:36 +02:00
Torkel Ödegaard
8ec33574a1
docs: added v4.4 to docs archive
2017-09-07 16:44:41 +02:00
Patrick O'Carroll
de647c4100
docs: uppdated getting started with images and text, added info on query inspector to version45 and trouble shooting ( #9193 )
2017-09-07 16:32:55 +02:00
bergquist
51d021a337
reduce readme to be about the code
2017-09-07 16:08:38 +02:00
bergquist
7dc6d67d46
adds note about closing #8876
2017-09-07 14:29:25 +02:00
Carl Bergquist
62979916ad
Merge pull request #8876 from mtanda/shortcut_new_dashboard
...
add new dashboard shortcut
2017-09-07 14:26:05 +02:00
Carl Bergquist
4670c74942
Merge pull request #9022 from adriangarza/master
...
added CloudWatch data source API documentation
2017-09-07 14:10:53 +02:00
Torkel Ödegaard
c9a30ef149
build: fixed broken build
2017-09-07 13:05:26 +02:00
Carl Bergquist
9dac602e98
Merge pull request #9191 from wgliang/master
...
Optimize some wrong usage and spelling
2017-09-07 12:04:45 +02:00
wangguoliang
652fce7e76
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com>
2017-09-07 17:50:11 +08:00
Mitsuhiro Tanda
e98254e1e3
show only label name in label matcher ( #9167 )
2017-09-07 10:10:52 +02:00
Mitsuhiro Tanda
4446e95155
(prometheus) cache metric suggest query result ( #9182 )
...
* (prometheus) cache metric suggest query result
* add test
2017-09-07 10:09:59 +02:00
