DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3453 from Shopify/monitor-fixes

Browse source 
Monitor fixes
This commit is contained in:
k8s-ci-robot 2018-11-21 09:28:24 -08:00 • committed by GitHub
commit 8aac340203
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/ingress/metric/collectors/socket.go
View file

@ -30,11 +30,10 @@ import (
)
type upstream struct {
Endpoint string `json:"endpoint"`
Latency float64 `json:"upstreamLatency"`
ResponseLength float64 `json:"upstreamResponseLength"`
ResponseTime float64 `json:"upstreamResponseTime"`
Status string `json:"upstreamStatus"`
//Status string `json:"upstreamStatus"`
}
type socketData struct {
@ -88,8 +87,6 @@ var (
"method",
"path",
// "endpoint",
"namespace",
"ingress",
"service",
@ -223,11 +220,10 @@ func (sc *SocketCollector) handleMessage(msg []byte) {
}
requestLabels := prometheus.Labels{
"host": stats.Host,
"status": stats.Status,
"method": stats.Method,
"path": stats.Path,
//"endpoint": stats.Endpoint,
"host": stats.Host,
"status": stats.Status,
"method": stats.Method,
"path": stats.Path,
"namespace": stats.Namespace,
"ingress": stats.Ingress,
"service": stats.Service,