tech(tsdb): remove skip ssl setting. should be based on datasource settings

This commit is contained in:
bergquist
2016-09-12 13:37:00 +02:00
parent 6c5860d3e8
commit d7bf70a77b
4 changed files with 2 additions and 9 deletions

View File

@@ -387,9 +387,6 @@ global_session = -1
[alerting]
enabled = true
# Skip ssl validation for queries sent to the timeserie database.
skip_ssl_validation = false
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /api/metrics
[metrics]

View File

@@ -333,9 +333,6 @@ check_for_updates = true
[alerting]
;enabled = false
# Skip ssl validation for queries sent to the timeserie database.
;skip_ssl_validation = false
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /api/metrics
[metrics]

View File

@@ -141,8 +141,7 @@ var (
Quota QuotaSettings
// Alerting
AlertingEnabled bool
AlertingSkipSSLValidation bool
AlertingEnabled bool
// logger
logger log.Logger

View File

@@ -34,7 +34,7 @@ func init() {
tsdb.RegisterExecutor("graphite", NewGraphiteExecutor)
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: setting.AlertingSkipSSLValidation},
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
HttpClient = http.Client{