diff --git a/CHANGELOG.md b/CHANGELOG.md index 6be86f061158fb27a8702d9521b5d710ff9a1654..72034e710eb0619376024279b41af85945ccfbcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.4] - 2021-07-13 +### Fixed +- dockermon id assert corrected, now expects `/docker/` prefix + ## [1.0.3] - 2021-07-12 ### Fixed - compliance with cAdvisor: diff --git a/src/metric-generators/dockermon.sh b/src/metric-generators/dockermon.sh index ee2a7caafa73d9a943ada737dfe38b1ba0be8583..f60dcfc5ead16ccc6d56562e2ae5b54c2fe05e30 100755 --- a/src/metric-generators/dockermon.sh +++ b/src/metric-generators/dockermon.sh @@ -20,7 +20,7 @@ for i_container in ${CONTAINERS}; do 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,}$" + echo -n "${i_container_id}" | grep -Eq "^/docker/[a-fA-F0-9]{12,}$" CONTAINER_IDS+=("${i_container_id}") CONTAINER_NAMES+=("${i_container_name}") CONTAINER_RESTART_COUNTS+=("${i_container_restart_count}")