 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 |
|
 Alexander Zobnin
|
46ec15a11e
|
graph legend: add color picker (react)
|
2018-10-16 16:50:43 +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 |
|
|
Alexander Zobnin
|
5a2e399d2d
|
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react
|
2018-10-16 13:49:13 +03: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 |
|
|
Peter Holmberg
|
8ef705f2b5
|
pausing for now
|
2018-10-16 09:59:03 +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 |
|
|
Ramiro Morales
|
d859a6aeb8
|
rename new JSON data attrbute.
|
2018-10-15 20:34:03 -03:00 |
|
|
Marcus Efraimsson
|
f4b7b003be
|
changelog: add notes about closing #13464
[skip ci]
|
2018-10-16 01:08:37 +02:00 |
|
|
Marcus Efraimsson
|
baa3985478
|
changelog: add notes about closing #13553
[skip ci]
|
2018-10-16 01:05:45 +02:00 |
|
|
Marcus Efraimsson
|
e86027e3d3
|
update changelog
[skip ci]
|
2018-10-16 01:03:20 +02:00 |
|
 Carl Bergquist
|
efe9d27820
|
Merge pull request #13683 from eripe970/patch-2
Small readme update, link to license
|
2018-10-15 23:59:56 +02:00 |
|
|
Carl Bergquist
|
795a24d027
|
Merge pull request #13681 from eripe970/patch-1
Small fixes to documentation
|
2018-10-15 23:59:27 +02:00 |
|
 Erik Pettersson
|
85597862f3
|
doc(documentation) license
Link to the grafana license file from the docs.
|
2018-10-15 23:42:49 +02:00 |
|
|
Erik Pettersson
|
25b68809b0
|
doc(documenation)
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
|
2018-10-15 23:35:47 +02:00 |
|
|
Dave Waters
|
6376154b16
|
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
|
2018-10-15 17:16:14 -04:00 |
|
|
Torkel Ödegaard
|
ae7a1bc139
|
Can render graph
|
2018-10-15 21:52:24 +02:00 |
|
|
Ramiro Morales
|
37f16ca80a
|
Add 'encrypt' setting to MSSQL data source.
Fixes #13629
|
2018-10-15 14:47:54 -03:00 |
|
|
Torkel Ödegaard
|
938541be2e
|
Merge pull request #13660 from grafana/alerting-validation-messages
Alerting: Propagate alert validation issues to the api/user
|
2018-10-15 18:16:29 +02:00 |
|
|
Marcus Efraimsson
|
709458501e
|
Merge pull request #13675 from ankon/patch-1
Fix grammar in log message
|
2018-10-15 17:27:02 +02:00 |
|
|
Peter Holmberg
|
7c3d101253
|
rendering settings
|
2018-10-15 16:45:39 +02:00 |
|
|
Leonard Gram
|
6fd3430677
|
build: makes sure publisher.sh is available when deploying.
|
2018-10-15 14:54:21 +02:00 |
|
 Andreas Kohn
|
272274220c
|
Fix grammar in log message
|
2018-10-15 14:37:12 +02:00 |
|
|
Marcus Efraimsson
|
bac937f079
|
changelog: add notes about closing #13641 #13650
[skip ci]
|
2018-10-15 14:28:47 +02:00 |
|
 Sven Klemm
|
20c1a58488
|
Escape typeahead values in query_part
|
2018-10-15 14:05:07 +02:00 |
|
|
Sven Klemm
|
3a25a0de83
|
Escape values in metric segment and sql part
|
2018-10-15 13:53:37 +02:00 |
|