Revert supportutils-plugin-susemanager-client changes from #9232 due to

SUSE/spacewalk#25211 (#9256)

susemanager-utils/supportutils-plugin-susemanager-client/susemanagerclient

@@ -30,6 +30,7 @@ zypp-plugin-spacewalk
 salt-minion
 salt
 podman
+uyuni-proxy-systemd-services
 "
 
 for THISRPM in $RPMLIST; do
@@ -53,7 +54,8 @@ conf_files $OF \
     /etc/salt/minion \
     /etc/salt/minion.d/susemanager.conf \
     /etc/salt/minion.d/_schedule.conf \
-    /etc/uyuni/proxy/config.yaml
+    /etc/uyuni/proxy/config.yaml  \
+    /etc/sysconfig/uyuni-proxy-systemd-services
 
 
 log_entry $OF note "SUSE Manager Client Log Files"
@@ -80,4 +82,47 @@ log_entry $OF note "Cloud / PAYG"
 log_cmd $OF "test -e /usr/bin/instance-flavor-check && /usr/bin/instance-flavor-check"
 rpm_verify $OF "python-instance-billing-flavor-check"
 
+####################################################################
+#### The instance where a proxy is running, is just a managed client
+####################################################################
 
+log_entry $OF note "Proxy Containers Configuration Files"
+
+log_cmd $OF "ls -l /etc/uyuni/proxy/"
+
+log_entry $OF note "Proxy Containers Systems Status"
+
+SERVICES="
+    uyuni-proxy-pod
+    uyuni-proxy-httpd
+    uyuni-proxy-salt-broker
+    uyuni-proxy-squid
+    uyuni-proxy-ssh
+    uyuni-proxy-tftpd
+"
+
+for SERVICE in $SERVICES; do
+    check_service $OF $SERVICE
+done
+
+CONTAINERS="
+    uyuni-proxy-httpd
+    uyuni-proxy-ssh
+    uyuni-proxy-squid
+    uyuni-proxy-tftpd
+    uyuni-proxy-salt-broker
+"
+
+if which podman >/dev/null 2>&1; then
+    log_entry $OF note "Proxy Containers Inspects"
+
+    for CONTAINER in $CONTAINERS; do
+        log_cmd $OF "podman inspect $CONTAINER"
+    done
+
+    log_entry $OF note "Proxy Containers Logs"
+
+    for CONTAINER in $CONTAINERS; do
+        log_cmd $OF "podman logs $CONTAINER"
+    done
+fi

susemanager-utils/supportutils-plugin-susemanager-client/susemanagerclient-scplugin

@@ -43,6 +43,7 @@ zypp-plugin-spacewalk
 salt-minion
 salt
 podman
+uyuni-proxy-systemd-services
 "
 
 for THISRPM in $RPMLIST; do
@@ -66,7 +67,8 @@ pconf_files \
     /etc/salt/minion \
     /etc/salt/minion.d/susemanager.conf \
     /etc/salt/minion.d/_schedule.conf \
-    /etc/uyuni/proxy/config.yaml
+    /etc/uyuni/proxy/config.yaml \
+    /etc/sysconfig/uyuni-proxy-systemd-services
 
 
 section_header "SUSE Manager Client Capabilities"
@@ -99,6 +101,53 @@ else
         plugin_command "grep -v '#' /usr/share/crypto-policies/default-config"
 fi
 
+section_header "Proxy Containers Configuration Files"
+
+plugin_command "ls -l /etc/uyuni/proxy/"
+
+section_header "Proxy Containers Systems Status"
+
+systemd_status() {
+    if systemctl list-unit-files $1 >/dev/null; then
+        plugin_command "systemctl status $1"
+    fi
+}
+
+SERVICES="
+    uyuni-proxy-pod
+    uyuni-proxy-httpd
+    uyuni-proxy-salt-broker
+    uyuni-proxy-squid
+    uyuni-proxy-ssh
+    uyuni-proxy-tftpd
+"
+
+for SERVICE in $SERVICES; do
+    systemd_status "$SERVICE.service"
+done
+
+CONTAINERS="
+    uyuni-proxy-httpd
+    uyuni-proxy-ssh
+    uyuni-proxy-squid
+    uyuni-proxy-tftpd
+    uyuni-proxy-salt-broker
+"
+
+if which podman >/dev/null 2>&1; then
+    section_header "Proxy Containers Inspects"
+
+    for CONTAINER in $CONTAINERS; do
+        plugin_command "podman inspect $CONTAINER"
+    done
+
+    section_header "Proxy Containers Logs"
+
+    for CONTAINER in $CONTAINERS; do
+        plugin_command "podman logs $CONTAINER"
+    done
+fi
+
 section_header "Cloud / PAYG"
 plugin_command "test -e /usr/bin/instance-flavor-check && /usr/bin/instance-flavor-check"
 validate_rpm_if_installed "python-instance-billing-flavor-check"