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

feat(instrumentation): finial polish

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-03 17:15:17 +02:00
parent 35a7a3a52b
commit aef2b6b45f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dataproxy.go
View File

@ -17,8 +17,6 @@ import (
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )
var i int = 0
var dataProxyTransport = &http.Transport{ var dataProxyTransport = &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,

10
pkg/metrics/metrics.go
View File

@ -1,7 +1,12 @@
package metrics package metrics
var MetricStats = NewRegistry() var MetricStats Registry
var UseNilMetrics bool = true var UseNilMetrics bool
func init() {
// init with nil metrics
initMetricVars(&MetricSettings{})
}
var ( var (
M_Instance_Start Counter M_Instance_Start Counter
@ -31,6 +36,7 @@ var (
func initMetricVars(settings *MetricSettings) { func initMetricVars(settings *MetricSettings) {
UseNilMetrics = settings.Enabled == false UseNilMetrics = settings.Enabled == false
MetricStats = NewRegistry()
M_Instance_Start = RegCounter("instance_start") M_Instance_Start = RegCounter("instance_start")