mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
tech(tsdb): remove skip ssl setting. should be based on datasource settings
This commit is contained in:
@@ -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]
|
||||
|
@@ -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]
|
||||
|
@@ -141,8 +141,7 @@ var (
|
||||
Quota QuotaSettings
|
||||
|
||||
// Alerting
|
||||
AlertingEnabled bool
|
||||
AlertingSkipSSLValidation bool
|
||||
AlertingEnabled bool
|
||||
|
||||
// logger
|
||||
logger log.Logger
|
||||
|
@@ -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{
|
||||
|
Reference in New Issue
Block a user