public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,934 Commits 655 Branches 650 Tags
cd96ef3590089e519f4e57bd6fb04761fd8f1f1d
Commit Graph

16934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leonard Gram cd96ef3590 docs: installing custom plugins in docker. 
[skip ci]
 2018-10-17 14:34:40 +02:00
Marcus Efraimsson b036678c89 changelog: add notes about closing #13692 
[skip ci]
 2018-10-17 13:46:41 +02:00
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
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
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
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
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
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
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
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