Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
d7bf70a7
Commit
d7bf70a7
authored
Sep 12, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tech(tsdb): remove skip ssl setting. should be based on datasource settings
parent
6c5860d3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
9 deletions
+2
-9
conf/defaults.ini
+0
-3
conf/sample.ini
+0
-3
pkg/setting/setting.go
+1
-2
pkg/tsdb/graphite/graphite.go
+1
-1
No files found.
conf/defaults.ini
View file @
d7bf70a7
...
...
@@ -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]
...
...
conf/sample.ini
View file @
d7bf70a7
...
...
@@ -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]
...
...
pkg/setting/setting.go
View file @
d7bf70a7
...
...
@@ -141,8 +141,7 @@ var (
Quota
QuotaSettings
// Alerting
AlertingEnabled
bool
AlertingSkipSSLValidation
bool
AlertingEnabled
bool
// logger
logger
log
.
Logger
...
...
pkg/tsdb/graphite/graphite.go
View file @
d7bf70a7
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment