From c7f6f03044a12805ab04adc94a2e5ce34a49b06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20=C5=98ezn=C3=AD=C4=8Dek?= <246254@mail.muni.cz> Date: Mon, 12 Jul 2021 12:00:27 +0000 Subject: [PATCH] fix: cAdvisor metrics compliance - name and id label values --- CHANGELOG.md | 6 ++++++ src/metric-generators/dockermon.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df7590..6be86f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.3] - 2021-07-12 +### Fixed +- compliance with cAdvisor: + * container name (`name`) never starts with `/`, dropping leading slash too + * container id (`id`) is prefixed with `/docker/` + ## [1.0.2] - 2021-06-30 ### Fixed - dockermon textfile metrics documentation string now correctly prefixed with `# ` diff --git a/src/metric-generators/dockermon.sh b/src/metric-generators/dockermon.sh index f8444e9..ee2a7ca 100755 --- a/src/metric-generators/dockermon.sh +++ b/src/metric-generators/dockermon.sh @@ -15,9 +15,9 @@ CONTAINERS=$(docker ps -a -q) for i_container in ${CONTAINERS}; do i_container_status="$(docker inspect "${i_container}")" - i_container_name="$(echo "${i_container_status}" | jq -r '.[].Name')" + i_container_name="$(echo "${i_container_status}" | jq -r '.[].Name' | sed 's|^/||')" i_container_restart_count="$(echo "${i_container_status}" | jq -r '.[].RestartCount')" - i_container_id="$(echo "${i_container_status}" | jq -r '.[].Id')" + i_container_id="/docker/$(echo "${i_container_status}" | jq -r '.[].Id')" test -n "${i_container_name}" echo -n "${i_container_restart_count}" | grep -Eq "^[0-9]+$" echo -n "${i_container_id}" | grep -Eq "^[a-fA-F0-9]{12,}$" -- GitLab