Merge pull request #480 from sipcapture/fix_time

fixed nodename in case defined targetName
sipcapture · Aug 26, 2021 · 77b72a8 · 77b72a8
2 parents 524c02b + 866157c
commit 77b72a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -1,6 +1,6 @@
 package config
 
-const Version = "heplify-server 1.55"
+const Version = "heplify-server 1.56"
 
 var Setting HeplifyServer
 

diff --git a/metric/prometheus.go b/metric/prometheus.go
@@ -67,18 +67,18 @@ func (p *Prometheus) expose(hCh chan *decoder.HEP) {
 				var srcHit, dstHit bool
 				srcTarget, srcHit = p.TargetMap[pkt.SrcIP]
 				if srcHit {
-					methodResponses.WithLabelValues(srcTarget, "src", "", pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
+					methodResponses.WithLabelValues(srcTarget, "src", pkt.NodeName, pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
 
 					if pkt.SIP.ReasonVal != "" && strings.Contains(pkt.SIP.ReasonVal, "850") {
 						reasonCause.WithLabelValues(srcTarget, extractXR("cause=", pkt.SIP.ReasonVal), pkt.SIP.FirstMethod).Inc()
 					}
 				}
 				dstTarget, dstHit = p.TargetMap[pkt.DstIP]
 				if dstHit {
-					methodResponses.WithLabelValues(dstTarget, "dst", "", pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
+					methodResponses.WithLabelValues(dstTarget, "dst", pkt.NodeName, pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
 				}
 				if !srcHit && !dstHit {
-					methodResponses.WithLabelValues("unknown", "", "", pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
+					methodResponses.WithLabelValues("unknown", "", pkt.NodeName, pkt.SIP.FirstMethod, pkt.SIP.CseqMethod).Inc()
 				}
 			}