starlingx/utilities
Code Issues Proposed changes

Modified collect to gather system files from /home/sysadmin

Browse Source 
The collect tool is being modified to gather the relevant
system files from /home/sysadmin
to include in collect data.

Test Plan:
PASS: Selected /home/sysadmin files are gathered under collect data,
test passed in both centos and debian.
PASS: No error output on the console,when files are missing.

Story: 2009968
Task: 47284

Signed-off-by: spolice <salma.police@windriver.com>
Change-Id: Icfec1688d597237f11717bd7ce4c8d99d0345ac5
This commit is contained in:
spolice 2023-02-07 08:48:57 -05:00
parent d215516481
commit cd620dca5c
4 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/collector/centos/collector.spec
View File

@ -53,6 +53,7 @@ install -m 755 collect_containerization.sh %{buildroot}%{_sysconfdir}/collect.d/
install -m 755 collect_dc.sh %{buildroot}%{_sysconfdir}/collect.d/collect_dc
install -m 755 collect_disk.sh %{buildroot}%{_sysconfdir}/collect.d/collect_disk
install -m 755 collect_interfaces.sh %{buildroot}%{_sysconfdir}/collect.d/collect_interfaces
install -m 755 collect_sysadmin.sh %{buildroot}%{_sysconfdir}/collect.d/collect_sysadmin
install -m 755 etc.exclude %{buildroot}%{_sysconfdir}/collect/etc.exclude
install -m 755 run.exclude %{buildroot}%{_sysconfdir}/collect/run.exclude

23
tools/collector/debian-scripts/collect_sysadmin.sh Normal file
View File

@ -0,0 +1,23 @@
#! /bin/bash
#
# Copyright (c) 2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
# Loads Up Utilities and Commands Variables
source /usr/local/sbin/collect_parms
source /usr/local/sbin/collect_utils
SYSADMIN_DIR="${extradir}/sysadmin"
mkdir -p ${SYSADMIN_DIR}
#check files exists and then copy to sysadmin directory
[ -e /home/sysadmin/*.log ] && cp /home/sysadmin/*.log /${SYSADMIN_DIR}/
[ -e /home/sysadmin/*.yml ] && cp /home/sysadmin/*.yml /${SYSADMIN_DIR}/
[ -e /home/sysadmin/*.yaml ] && cp /home/sysadmin/*.yaml /${SYSADMIN_DIR}/
exit 0

1
tools/collector/debian/deb_folder/rules
View File

@ -67,6 +67,7 @@ override_dh_auto_install:
install -m 755 -p collect_dc.sh $(SYSCONFDIR)/collect.d/collect_dc
install -m 755 -p collect_disk.sh $(SYSCONFDIR)/collect.d/collect_disk
install -m 755 -p collect_interfaces.sh $(SYSCONFDIR)/collect.d/collect_interfaces
install -m 755 -p collect_sysadmin.sh $(SYSCONFDIR)/collect.d/collect_sysadmin
install -m 755 -p etc.exclude $(SYSCONFDIR)/collect/etc.exclude
install -m 755 -p run.exclude $(SYSCONFDIR)/collect/run.exclude

23
tools/collector/scripts/collect_sysadmin.sh Normal file
View File

@ -0,0 +1,23 @@
#! /bin/bash
#
# Copyright (c) 2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
# Loads Up Utilities and Commands Variables
source /usr/local/sbin/collect_parms
source /usr/local/sbin/collect_utils
SYSADMIN_DIR="${extradir}/sysadmin"
mkdir -p ${SYSADMIN_DIR}
#check files exists and then copy to sysadmin directory
[ -e /home/sysadmin/*.log ] && cp /home/sysadmin/*.log /${SYSADMIN_DIR}/
[ -e /home/sysadmin/*.yml ] && cp /home/sysadmin/*.yml /${SYSADMIN_DIR}/
[ -e /home/sysadmin/*.yaml ] && cp /home/sysadmin/*.yaml /${SYSADMIN_DIR}/
exit 0