f87df98a96
Several collect plugins were using the 'sm-query service' with
'management-ip' as the target service to determine if the host
collect is running on is the active controller.
sm-query service management-ip
Unfortunately, a recent update changed the name of the 'management-ip'
service. This change lead to that query always returning a 'disabled'
status.
This update changes to use 'sm-query service-group controller-services'
instead of a specific service query that might change again in the
future. It also migrates the replicated is_service_active function to
the collect_utils file making it common and reusable by all aspects of
collect. This function was renamed to 'is_controller_active' because
it's no longer representing the activity state of a particular service.
Test Plan:
PASS: Verify 'sysinv' plugin creates var/extra/inventory.info file
on active controller. sysinv CLI command output.
PASS: Verify 'fm' plugin creates var/extra/alarm.info file
on active controller. FM alarm and event listings.
PASS: Verify 'ceph' plugin creates var/extra/ceph.info file
on active controller with 'ceph df' output content.
PASS: Verify 'dc' plugin creates var/extra/distributed_cloud.info file
on active controller of a system controller or subcloud.
Closes-Bug: 2070496
Change-Id: I9989708f1d87a5ef312129cfe3ede8c862764cb0
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
35 lines
859 B
Bash
35 lines
859 B
Bash
#! /bin/bash
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
|
|
# Loads Up Utilities and Commands Variables
|
|
|
|
source /usr/local/sbin/collect_parms
|
|
source /usr/local/sbin/collect_utils
|
|
|
|
SERVICE="alarms"
|
|
LOGFILE="${extradir}/${SERVICE}.info"
|
|
|
|
###############################################################################
|
|
# Only Controller
|
|
###############################################################################
|
|
if [ "$nodetype" = "controller" ] ; then
|
|
|
|
is_active_controller
|
|
if [ "$?" = "0" ] ; then
|
|
exit 0
|
|
fi
|
|
|
|
echo "${hostname}: System Alarm List .: ${LOGFILE}"
|
|
|
|
# These go into the SERVICE.info file
|
|
delimiter ${LOGFILE} "fm alarm-list"
|
|
fm alarm-list 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
|
|
delimiter ${LOGFILE} "fm event-list --nopaging"
|
|
fm event-list --nopaging 2>>${COLLECT_ERROR_LOG} >> ${LOGFILE}
|
|
fi
|
|
|
|
exit 0
|