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 |
|
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 |
|
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 |
|
bergquist
|
70385119bc
|
removes d in disableResolvedMessage
|
2018-10-17 10:41: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 |
|
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 |
|
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 |
|
Dave Waters
|
18c73631ea
|
rename UI Option, align with control, update tests
|
2018-10-16 07:12:32 -04: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 |
|
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 |
|
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 |
|
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 |
|
Marcus Efraimsson
|
e830352d38
|
changelog: add notes about closing #13628
[skip ci]
|
2018-10-15 11:46:12 +02:00 |
|
Marcus Efraimsson
|
9f85a7494a
|
Merge pull request #13651 from grafana/13628_fix_dag
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
|
2018-10-15 11:42:59 +02:00 |
|
Marcus Efraimsson
|
d9b73418f1
|
update .bra.toml for using latest bra version
|
2018-10-15 11:03:24 +02:00 |
|
Carl Bergquist
|
3f6f98a532
|
Merge pull request #13661 from mjtrangoni/remove-os-kill
Remove os.Kill as it cannot be trapped
|
2018-10-15 08:47:26 +02:00 |
|
Torkel Ödegaard
|
a029492d91
|
Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue
Fix graph render blocked by annotations issue
|
2018-10-14 10:35:16 +02:00 |
|
Torkel Ödegaard
|
5e9ef5f699
|
Merge pull request #13664 from steaksauce-/master
Removed reference to plugin_api.md (SDK Readme)
|
2018-10-14 10:23:46 +02:00 |
|
Torkel Ödegaard
|
3de439ddca
|
Update CHANGELOG.md
|
2018-10-14 10:23:15 +02:00 |
|
Torkel Ödegaard
|
40e3758698
|
Merge pull request #13662 from franciscocpg/adding-time-clock
Adding time clock
|
2018-10-14 10:19:39 +02:00 |
|
Torkel Ödegaard
|
37548792f5
|
Merge pull request #13659 from grafana/graph-time-format-fix
fix for graph time formating for Last 24h ranges
|
2018-10-14 10:16:37 +02:00 |
|