gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 23:59:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request openziti/fabric#94 from netfoundry/remove-source-type-from-metrics

Browse Source 
Remove source type from metrics. Fix metric name casing
This commit is contained in:
Paul Lorenz
2020-05-19 18:14:06 -04:00
committed by GitHub
parent 414cb52953 ad7c7f429a
commit dd2d3640f2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/metrics/peekhandler.go
+1 -1
View File
@@ -148,7 +148,7 @@ func NewXgressPeekHandler(registry metrics.Registry) xgress.PeekHandler {
ingressRxBytesMeter := registry.Meter("ingress.rx.bytesrate")
ingressRxMsgMeter := registry.Meter("ingress.rx.msgrate")
egressTxBytesMeter := registry.Meter("egress.tx.bytesrate")
egressTxMsgMeter := registry.Meter("egress.tx.Msgrate")
egressTxMsgMeter := registry.Meter("egress.tx.msgrate")
egressRxBytesMeter := registry.Meter("egress.rx.bytesrate")
egressRxMsgMeter := registry.Meter("egress.rx.msgrate")
router/router.go
+1 -2
View File
@@ -36,7 +36,6 @@ import (
"github.com/netfoundry/ziti-fabric/router/xlink_transwarp"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/metrics/metrics_pb"
"github.com/netfoundry/ziti-foundation/profiler"
"github.com/netfoundry/ziti-foundation/util/concurrenz"
"github.com/netfoundry/ziti-foundation/util/info"
@@ -68,7 +67,7 @@ func (self *Router) Channel() channel2.Channel {
}
func Create(config *Config) *Router {
metricsRegistry := metrics.NewRegistry(metrics_pb.MetricsSourceType_Internal, config.Id.Token, make(map[string]string), time.Second*15, nil)
metricsRegistry := metrics.NewRegistry(config.Id.Token, make(map[string]string), time.Second*15, nil)
return &Router{
config: config,