Marcus Efraimsson
|
cf93b1e700
|
Merge pull request #13708 from svenklemm/interpolateVariable
postgres: fix template variables error
|
2018-10-17 13:42:47 +02:00 |
|
Marcus Efraimsson
|
7b656097a7
|
postgres: use arrow function declaration of interpolateVariable
|
2018-10-17 13:30:07 +02:00 |
|
Sven Klemm
|
ec0fd96f08
|
Use closure for calling interpolateVariable
|
2018-10-17 12:30:07 +02:00 |
|
Marcus Efraimsson
|
6a89874290
|
changelog: add notes about closing #12308
[skip ci]
|
2018-10-17 12:01:27 +02:00 |
|
Marcus Efraimsson
|
62f21a254a
|
Merge pull request #12337 from mtanda/cw_regions
show all CloudWatch regions (avoid hard coding)
|
2018-10-17 11:55:43 +02:00 |
|
Yuan Liu
|
36dbc5f51c
|
Add socket support for mysql data source
|
2018-10-17 17:45:06 +08:00 |
|
Yuan Liu
|
76fc48e2eb
|
Merge pull request #1 from grafana/master
Syncing
|
2018-10-17 17:14:13 +08:00 |
|
bergquist
|
2afec0e7fb
|
changelog: adds note about closing #12330 and #6696
[skip ci]
|
2018-10-17 11:12:39 +02:00 |
|
Peter Holmberg
|
314fffeae1
|
Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react
|
2018-10-17 11:12:13 +02:00 |
|
Carl Bergquist
|
94e2d2b483
|
Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert
Add channel option to disable the resolved alert (OK Message)
|
2018-10-17 11:08:39 +02:00 |
|
Peter Holmberg
|
b7b0ce0107
|
remove addpermissions component
|
2018-10-17 11:07:17 +02:00 |
|
Torkel Ödegaard
|
29f1c9259a
|
Merge pull request #13352 from amuraru/patch-2
Updated phantomjs render script to take full height screenshots
|
2018-10-17 11:00:44 +02:00 |
|
Marcus Efraimsson
|
52f398e7f7
|
cloudwatch: return a distinct list of regions
|
2018-10-17 10:58:06 +02:00 |
|
Marcus Efraimsson
|
518e485e36
|
docs: update cloudwatch iam policy description
|
2018-10-17 10:52:46 +02:00 |
|
Peter Holmberg
|
34c0bed922
|
Merge pull request #13700 from grafana/permissions-code-to-enterprise
Permissions code to enterprise
|
2018-10-17 10:46:53 +02:00 |
|
bergquist
|
70385119bc
|
removes d in disableResolvedMessage
|
2018-10-17 10:41:18 +02:00 |
|
Peter Holmberg
|
dd2fb7961f
|
removed snaps
|
2018-10-17 10:37:56 +02:00 |
|
Peter Holmberg
|
776f9aa288
|
Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise
|
2018-10-17 10:00:18 +02:00 |
|
bergquist
|
5566a61aef
|
alerting: tests default value for disable resolve message
|
2018-10-17 09:53:03 +02:00 |
|
Marcus Efraimsson
|
176c857900
|
Merge pull request #13696 from Yukinoshita-Yukino/patch-1
Update doc due to Dingtalk client layout change
|
2018-10-17 09:37:08 +02:00 |
|
Mitsuhiro Tanda
|
c64a5a6e0e
|
re-add hard coded region list
|
2018-10-17 14:02:02 +09:00 |
|
Yuan Liu
|
7946a405f5
|
update doc due to client layout change
|
2018-10-17 10:24:05 +08:00 |
|
Dave Waters
|
a3137e731d
|
clean up tests
|
2018-10-16 20:39:07 -04:00 |
|
Dave Waters
|
e9b8051724
|
Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert
|
2018-10-16 17:43:26 -04:00 |
|
Dave Waters
|
0eae7b077d
|
fix gofmt, add test, correct noted concerns with default value
|
2018-10-16 17:38:59 -04:00 |
|
Dave Waters
|
c4dcf5a4ee
|
fix gofmt, add test, correct noted concerns with default value
|
2018-10-16 17:33:38 -04:00 |
|
Marcus Efraimsson
|
03b8bcc43f
|
changelog: add notes about closing #13629
[skip ci]
|
2018-10-16 19:22:22 +02:00 |
|
Marcus Efraimsson
|
3612a1c00e
|
Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option
Add encrypt setting to MSSQL data source.
|
2018-10-16 19:07:00 +02:00 |
|
Ramiro Morales
|
49a3bd3097
|
add encrypt connstr param conditionally on the value chosen via GUI.
|
2018-10-16 13:14:22 -03:00 |
|
Peter Holmberg
|
66311a065c
|
removing datasource permissions states from grafana
|
2018-10-16 15:36:33 +02:00 |
|
Marcus Efraimsson
|
a825f42aaf
|
update latest.json to latest stable version
[skip ci]
|
2018-10-16 15:00:28 +02:00 |
|
Marcus Efraimsson
|
c9db7f7cfa
|
update changelog
[skip ci]
|
2018-10-16 14:59:17 +02:00 |
|
Leonard Gram
|
f1ab0ea491
|
build: Upgraded nodejs to 8 on appveyor
|
2018-10-16 14:32:25 +02:00 |
|
Leonard Gram
|
1329c70965
|
codestyle
|
2018-10-16 14:22:50 +02:00 |
|
Dave Waters
|
18c73631ea
|
rename UI Option, align with control, update tests
|
2018-10-16 07:12:32 -04:00 |
|
Peter Holmberg
|
ee0cc9bd77
|
Merge branch 'master' into data-source-instance-to-react
|
2018-10-16 12:14:11 +02:00 |
|
Peter Holmberg
|
ef0def2277
|
Merge branch 'master' into permissions-code-to-enterprise
|
2018-10-16 11:09:58 +02:00 |
|
Torkel Ödegaard
|
c1399a0404
|
Merge pull request #13686 from grafana/logo-alt-text
Logo alt text + unwanted char
|
2018-10-16 09:58:35 +02:00 |
|
Johannes Schill
|
2a82b57d93
|
Remove unwanted char
|
2018-10-16 08:11:26 +02:00 |
|
Johannes Schill
|
6d3f037ef1
|
Fix incorrect alt text on logo
|
2018-10-16 07:50:44 +02:00 |
|
Mitsuhiro Tanda
|
fce50cf1b8
|
return default region list from backend
|
2018-10-16 12:20:39 +09:00 |
|
Mitsuhiro Tanda
|
a417d6fa21
|
don't merge hard coded region list
|
2018-10-16 12:03:33 +09:00 |
|
Mitsuhiro Tanda
|
61e2710961
|
add error message
|
2018-10-16 12:03:33 +09:00 |
|
Mitsuhiro Tanda
|
6564abd5f3
|
get regions from after datasource save
|
2018-10-16 12:03:33 +09:00 |
|
Mitsuhiro Tanda
|
f6cb01d38a
|
show all CloudWatch regions
|
2018-10-16 12:03:33 +09:00 |
|
Mitsuhiro Tanda
|
2b20402d7d
|
get region list from ec2:DescribeRegions
|
2018-10-16 12:03:33 +09:00 |
|
Mitsuhiro Tanda
|
48aef0c50e
|
fix concurrent map writes
|
2018-10-16 11:45:58 +09:00 |
|
Ramiro Morales
|
cf6faabd12
|
update, don't remove 'Known Issues' docs section.
|
2018-10-15 21:51:21 -03:00 |
|
Ramiro Morales
|
6a8d1c4546
|
update provisioning docs.
|
2018-10-15 21:46:26 -03:00 |
|
Ramiro Morales
|
90de703ef2
|
fix new setting default value handling.
|
2018-10-15 21:41:00 -03:00 |
|