Explorar o código

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

bergquist %!s(int64=9) %!d(string=hai) anos
pai
achega
d7bf70a77b
Modificáronse 4 ficheiros con 2 adicións e 9 borrados
  1. 0 3
      conf/defaults.ini
  2. 0 3
      conf/sample.ini
  3. 1 2
      pkg/setting/setting.go
  4. 1 1
      pkg/tsdb/graphite/graphite.go

+ 0 - 3
conf/defaults.ini

@@ -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]

+ 0 - 3
conf/sample.ini

@@ -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]

+ 1 - 2
pkg/setting/setting.go

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

+ 1 - 1
pkg/tsdb/graphite/graphite.go

@@ -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{