From e88534ca70672ab7fafd02aec909904cae722137 Mon Sep 17 00:00:00 2001 From: luhualin Date: Fri, 4 Jan 2019 10:12:38 +0800 Subject: [PATCH] fix timestamp error for container_last_seen --- metrics/prometheus.go | 5 ++++- metrics/testdata/prometheus_metrics | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/metrics/prometheus.go b/metrics/prometheus.go index 5e457df8..a74039fd 100644 --- a/metrics/prometheus.go +++ b/metrics/prometheus.go @@ -139,7 +139,10 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri help: "Last time a container was seen by the exporter", valueType: prometheus.GaugeValue, getValues: func(s *info.ContainerStats) metricValues { - return metricValues{{value: float64(time.Now().Unix())}} + return metricValues{{ + value: float64(time.Now().Unix()), + timestamp: time.Now(), + }} }, }, }, diff --git a/metrics/testdata/prometheus_metrics b/metrics/testdata/prometheus_metrics index 30ef7aa7..e18d3d63 100644 --- a/metrics/testdata/prometheus_metrics +++ b/metrics/testdata/prometheus_metrics @@ -111,7 +111,7 @@ container_fs_writes_total{container_env_foo_env="prod",container_label_foo_label container_fs_writes_total{container_env_foo_env="prod",container_label_foo_label="bar",device="sda2",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 43 1395066363000 # HELP container_last_seen Last time a container was seen by the exporter # TYPE container_last_seen gauge -container_last_seen{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 1.426203694e+09 1395066363000 +container_last_seen{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 1.395066363e+09 1395066363000 # HELP container_memory_cache Number of bytes of page cache memory. # TYPE container_memory_cache gauge container_memory_cache{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 14 1395066363000