Daniel Lee
1c1d962bb1
docs: spelling
2018-03-23 09:04:50 +01:00
Daniel Lee
ccfe9de014
docs: add intro paragraph to provisioning page
2018-03-23 08:55:11 +01:00
Marcus Efraimsson
63465fd556
changelog: notes for #1271 and #2740
...
[skip ci]
2018-03-22 19:19:56 +01:00
Marcus Efraimsson
1ee0d1c296
Merge pull request #10994 from ilgizar/1271_share_zero
2018-03-22 18:34:38 +01:00
Marcus Efraimsson
f04a5d7329
Merge branch 'master' into 1271_share_zero
2018-03-22 18:31:37 +01:00
Marcus Efraimsson
c672e44d35
graph: minor fixes to y-axes alignment feature
2018-03-22 18:30:23 +01:00
Marcus Efraimsson
4af3a7875a
Merge pull request #11349 from grafana/save_trash
...
Fix save icon in folder settings
2018-03-22 18:21:28 +01:00
Patrick O'Carroll
99626b8e07
added save icon to save buttons
2018-03-22 17:04:00 +01:00
Marcus Efraimsson
2e8aeffc13
Merge branch 'master' into 1271_share_zero
2018-03-22 16:59:36 +01:00
Patrick O'Carroll
823f903048
removed trash can icon from save buttons
2018-03-22 16:59:06 +01:00
Carl Bergquist
22fffe0dda
Merge pull request #11337 from digineo/golint
...
Make golint happier
2018-03-22 14:35:33 +01:00
Julian Kornberger
7aab6a8887
Make golint happier
2018-03-22 12:40:21 +01:00
Daniel Lee
624dac16fa
docs: add variable regex examples ( #11327 )
2018-03-21 13:23:50 +01:00
bergquist
f41f2089a2
docs: details about provisioning elastic
...
closes #11292
2018-03-21 08:54:09 +01:00
Carl Bergquist
4bcc073813
Merge pull request #11322 from jordo1138/patch-1
...
update email template default year and name
2018-03-21 07:49:35 +01:00
Jordan Hamel
7a4475fbf3
update email default year and name
...
from 2016 grafana and raintank to 2018 Grafana Labs
2018-03-20 16:55:57 -07:00
Daniel Lee
c53fda4b5a
Merge pull request #11264 from grafana/11102_duplicate_panel_shortcut
...
Keyboard shortcut to duplicate panel
2018-03-20 20:56:35 +01:00
Daniel Lee
685a371747
Merge pull request #11316 from ryantxu/ace-disable-snippets
...
Expose option to disable snippets in ACE code-editor
2018-03-20 20:53:34 +01:00
Marcus Efraimsson
9df5476fe3
Merge pull request #11312 from grafana/func_editor_js_to_ts
...
convert func_editor.js to typescript
2018-03-20 20:51:58 +01:00
Marcus Efraimsson
de396b277e
Merge pull request #11309 from grafana/add_graphite_func_js_to_ts
...
convert add_graphite_func.js to typescript
2018-03-20 20:51:21 +01:00
Daniel Lee
4dcf1b72b3
Merge pull request #11313 from ryantxu/remove-unused-images
...
Remove unused kibana images
2018-03-20 20:44:00 +01:00
Daniel Lee
70cd501373
Merge pull request #11320 from daniellee/update-xorm
...
mysql: fixes panics when mysql connection times out (#11155 )
2018-03-20 20:16:18 +01:00
Daniel Lee
32d1477b79
Merge pull request #11319 from alexanderzobnin/fix-11318
...
snapshot: fix legend rendering bug
2018-03-20 20:02:25 +01:00
Alexander Zobnin
a472d38fbf
snapshot: fix legend rendering bug
2018-03-20 21:33:54 +03:00
Daniel Lee
92388f7faf
session: update defaults for ConnMaxLifetime
...
to be the same as the 5.0.3 release defaults
2018-03-20 19:31:01 +01:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
Daniel Lee
70630d742e
snapshots: removes errors for empty values in ViewStore
...
Occurs when opening a snapshot.
2018-03-20 19:12:52 +01:00
ilgizar
0e159dada1
Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
2018-03-20 22:44:48 +05:00
ryan
f9acb4157b
Expose option to disable snippets
2018-03-20 15:26:41 +01:00
Patrick O'Carroll
47215098a3
changed var to const, changed to string interpolation
2018-03-20 14:43:09 +01:00
ryan
54c4b6a11a
Remove unused kibana images
2018-03-20 14:39:19 +01:00
Patrick O'Carroll
3bdd006291
changed var to const
2018-03-20 14:26:03 +01:00
bergquist
fdf7a4c435
changelog: adds note about closing #11114 & #11086
2018-03-20 13:15:45 +01:00
Carl Bergquist
10a0460dc6
Merge pull request #11282 from alexanderzobnin/fix-11086
...
Fix rendering link to panel in collapsed row
2018-03-20 12:40:30 +01:00
Patrick O'Carroll
2a90370230
converted file to ts
2018-03-20 12:36:02 +01:00
Marcus Efraimsson
51cbf23c4a
changelog: notes about #10093 and #11298
...
[ci skip]
2018-03-20 12:26:37 +01:00
Alexander Zobnin
05ac7d8fca
dashboard: fix phantomjs panel rendering in collapsed row
2018-03-20 14:13:31 +03:00
ilgizar
e015047ed1
Fixed unit test.
2018-03-20 16:09:52 +05:00
ilgizar
341afe65ef
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-20 15:54:56 +05:00
ilgizar
1588295375
Changed the way this feature was activated. And changed tolltip.
2018-03-20 15:38:48 +05:00
ilgizar
230f018c78
Added validation of input parameters.
2018-03-20 15:37:18 +05:00
Patrick O'Carroll
2a50bc35a3
converted file to ts
2018-03-20 11:07:31 +01:00
Carl Bergquist
f64c6e490a
Merge pull request #11258 from mitjaziv/hide-credentials
...
add regex search/replace of username/password in urls
2018-03-20 09:37:09 +01:00
Marcus Efraimsson
720711d1fe
fix: only run gofmt on pkg directory omitting vendor directory
2018-03-20 09:24:04 +01:00
Marcus Efraimsson
b816f18b3d
fix: dep ensure. now without gofmt on ventor directory
2018-03-20 09:23:18 +01:00
Daniel Lee
4033283254
Merge pull request #11298 from grafana/mssql_datasource
...
Microsoft SQL Server data source
2018-03-20 00:03:26 +01:00
Marcus Efraimsson
192e913b7b
mssql: add integration test to verify stored procedure usage
2018-03-19 19:56:34 +01:00
Marcus Efraimsson
8f6626e805
mssql: encrypt password in database
2018-03-19 17:32:51 +01:00
Marcus Efraimsson
6044b3aeeb
Merge branch 'master' into mssql_datasource
2018-03-19 17:14:33 +01:00
Marcus Efraimsson
449a307575
mssql: remove dynamic construction of metric column and other columns
...
This seems like a niche feature which can be solved by defining multiple queries. In the future
we'll probably add support for defining series name by alias field similar to how other datasources
have solved that, e.g. prometheus.
2018-03-19 17:14:01 +01:00
