Commit d7bf70a7 by bergquist

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

parent 6c5860d3
...@@ -387,9 +387,6 @@ global_session = -1 ...@@ -387,9 +387,6 @@ global_session = -1
[alerting] [alerting]
enabled = true enabled = true
# Skip ssl validation for queries sent to the timeserie database.
skip_ssl_validation = false
#################################### Internal Grafana Metrics ########################## #################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /api/metrics # Metrics available at HTTP API Url /api/metrics
[metrics] [metrics]
......
...@@ -333,9 +333,6 @@ check_for_updates = true ...@@ -333,9 +333,6 @@ check_for_updates = true
[alerting] [alerting]
;enabled = false ;enabled = false
# Skip ssl validation for queries sent to the timeserie database.
;skip_ssl_validation = false
#################################### Internal Grafana Metrics ########################## #################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /api/metrics # Metrics available at HTTP API Url /api/metrics
[metrics] [metrics]
......
...@@ -141,8 +141,7 @@ var ( ...@@ -141,8 +141,7 @@ var (
Quota QuotaSettings Quota QuotaSettings
// Alerting // Alerting
AlertingEnabled bool AlertingEnabled bool
AlertingSkipSSLValidation bool
// logger // logger
logger log.Logger logger log.Logger
......
...@@ -34,7 +34,7 @@ func init() { ...@@ -34,7 +34,7 @@ func init() {
tsdb.RegisterExecutor("graphite", NewGraphiteExecutor) tsdb.RegisterExecutor("graphite", NewGraphiteExecutor)
tr := &http.Transport{ tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: setting.AlertingSkipSSLValidation}, TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
} }
HttpClient = http.Client{ HttpClient = http.Client{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment