diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f90f4b3026bab08e8f8936d5f5f88d2e928c0e..5654ec79ad82f60ad803297728fd6e2e46f6a962 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.4.0] - 2025-06-03 +### Changed +- prevent failure when no passthrough vm_domain_file is found +- update base image version + ## [1.3.4] - 2024-03-25 ### Added - cephpingmon added as optional module (default behavior unchanged), add fping dependency diff --git a/Dockerfile b/Dockerfile index eb73492258879c80b1cb6c5c9f33798bc1e39ba6..6cd789ff2e25ef52a00a9289409bf031878d814d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.ics.muni.cz:443/cloud/container-registry/centos:7 +FROM quay.io/centos/centos:stream9 ARG VERSION=unknown-version ARG BUILD_DATE=unknown-date diff --git a/dependencies.yum.txt b/dependencies.yum.txt index dab0d125b9cf091c2e852f360b868a2b59f9fb79..899e5eb7a1fc9094cddc59e3c58d5b5e3227c6bf 100644 --- a/dependencies.yum.txt +++ b/dependencies.yum.txt @@ -1,8 +1,7 @@ jq bash gawk -docker-client -curl +docker cronie smartmontools pciutils diff --git a/src/metric-generators/gpumon.sh b/src/metric-generators/gpumon.sh index 1c37b76b3f9138c16e55e03fd4e8305ab4337ddb..f0e5a0edf4a5dd36fde4e0a138d3dcc5180fb26a 100755 --- a/src/metric-generators/gpumon.sh +++ b/src/metric-generators/gpumon.sh @@ -74,7 +74,9 @@ if [ -n "${GPU_DEVICES}" ]; then if lspci -v -s "${i_gpu_device_location}" | grep -qE 'Kernel driver in use: .+'; then i_gpu_attached=1 i_vm_domain_file="$(find_gpu_passthough_vm_manifest "${i_gpu_device_location}")" - i_vm_domain_name="$(basename $(echo "${i_vm_domain_file}" | head -1) | sed 's/.xml//g')" + if [ -n "${i_vm_domain_file}" ]; then + i_vm_domain_name="$(basename "$(echo "${i_vm_domain_file}" | head -1)" | sed 's/.xml//g')" + fi fi printf '%s{device="%s",vendor="%s",location="%s",revision="%s",domain="%s"} %d\n' "${METRIC_NAME}" \ "${i_gpu_device_model}" "${i_gpu_device_vendor}" "${i_gpu_device_location}" \