From a50e362a77fea62623560e18a5029ad2a941b0c6 Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:36:39 -0600 Subject: [PATCH 1/2] fix the /ok test --- webapi/cvmfsmon_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapi/cvmfsmon_api.py b/webapi/cvmfsmon_api.py index a3de935..1463e59 100644 --- a/webapi/cvmfsmon_api.py +++ b/webapi/cvmfsmon_api.py @@ -203,9 +203,8 @@ def dispatch(version, montests, parameters, start_response, environ): for repo in replicas_and_repos: if repo in excludes: continue - results = [] if montests == 'ok': - results.append([ 'ok', repo, 'OK', '' ]) + allresults.append([ 'ok', repo, 'OK', '' ]) continue errormsg = "" doupdated = False @@ -245,6 +244,7 @@ def dispatch(version, montests, parameters, start_response, environ): except: errormsg = str(sys.exc_info()[1]) + results = [] if domontest('check', montests): results.append(cvmfsmon_check.runtest(repo, repo_status, errormsg)) From 0213fe6bc7e0477f49aaaef95b944af78e75d3bc Mon Sep 17 00:00:00 2001 From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:39:09 -0600 Subject: [PATCH 2/2] update to 1.29 --- rpm/cvmfs-servermon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpm/cvmfs-servermon.spec b/rpm/cvmfs-servermon.spec index 3c5fea6..a544902 100644 --- a/rpm/cvmfs-servermon.spec +++ b/rpm/cvmfs-servermon.spec @@ -1,6 +1,6 @@ Summary: CernVM File System Server Monitoring Name: cvmfs-servermon -Version: 1.28 +Version: 1.29 # The release_prefix macro is used in the OBS prjconf, don't change its name %define release_prefix 1 Release: %{release_prefix}%{?dist} @@ -68,6 +68,9 @@ setsebool -P httpd_can_network_connect 1 2>/dev/null || true /usr/share/cvmfs-servermon %changelog +* Mon Feb 10 2025 Dave Dykstra - 1.29-1 +- Fix the /ok api, which was showing nothing. + * Mon Sep 2 2024 Dave Dykstra - 1.28-1 - Prevent json pretty printer from breaking up long strings, the way pyhon2 did it.