yusheng-guo/kube-metrics-adapter
1
0
Fork 1
mirror of https://github.com/zalando-incubator/kube-metrics-adapter.git synced 2025-05-13 16:59:37 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Added namespace to logs, simplified GetPodReadyAge method

Browse Source 
Signed-off-by: Anatolii Dutchak <adutchak-x@tunein.com>
This commit is contained in:
Anatolii Dutchak
2021-04-20 11:21:20 +03:00
parent 5747b6c9de
commit b9300d1e46
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/collector/pod_collector.go
View File

@ -103,11 +103,11 @@ func (c *PodCollector) GetMetrics() ([]CollectedMetric, error) {
go c.getPodMetric(pod, ch, errCh) go c.getPodMetric(pod, ch, errCh)
} else { } else {
skippedPodsCount++ skippedPodsCount++
c.logger.Warnf("Skipping metrics collection for pod %s because it's ready age is %s and min-pod-ready-age is set to %s", pod.Name, podReadyAge, c.minPodReadyAge) c.logger.Warnf("Skipping metrics collection for pod %s/%s because it's ready age is %s and min-pod-ready-age is set to %s", pod.Namespace, pod.Name, podReadyAge, c.minPodReadyAge)
} }
} else { } else {
skippedPodsCount++ skippedPodsCount++
c.logger.Warnf("Skipping metrics collection for pod %s because it's status is not Ready.", pod.Name) c.logger.Warnf("Skipping metrics collection for pod %s/%s because it's status is not Ready.", pod.Namespace, pod.Name)
} }
} }
@ -172,9 +172,8 @@ func getPodLabelSelector(client kubernetes.Interface, hpa *autoscalingv2.Horizon
} }
// GetPodReadyAge extracts corev1.PodReady condition from the given pod object and // GetPodReadyAge extracts corev1.PodReady condition from the given pod object and
// returns true, time.Duration() for pod.LastTransitionTime if the condition corev1.PodReady is found. Returns time.Duration(0s), false if the condition is not present. // returns true, time.Duration() for LastTransitionTime if the condition corev1.PodReady is found. Returns time.Duration(0s), false if the condition is not present.
func GetPodReadyAge(pod corev1.Pod) (bool, time.Duration) { func GetPodReadyAge(pod corev1.Pod) (bool, time.Duration) {
t := time.Now()
podReadyAge := time.Duration(0 * time.Second) podReadyAge := time.Duration(0 * time.Second)
conditions := pod.Status.Conditions conditions := pod.Status.Conditions
if conditions == nil { if conditions == nil {
@ -182,7 +181,8 @@ func GetPodReadyAge(pod corev1.Pod) (bool, time.Duration) {
} }
for i := range conditions { for i := range conditions {
if conditions[i].Type == corev1.PodReady { if conditions[i].Type == corev1.PodReady {
podReadyAge = time.Duration(t.Sub(conditions[i].LastTransitionTime.Time).Nanoseconds()) podReadyAge = time.Since(conditions[i].LastTransitionTime.Time)
fmt.Printf("podReadyAge: %s", podReadyAge)
return true, podReadyAge return true, podReadyAge
} }
} }