From 95fbe5577c9d73432bebd5e5b4345bdb93c25825 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Thu, 7 Aug 2025 09:53:09 -0600
Subject: [PATCH] [ceph-mgr] Remove grep from the ceph-mgr health check
 function

Ceph 19.2.3 replaces the handler for the ceph-mgr asok status query
with a new handler that simply returns an empty dictionary and a
success code. The ceph-mgr readiness/liveness probe health check
function currently relies on content from the returned dictionary
to succeed. This change simply removes that content check and
relies solely on the return code of the status query instead.

This change to the ceph-mgr probes retains backward compatiblity
with previous Ceph versions as well.

Change-Id: Iffa1764735733a2b2ef16c5cba6c9880d03b357b
Signed-off-by: Stephen Taylor <stephen.taylor.1@att.com>
---
 ceph-mon/templates/bin/mgr/_check.sh.tpl          | 2 +-
 releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml

diff --git a/ceph-mon/templates/bin/mgr/_check.sh.tpl b/ceph-mon/templates/bin/mgr/_check.sh.tpl
index e37f2d084b..2208aa0598 100644
--- a/ceph-mon/templates/bin/mgr/_check.sh.tpl
+++ b/ceph-mon/templates/bin/mgr/_check.sh.tpl
@@ -22,7 +22,7 @@ COMMAND="${@:-liveness}"
 function heath_check () {
    ASOK=$(ls /var/run/ceph/${CLUSTER}-mgr*)
    MGR_NAME=$(basename ${ASOK} | sed -e 's/.asok//' | cut -f 1 -d '.' --complement)
-   MGR_STATE=$(ceph --cluster ${CLUSTER} --connect-timeout 1 daemon mgr.${MGR_NAME} status|grep "osd_epoch")
+   MGR_STATE=$(ceph --cluster ${CLUSTER} --connect-timeout 1 daemon mgr.${MGR_NAME} status)
    if [ $? = 0 ]; then
      exit 0
    else
diff --git a/releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml b/releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml
new file mode 100644
index 0000000000..dd6176cea8
--- /dev/null
+++ b/releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml
@@ -0,0 +1,6 @@
+---
+ceph-mon:
+  - |
+    Upgrade Ceph to 19.2.3 and adjust the ceph-mgr liveness probe to account
+    for a new asok status query handler that returns an empty dictionary.
+...