Skip to content

Commit

Permalink
add node ping total count metric
Browse files Browse the repository at this point in the history
  • Loading branch information
hongzhen-ma committed Nov 24, 2020
1 parent 6ed020c commit 37cbb71
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 4 deletions.
44 changes: 42 additions & 2 deletions pkg/pinger/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@ var (
"target_node_ip",
"target_pod_ip",
})
podPingTotalCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "pinger_pod_ping_count_total",
Help: "The total count for pod peer ping",
}, []string{
"src_node_name",
"src_node_ip",
"src_pod_ip",
"target_node_name",
"target_node_ip",
"target_pod_ip",
})
nodePingLatencyHistogram = prometheus.NewHistogramVec(
prometheus.HistogramOpts{
Name: "pinger_node_ping_latency_ms",
Expand All @@ -168,6 +180,17 @@ var (
"target_node_name",
"target_node_ip",
})
nodePingTotalCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "pinger_node_ping_count_total",
Help: "The total count for pod ping node",
}, []string{
"src_node_name",
"src_node_ip",
"src_pod_ip",
"target_node_name",
"target_node_ip",
})
externalPingLatencyHistogram = prometheus.NewHistogramVec(
prometheus.HistogramOpts{
Name: "pinger_external_ping_latency_ms",
Expand Down Expand Up @@ -209,8 +232,10 @@ func init() {
prometheus.MustRegister(externalDnsRequestLatencyHistogram)
prometheus.MustRegister(podPingLatencyHistogram)
prometheus.MustRegister(podPingLostCounter)
prometheus.MustRegister(podPingTotalCounter)
prometheus.MustRegister(nodePingLatencyHistogram)
prometheus.MustRegister(nodePingLostCounter)
prometheus.MustRegister(nodePingTotalCounter)
prometheus.MustRegister(externalPingLatencyHistogram)
prometheus.MustRegister(externalPingLostCounter)
}
Expand Down Expand Up @@ -268,7 +293,7 @@ func SetExternalDnsUnhealthyMetrics(nodeName string) {
externalDnsUnhealthyGauge.WithLabelValues(nodeName).Set(1)
}

func SetPodPingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, targetNodeIP, targetPodIP string, latency float64, lost int) {
func SetPodPingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, targetNodeIP, targetPodIP string, latency float64, lost, total int) {
podPingLatencyHistogram.WithLabelValues(
srcNodeName,
srcNodeIP,
Expand All @@ -285,9 +310,17 @@ func SetPodPingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, targetN
targetNodeIP,
targetPodIP,
).Add(float64(lost))
podPingTotalCounter.WithLabelValues(
srcNodeName,
srcNodeIP,
srcPodIP,
targetNodeName,
targetNodeIP,
targetPodIP,
).Add(float64(total))
}

func SetNodePingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, targetNodeIP string, latency float64, lost int) {
func SetNodePingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, targetNodeIP string, latency float64, lost, total int) {
nodePingLatencyHistogram.WithLabelValues(
srcNodeName,
srcNodeIP,
Expand All @@ -302,6 +335,13 @@ func SetNodePingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetNodeName, target
targetNodeName,
targetNodeIP,
).Add(float64(lost))
nodePingTotalCounter.WithLabelValues(
srcNodeName,
srcNodeIP,
srcPodIP,
targetNodeName,
targetNodeIP,
).Add(float64(total))
}

func SetExternalPingMetrics(srcNodeName, srcNodeIP, srcPodIP, targetAddress string, latency float64, lost int) {
Expand Down
6 changes: 4 additions & 2 deletions pkg/pinger/ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ func pingNodes(config *Configuration) {
config.PodName,
no.Name, addr.Address,
float64(stats.AvgRtt)/float64(time.Millisecond),
int(math.Abs(float64(stats.PacketsSent-stats.PacketsRecv))))
int(math.Abs(float64(stats.PacketsSent-stats.PacketsRecv))),
int(float64(stats.PacketsSent)))
}(addr.Address, no.Name)
}
}
Expand Down Expand Up @@ -119,7 +120,8 @@ func pingPods(config *Configuration) {
nodeIP,
podIp,
float64(stats.AvgRtt)/float64(time.Millisecond),
int(math.Abs(float64(stats.PacketsSent-stats.PacketsRecv))))
int(math.Abs(float64(stats.PacketsSent-stats.PacketsRecv))),
int(float64(stats.PacketsSent)))
}(pod.Status.PodIP, pod.Name, pod.Status.HostIP, pod.Spec.NodeName)
}
}
Expand Down

0 comments on commit 37cbb71

Please sign in to comment.