diff --git a/metrics/prometheus_test.go b/metrics/prometheus_test.go index e59caacf..cf45f510 100644 --- a/metrics/prometheus_test.go +++ b/metrics/prometheus_test.go @@ -157,7 +157,7 @@ func (p testSubcontainersInfoProvider) SubcontainersInfo(string, *info.Container } var ( - includeRe = regexp.MustCompile(`^(?:(?:# HELP |# TYPE)container_|cadvisor_version_info\{)`) + includeRe = regexp.MustCompile(`^(?:(?:# HELP |# TYPE )?container_|cadvisor_version_info\{)`) ignoreRe = regexp.MustCompile(`^container_last_seen\{`) ) diff --git a/metrics/testdata/prometheus_metrics b/metrics/testdata/prometheus_metrics index 70e598c8..54877ec2 100644 --- a/metrics/testdata/prometheus_metrics +++ b/metrics/testdata/prometheus_metrics @@ -1,4 +1,4 @@ -# HELP cadvisor_version_info A metric with a constant '1' value labeled by kernel version, OS version, docker version & cadvisor version. +# HELP cadvisor_version_info A metric with a constant '1' value labeled by kernel version, OS version, docker version, cadvisor version & cadvisor revision. # TYPE cadvisor_version_info gauge cadvisor_version_info{cadvisorRevision="abcdef",cadvisorVersion="0.16.0",dockerVersion="1.8.1",kernelVersion="4.1.6-200.fc22.x86_64",osVersion="Fedora 22 (Twenty Two)"} 1 # HELP container_cpu_system_seconds_total Cumulative system cpu time consumed in seconds.