IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

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

3
conf/sample.ini
View File

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

3
pkg/setting/setting.go
View File

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

2
pkg/tsdb/graphite/graphite.go
View File

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