metrics: Remove port name when parsing server name

matthyx · Aug 29, 2020 · 0f87e9e · 0f87e9e
1 parent 5a5cc82
commit 0f87e9e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 35 deletions.
diff --git a/pkg/router/metrics/haproxy/haproxy.go b/pkg/router/metrics/haproxy/haproxy.go
@@ -543,13 +543,17 @@ func knownServerSegment(value string) (string, string, string, bool) {
 	if i := strings.Index(value, ":"); i != -1 {
 		switch value[:i] {
 		case "ept":
-			if service, server, ok := parseNameSegment(value[i+1:]); ok {
-				return "", service, server, true
+			if service, remainder, ok := parseNameSegment(value[i+1:]); ok {
+				if _, server, ok := parseNameSegment(remainder); ok {
+					return "", service, server, true
+				}
 			}
 		case "pod":
 			if pod, remainder, ok := parseNameSegment(value[i+1:]); ok {
-				if service, server, ok := parseNameSegment(remainder); ok {
-					return pod, service, server, true
+				if service, remainder, ok := parseNameSegment(remainder); ok {
+					if _, server, ok := parseNameSegment(remainder); ok {
+						return pod, service, server, true
+					}
 				}
 			}
 		}