Hello community,
here is the log from the commit of package sca-appliance-broker for
openSUSE:Factory checked in at 2018-01-19 11:52:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-appliance-broker (Old)
and /work/SRC/openSUSE:Factory/.sca-appliance-broker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-appliance-broker"
Fri Jan 19 11:52:28 2018 rev:2 rq:563424 version:1.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/sca-appliance-broker/sca-appliance-broker.changes
2018-01-09 14:51:31.128512088 +0100
+++
/work/SRC/openSUSE:Factory/.sca-appliance-broker.new/sca-appliance-broker.changes
2018-01-19 11:52:53.248559322 +0100
@@ -1,0 +2,10 @@
+Wed Jan 3 19:31:11 UTC 2018 - [email protected]
+
+- Removed additional /usr/bin/[ references
+
+-------------------------------------------------------------------
+Tue Jan 2 20:01:57 UTC 2018 - [email protected]
+
+- Removed references to /usr/bin/[
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-appliance-broker-1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/scadb
new/sca-appliance-broker-1.3/bin/scadb
--- old/sca-appliance-broker-1.3/bin/scadb 2015-07-17 00:26:19.796481073
+0200
+++ new/sca-appliance-broker-1.3/bin/scadb 2018-01-03 20:30:01.584446016
+0100
@@ -1,5 +1,34 @@
#!/bin/bash
-SVER="1.0.22"
+
+SVER='1.0.24'
+
+##############################################################################
+# scadb - Supportconfig Analysis Database Tool
+# Copyright (c) 2018 SUSE LLC
+#
+# Description: Manages the SCA Database
+# Runs on: Broker Server
+# Modified: 2018 Jan 03
+
+##############################################################################
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Authors/Contributors:
+# Jason Record ([email protected])
+#
+##############################################################################
+
ALL="arch agents workers"
CONF='/etc/sca/sdbroker.conf'
DEFAULT_LIMIT=30
@@ -175,10 +204,10 @@
case $2 in
reset)
ARCHIVE_ID=$3
- if [ -n "$ARCHIVE_ID" ]; then
+ if [[ -n "$ARCHIVE_ID" ]]; then
echo "Resetting archive $ARCHIVE_ID to be reanalyzed"
mysql $DB_CONNECT -e "UPDATE Archives SET
ArchiveEvent=NOW(), ArchiveMessage='Admin Reanalysis Request',
ArchiveState='New', RetryCount=0, AssignedAgentID=NULL, AssignedWorkerID=NULL,
ReportDate=NULL, ReportTime=NULL WHERE ArchiveID=$ARCHIVE_ID"
- if [ $? -eq 0 ]; then
+ if [[ $? -eq 0 ]]; then
echo "Removing any previous analysis results"
mysql $DB_CONNECT -e "DELETE FROM Results WHERE
ResultsArchiveID=$ARCHIVE_ID"
fi
@@ -190,7 +219,7 @@
;;
done)
ARCHIVE_ID=$3
- if [ -n "$ARCHIVE_ID" ]; then
+ if [[ -n "$ARCHIVE_ID" ]]; then
echo "Marking archive $ARCHIVE_ID to be complete"
mysql $DB_CONNECT -e "UPDATE Archives SET
ArchiveEvent=NOW(), ArchiveMessage='Admin Marked Done', ArchiveState='Done',
RetryCount=0 WHERE ArchiveID=$ARCHIVE_ID"
else
@@ -201,10 +230,10 @@
;;
ignore)
ARCHIVE_ID=$3
- if [ -n "$ARCHIVE_ID" ]; then
+ if [[ -n "$ARCHIVE_ID" ]]; then
echo "Marking archive $ARCHIVE_ID to be ignored"
mysql $DB_CONNECT -e "UPDATE Archives SET
ArchiveEvent=NOW(), ArchiveMessage='Admin Ignore Request',
ArchiveState='Error', RetryCount=0, AssignedAgentID=NULL,
AssignedWorkerID=NULL, ReportDate=NULL, ReportTime=NULL WHERE
ArchiveID=$ARCHIVE_ID"
- if [ $? -eq 0 ]; then
+ if [[ $? -eq 0 ]]; then
echo "Removing any assigned worker threads"
mysql $DB_CONNECT -e "UPDATE AgentWorkers SET
ArchiveAssigned=NULL WHERE ArchiveAssigned=$ARCHIVE_ID"
echo "Removing any previous analysis results"
@@ -261,7 +290,7 @@
;;
import)
FILE=$2
- if [ -n "$FILE" ]; then
+ if [[ -n "$FILE" ]]; then
echo "Importing file: '$FILE'"
cat $FILE | mysql $DB_CONNECT
else
@@ -306,7 +335,7 @@
;;
old)
DAYS=$2
- if [ -z "$DAYS" ]; then
+ if [[ -z "$DAYS" ]]; then
echo "Error: Missing days value"; echo
showHelp
exit 3
@@ -314,7 +343,7 @@
if [[ "$DAYS" =~ ^[0-9]*$ ]]; then
ARCHIDS=$(mysql -NB $DB_CONNECT -e "SELECT ArchiveID
FROM Archives WHERE DATE(ArchiveEvent) < SUBDATE(CURRENT_DATE(), INTERVAL $DAYS
DAY)")
ARCHCNT=$(echo $ARCHIDS | wc -w)
- if [ $ARCHCNT -gt 0 ]; then
+ if [[ $ARCHCNT -gt 0 ]]; then
if confirmed "Found $ARCHCNT archives older
than $DAYS days, delete them?"; then
echo "Deleting Archive Results for
$ARCHCNT Archives"
mysql $DB_CONNECT -e "LOCK TABLES
Results WRITE" #Establish MUTEX
@@ -339,7 +368,7 @@
;;
del)
ARCHID=$2
- if [ -z "$ARCHID" ]; then
+ if [[ -z "$ARCHID" ]]; then
echo "Error: Missing Archive ID value"; echo
showHelp
exit 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/sdbroker
new/sca-appliance-broker-1.3/bin/sdbroker
--- old/sca-appliance-broker-1.3/bin/sdbroker 2015-07-17 00:26:19.797481083
+0200
+++ new/sca-appliance-broker-1.3/bin/sdbroker 2018-01-02 20:43:06.341603149
+0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER='1.0.5'
+SVER='1.0.6'
##############################################################################
# sdbroker - Supportconfig Analysis Broker
-# Copyright (c) 2013 SUSE LLC
+# Copyright (c) 2018 SUSE LLC
#
# Description: Maintains the list of new archives.
# Runs on: Broker Server
-# Modified: 2014 Jun 26
+# Modified: 2018 Jan 02
##############################################################################
#
@@ -25,7 +25,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# Jason Record ([email protected])
+# Jason Record ([email protected])
#
##############################################################################
@@ -49,7 +49,7 @@
}
showHelp() {
- [ -n "$1" ] && { echo "$1"; echo; }
+ [[ -n "$1" ]] && { echo "$1"; echo; }
echo "Usage: $CURRENT_SCRIPT -hl"
echo "Description:"
echo " Assigns new supportconfig archives for analysis."
@@ -71,10 +71,10 @@
*) SYSTEM_LOGGER=1; CURRENT_LOGLEVEL=$LOGLEVEL_MIN ;;
esac
shift
- if [ $LOGLEVEL -ge $CURRENT_LOGLEVEL ]; then
- if [ $SYSTEM_LOGGER -gt 0 ]; then
- [ -n "$2" ] && logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: [$1] $2" || logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: $1"
- if [ $LOGLEVEL -gt $LOGLEVEL_SILENT ]; then
+ if [[ $LOGLEVEL -ge $CURRENT_LOGLEVEL ]]; then
+ if [[ $SYSTEM_LOGGER -gt 0 ]]; then
+ [[ -n "$2" ]] && logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: [$1] $2" || logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: $1"
+ if [[ $LOGLEVEL -gt $LOGLEVEL_SILENT ]]; then
printf "%-15s %s\n" "$1" "$2"
fi
else
@@ -108,12 +108,12 @@
RCODE=$?
if (( RCODE )); then
msg normal SQL "ERROR Cannot access administrative database
$DB_NAME on localhost"
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin "No DB Access"
"ERROR Cannot access administrative database $DB_NAME on localhost"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin "No DB Access"
"ERROR Cannot access administrative database $DB_NAME on localhost"
exit 5
fi
- if [ $ACTIVE_AGENTS -eq 0 ]; then
+ if [[ $ACTIVE_AGENTS -eq 0 ]]; then
msg normal AGENTS "ERROR There are no Active agents"
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin 'NO ACTIVE
AGENTS' "ERROR: There are no Active agents, no supportconfig archives will be
processed."
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin 'NO ACTIVE
AGENTS' "ERROR: There are no Active agents, no supportconfig archives will be
processed."
else
checkAgentActivity
fi
@@ -123,7 +123,7 @@
msg debug " >> getCurlError"
CURL_ERRORS='/usr/share/doc/packages/sca/curl.codes.txt'
ERRSTR=$(grep " ($RCODE) " $CURL_ERRORS 2>/dev/null | cut -d' ' -f1,2)
- if [ -z "$ERRSTR" ]; then
+ if [[ -z "$ERRSTR" ]]; then
ERRSTR="Unknown Error ($RCODE)"
fi
msg debug RESULT "Curl Error Transliteration: $ERRSTR"
@@ -139,12 +139,12 @@
RCODE=$?
if [[ $RCODE -gt 0 ]]; then
getCurlError
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin 'Cannot
Download Archives' "ERROR Getting archive manifest; $ERRSTR, INSRC=${INSRC}"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin
'Cannot Download Archives' "ERROR Getting archive manifest; $ERRSTR,
INSRC=${INSRC}"
exit $RCODE
fi
;;
file)
- if [ -d ${INSRC_DIR} ]; then
+ if [[ -d ${INSRC_DIR} ]]; then
ls -1 ${INSRC_DIR}/ 2>/dev/null > ${ARCHIVE_INBOUND}.raw
else
RCODE=5
@@ -152,7 +152,7 @@
;;
esac
if (( RCODE )); then
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin 'Cannot Download
Archives' "ERROR Getting archive manifest; RC=$RCODE, INSRC=${INSRC}"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin 'Cannot
Download Archives' "ERROR Getting archive manifest; RC=$RCODE, INSRC=${INSRC}"
exit 8
fi
@@ -167,7 +167,7 @@
cat ${ARCHIVE_INBOUND} | mysql $DB_CONNECT
RCODE=$?
if (( RCODE )); then
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin 'SQL Import
Failed' "ERROR Importing archive manifest into mySQL database $DB_NAME"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin 'SQL Import
Failed' "ERROR Importing archive manifest into mySQL database $DB_NAME"
else
msg debug CMD "rm -f ${ARCHIVE_INBOUND}*"
rm -f ${ARCHIVE_INBOUND}*
@@ -183,7 +183,7 @@
ARCHIDS=$(mysql -BN $DB_CONNECT -e "SELECT CONCAT_WS(',', ArchiveID,
AssignedAgentID, AssignedWorkerID) FROM Archives WHERE ArchiveState='Assigned'
AND ArchiveEvent < SUBTIME(NOW(), $ARCHIVE_ASSIGNED_TIMEOUT)")
msg debug ARCHIDS "'$ARCHIDS'"
msg debug ARCHIVE_ASSIGNED_TIMEOUT "'$ARCHIVE_ASSIGNED_TIMEOUT'"
- if [ -n "$ARCHIDS" ]; then
+ if [[ -n "$ARCHIDS" ]]; then
msg debug FOUND "Processing stale assigned archives"
STALE_ARCHIVES=0
for ARCHIVE_INFO in $ARCHIDS
@@ -196,23 +196,23 @@
msg debug ARCHIVE_ID "'$ARCHIVE_ID'"
msg debug AGENT_ID "'$AGENT_ID'"
msg debug WORKER_ID "'$WORKER_ID'"
- [ -z "$ARCHIVE_ID" ] && INFO_FOUND=0
- [ -z "$AGENT_ID" ] && INFO_FOUND=0
- [ -z "$WORKER_ID" ] && WORKER_ID='NULL'
+ [[ -z "$ARCHIVE_ID" ]] && INFO_FOUND=0
+ [[ -z "$AGENT_ID" ]] && INFO_FOUND=0
+ [[ -z "$WORKER_ID" ]] && WORKER_ID='NULL'
if (( INFO_FOUND )); then
msg verbose STALE "Reassigning Stale
Archive_${ARCHIVE_ID}:Agent_${AGENT_ID}:Worker_${WORKER_ID}"
mysql $DB_CONNECT -e "UPDATE Agents SET
AgentState='Stale', AgentEvent=NOW(), AgentMessage='Unprocessed assigned
archives' WHERE AgentID='$AGENT_ID'"
mysql $DB_CONNECT -e "UPDATE AgentWorkers SET
ArchiveAssigned=NULL WHERE ArchiveAssigned='$ARCHIVE_ID'"
else
- [ $EMAIL_LEVEL -ge $EMAIL_NORMAL ] &&
notifyAdmin "STALE ArchiveID ${ARCHIVE_ID}" "Cannot get additional info on
stale assigned ArchiveID $ARCHIVE_ID"
+ [[ $EMAIL_LEVEL -ge $EMAIL_NORMAL ]] &&
notifyAdmin "STALE ArchiveID ${ARCHIVE_ID}" "Cannot get additional info on
stale assigned ArchiveID $ARCHIVE_ID"
fi
mysql $DB_CONNECT -e "UPDATE Archives SET
ArchiveState='New', ArchiveEvent=NOW(), ArchiveMessage='Reassigned',
AssignedAgentID=NULL, AssignedWorkerID=NULL WHERE ArchiveID='$ARCHIVE_ID'"
done
if (( INFO_FOUND )); then
AGENT_HOSTNAME=$(mysql -NB $DB_CONNECT -e "SELECT
Hostname FROM Agents WHERE AgentID=${AGENT_ID}")
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin "STALE
Agent ${AGENT_HOSTNAME}" "Removed stale agent ${AGENT_HOSTNAME} (AgentID
${AGENT_ID}) from agent queue"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin "STALE
Agent ${AGENT_HOSTNAME}" "Removed stale agent ${AGENT_HOSTNAME} (AgentID
${AGENT_ID}) from agent queue"
else
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin "Unknown
Stale Agent" "Unknown agent did not process assigned archives"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin
"Unknown Stale Agent" "Unknown agent did not process assigned archives"
fi
msg normal STALE "Reassigned stale archives: $STALE_ARCHIVES"
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/sdbroker-monitor
new/sca-appliance-broker-1.3/bin/sdbroker-monitor
--- old/sca-appliance-broker-1.3/bin/sdbroker-monitor 2015-07-17
00:26:19.797481083 +0200
+++ new/sca-appliance-broker-1.3/bin/sdbroker-monitor 2018-01-02
20:55:25.251959045 +0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER=1.0.4
+SVER='1.0.5'
##############################################################################
# sdbroker-monitor - SCA Broker Monitor
-# Copyright (C) 2014 SUSE LLC
+# Copyright (C) 2018 SUSE LLC
#
# Description: Monitors the current status of Broker Server and it's Agents
# Runs on: Broker Server
-# Modified: 2014 Jun 26
+# Modified: 2018 Jan 02
#
##############################################################################
#
@@ -25,13 +25,13 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# Jason Record ([email protected])
+# Jason Record ([email protected])
#
##############################################################################
CURRENT_SCRIPT=$(basename $0)
. /etc/sca/sdbroker.conf
-[ -s /etc/sca/sdbroker-monitor.conf ] && . /etc/sca/sdbroker-monitor.conf
+[ -s /etc/sca/sdbroker-monitor.conf ]] && . /etc/sca/sdbroker-monitor.conf
msg() {
FACLEVEL='info'
@@ -44,10 +44,10 @@
*) SYSTEM_LOGGER=1; CURRENT_LOGLEVEL=$LOGLEVEL_MIN ;;
esac
shift
- if [ $LOGLEVEL -ge $CURRENT_LOGLEVEL ]; then
- if [ $SYSTEM_LOGGER -gt 0 ]; then
- [ -n "$2" ] && logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: [$1] $2" || logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: $1"
- if [ $LOGLEVEL -gt $LOGLEVEL_SILENT ]; then
+ if [[ $LOGLEVEL -ge $CURRENT_LOGLEVEL ]]; then
+ if [[ $SYSTEM_LOGGER -gt 0 ]]; then
+ [[ -n "$2" ]] && logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: [$1] $2" || logger -p "user.${FACLEVEL}"
"${CURRENT_SCRIPT}[$$]: $1"
+ if [[ $LOGLEVEL -gt $LOGLEVEL_SILENT ]]; then
printf "%-15s %s\n" "$1" "$2"
fi
else
@@ -67,7 +67,7 @@
restoreDeadAgents() {
DEAD_AGENTS=$(mysql -NB $DB_CONNECT -e "SELECT Hostname FROM Agents
WHERE AgentState='Dead'")
- if [ -n "$DEAD_AGENTS" ]; then
+ if [[ -n "$DEAD_AGENTS" ]]; then
msg verbose BROKER "Checking dead agents $DEAD_AGENTS"
for i in $DEAD_AGENTS
do
@@ -76,10 +76,10 @@
THREADS=$(mysql -NB $DB_CONNECT -e "SELECT
COUNT(ArchiveAssigned) FROM AgentWorkers WHERE WorkersAgentID='$AGENT_ID' AND
ArchiveAssigned IS NOT NULL")
mysql $DB_CONNECT -e "UPDATE Agents SET
AgentEvent=NOW(), AgentState='Active', AgentMessage='Agent back up,
activating', ThreadsActive=$THREADS WHERE Hostname='$i'"
msg min BROKER "Activated Agent $i"
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin
"Activated Agent $i, Ready for archive assignments."
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] &&
notifyAdmin "Activated Agent $i, Ready for archive assignments."
else
msg min BROKER "Still Cannot Connect Agent: $i"
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin
"Agent $i Dead, still cannot ping the agent."
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] &&
notifyAdmin "Agent $i Dead, still cannot ping the agent."
fi
done
else
@@ -89,17 +89,17 @@
pingAgents() {
PING_AGENTS=$(mysql -NB $DB_CONNECT -e "SELECT Hostname FROM Agents
WHERE AgentState='Active'")
- if [ -n "$PING_AGENTS" ]; then
+ if [[ -n "$PING_AGENTS" ]]; then
msg verbose BROKER "Checking agent connectivity $PING_AGENTS"
for i in $PING_AGENTS
do
if ping -c1 -w1 $i &>/dev/null; then
msg verbose BROKER "Ping Agent $i Successful"
- [ $EMAIL_LEVEL -ge $EMAIL_VERBOSE ] &&
notifyAdmin "Agent $i, Network connectivity confirmed."
+ [[ $EMAIL_LEVEL -ge $EMAIL_VERBOSE ]] &&
notifyAdmin "Agent $i, Network connectivity confirmed."
else
msg min BROKER "Ping Agent $i FAILED"
AGENT_ID=$(mysql -NB $DB_CONNECT -e "UPDATE
Agents SET AgentEvent=NOW(), AgentState='Dead', AgentMessage='Cannot ping
agent' WHERE Hostname='$i'")
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin
"Agent $i Dead, cannot ping agent."
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] &&
notifyAdmin "Agent $i Dead, cannot ping agent."
exit
fi
done
@@ -112,11 +112,11 @@
### main
###########################################################################################################
-[ -s /etc/HOSTNAME ] && SERVER_NAME=$(head -1 /etc/HOSTNAME) ||
SERVER_NAME=$(hostname)
+[[ -s /etc/HOSTNAME ]] && SERVER_NAME=$(head -1 /etc/HOSTNAME) ||
SERVER_NAME=$(hostname)
mysql $DB_CONNECT -e "USE $DB_NAME" &>/dev/null
-if [ $? -gt 0 ]; then
+if [[ $? -gt 0 ]]; then
msg normal SQL "ERROR: Broker $SERVER_NAME cannot connect to the
$DB_NAME database on $DB_HOSTNAME"
- [ $EMAIL_LEVEL -ge $EMAIL_MIN ] && notifyAdmin "DB Connection Failed"
"ERROR: Broker $SERVER_NAME cannot connect to the $DB_NAME database on
$DB_HOSTNAME"
+ [[ $EMAIL_LEVEL -ge $EMAIL_MIN ]] && notifyAdmin "DB Connection Failed"
"ERROR: Broker $SERVER_NAME cannot connect to the $DB_NAME database on
$DB_HOSTNAME"
exit 2
else
pingAgents
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/setup-sca
new/sca-appliance-broker-1.3/bin/setup-sca
--- old/sca-appliance-broker-1.3/bin/setup-sca 2017-12-19 00:34:30.288630607
+0100
+++ new/sca-appliance-broker-1.3/bin/setup-sca 2018-01-02 20:55:31.627772150
+0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER=1.0.31
+SVER='1.0.31_DEV2'
##############################################################################
# setup-sca - SCA Appliance Setup Tool
-# Copyright (C) 2014-2017 SUSE LLC
+# Copyright (C) 2014-2018 SUSE LLC
#
# Description: Sets up a standard local host configuration of the SCA
# appliance
-# Modified: 2017 Dec 18
+# Modified: 2018 Jan 02
#
##############################################################################
#
@@ -25,12 +25,15 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# Jason Record ([email protected])
+# Jason Record ([email protected])
#
##############################################################################
CURRENT_SCRIPT=$(basename $0)
CURRENT_ARGS="$*"
CRON_COMBINED="/usr/share/doc/packages/sca-appliance-broker/combined.cron"
+PHP_VERSION=''
+SERVER=$(hostname -f &>/dev/null)
+[[ -z "$SERVER" ]] && SERVER=$HOSTNAME
title() {
echo
"####################################################################"
@@ -40,14 +43,14 @@
}
showHelp() {
- [ -n "$1" ] && { echo "$1"; echo; }
+ [[ -n "$1" ]] && { echo "$1"; echo; }
echo "Usage: $CURRENT_SCRIPT [OPTIONS] Run the following command from
each server you want analyzed:
- supportconfig -U 'ftp://151.155.233.40/upload/'
+ supportconfig -U 'ftp://${SERVER}/upload/'
To view the analysis reports, goto the URL:
- https://151.155.233.40/
+ https://${SERVER}/
"
echo
echo 'Description:'
@@ -70,8 +73,6 @@
showUsage() {
echo
- SERVER=$(hostname -f &>/dev/null)
- [[ -z "$SERVER" ]] && SERVER=$HOSTNAME
echo "SCA Appliance Server Configuration Complete"
echo
echo "To analyze supportconfigs:"
@@ -105,6 +106,26 @@
echo
}
+getPHPVersion() {
+ printf "$FMT2" "PHP Version"
+ FOUND_VERSION=0
+ CHECK_VERSIONS="php7 php5"
+ for PHP_VERSION in $CHECK_VERSIONS
+ do
+ if zypper se ${PHP_VERSION}-mysql &>/dev/null; then
+ FOUND_VERSION=1
+ break
+ fi
+ done
+ if (( FOUND_VERSION )); then
+ echo $PHP_VERSION
+ else
+ echo "ERROR"
+ PHP_VERSION='_unknown_'
+ FATAL_ERROR=1
+ fi
+}
+
serverAccess()
{
printf "$FMT2" "Pinging $USE_HOSTNAME"
@@ -143,7 +164,7 @@
fi
printf "$FMT2" "Additional Required Packages"
- REQUIRED_PACKAGES='php5-bz2 php5-mbstring php5-mcrypt php5-mysql
php5-zip php5-zlib apache2-mod_php5'
+ REQUIRED_PACKAGES="${PHP_VERSION}-bz2 ${PHP_VERSION}-mbstring
${PHP_VERSION}-mysql ${PHP_VERSION}-zip ${PHP_VERSION}-zlib
apache2-mod_${PHP_VERSION}"
MISSING_PACKAGES=''
for PACKAGE in $REQUIRED_PACKAGES
do
@@ -283,13 +304,13 @@
ACONF="/etc/sysconfig/apache2"
if [[ -s $ACONF ]]
then
- if grep '^APACHE_MODULES=' $ACONF | grep 'php5' &>/dev/null
+ if grep '^APACHE_MODULES=' $ACONF | grep "${PHP_VERSION}"
&>/dev/null
then
echo 'Installed'
else
BCONF="${ACONF}.orig_setup-sca"
[[ -s $BCONF ]] || mv $ACONF $BCONF
- sed -e 's/^APACHE_MODULES="\(.*\)"/APACHE_MODULES="\1
php5"/' $BCONF > $ACONF
+ sed -e
"s/^APACHE_MODULES=\"\(.*\)\"/APACHE_MODULES=\"\1 ${PHP_VERSION}\"/" $BCONF >
$ACONF
echo 'Configured'
fi
else
@@ -513,6 +534,7 @@
############################################################################
title
serverAccess
+getPHPVersion
phpCheck
packageCheck
printf "$FMT1" "Archive Location" "$ARCHIVE_LOCATION"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/setup-sdagent
new/sca-appliance-broker-1.3/bin/setup-sdagent
--- old/sca-appliance-broker-1.3/bin/setup-sdagent 2015-07-17
00:26:19.797481083 +0200
+++ new/sca-appliance-broker-1.3/bin/setup-sdagent 2018-01-02
20:57:39.792015432 +0100
@@ -1,16 +1,16 @@
#!/bin/bash
-SVER=1.0.6
+SVER='1.0.7'
##############################################################################
# sdagent-config - SCA Agent Setup Tool
-# Copyright (C) 2014 SUSE LLC
+# Copyright (C) 2014-2018 SUSE LLC
#
# Description: Configures the agent server so it knows how to communicate
# with the Broker server and the mySQL database on the Broker
# server.
# Runs on: Broker Server
-# Modified: 2014 Apr 22
+# Modified: 2018 Jan 02
#
##############################################################################
#
@@ -27,7 +27,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# Jason Record ([email protected])
+# Jason Record ([email protected])
#
##############################################################################
@@ -48,7 +48,7 @@
}
showHelp() {
- [ -n "$1" ] && { echo "$1"; echo; }
+ [[ -n "$1" ]] && { echo "$1"; echo; }
echo "Usage: $CURRENT_SCRIPT -h <agent> -p <root_password> [OPTIONS]"
echo 'Description:'
echo ' Configures a new agent that will run sdagent.'
@@ -65,12 +65,12 @@
main() {
DB_ADMIN="-u $DB_USER -p${DB_PASS} $DB_NAME_ADMIN"
- [ -n "$OPT_WORKERS" ] && WORKERS=$OPT_WORKERS || WORKERS=$DEF_WORKERS
+ [[ -n "$OPT_WORKERS" ]] && WORKERS=$OPT_WORKERS || WORKERS=$DEF_WORKERS
AGENT_MSG="Run sdagent-config on $OPT_FQDN"
mysql $DB_ADMIN -e "INSERT INTO Agents (AgentState, AgentEvent,
AgentMessage, Hostname, ThreadsMax) VALUES ('Configure', NOW(), '$AGENT_MSG',
'$AGENT_FQDN', '$WORKERS')"
RC=$?
- if [ $RC -gt 0 ]; then
+ if [[ $RC -gt 0 ]]; then
echo
echo "Run setup-sdbroker to configure the database"
echo
@@ -81,7 +81,7 @@
do
mysql $DB_ADMIN -e "INSERT INTO AgentWorkers
(WorkersAgentID, HomePath) VALUES ('$AGENT_ID', '/var/tmp/sca')"
RC=$?
- if [ $RC -gt 0 ]; then
+ if [[ $RC -gt 0 ]]; then
echo
echo "Run setup-sdbroker to configure the
database"
echo
@@ -112,8 +112,8 @@
w) OPT_WORKERS=$OPTARG ;;
esac
done
-[ -z "$OPT_FQDN" ] && { title; showHelp "ERROR: Missing Agent hostname"; exit
1; } || AGENT_FQDN=$OPT_FQDN
-[ -z "$OPT_PASS" ] && { title; showHelp "ERROR: Missing MySQL root Password";
exit 1; } || DB_PASS=$OPT_PASS
+[[ -z "$OPT_FQDN" ]] && { title; showHelp "ERROR: Missing Agent hostname";
exit 1; } || AGENT_FQDN=$OPT_FQDN
+[[ -z "$OPT_PASS" ]] && { title; showHelp "ERROR: Missing MySQL root
Password"; exit 1; } || DB_PASS=$OPT_PASS
title
main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/setup-sdbroker
new/sca-appliance-broker-1.3/bin/setup-sdbroker
--- old/sca-appliance-broker-1.3/bin/setup-sdbroker 2017-12-19
00:28:40.595551904 +0100
+++ new/sca-appliance-broker-1.3/bin/setup-sdbroker 2018-01-02
20:59:21.885023160 +0100
@@ -1,15 +1,15 @@
#!/bin/bash
-SVER=1.0.7
+SVER='1.0.7'
##############################################################################
# setup-sdbroker - SCA Broker Setup Tool
-# Copyright (C) 2017 SUSE LLC
+# Copyright (C) 2018 SUSE LLC
#
# Description: Creates the main mySQL database for the Supportconfig
Diagnostic
# Tool infrastructure
# Runs on: Broker Server
-# Modified: 2017 Dec 18
+# Modified: 2018 Jan 02
#
##############################################################################
#
@@ -26,7 +26,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Authors/Contributors:
-# Jason Record ([email protected])
+# Jason Record ([email protected])
#
##############################################################################
@@ -56,7 +56,7 @@
showHelp() {
title
- [ -n "$1" ] && { echo "$1"; echo; }
+ [[ -n "$1" ]] && { echo "$1"; echo; }
echo "Usage: $CURRENT_SCRIPT -p <root_password> -b <sdbroker_password>
-e <email> -i <url> [OPTIONS]"
echo 'Description:'
echo ' Configures the MySQL administration and report database used by'
@@ -78,12 +78,12 @@
}
main() {
- [ -s ${SCHEMA_PATH}/ServerDiagnostics_DB.sql ] || { showHelp "ERROR:
Schema file not found: ${SCHEMA_PATH}/ServerDiagnostics_DB.sql"; exit 5; }
- [ -s ${SCHEMA_PATH}/ServerDiagnostics_Users.sql ] || { showHelp "ERROR:
Schema file not found: ${SCHEMA_PATH}/ServerDiagnostics_Users.sql"; exit 5; }
+ [[ -s ${SCHEMA_PATH}/ServerDiagnostics_DB.sql ]] || { showHelp "ERROR:
Schema file not found: ${SCHEMA_PATH}/ServerDiagnostics_DB.sql"; exit 5; }
+ [[ -s ${SCHEMA_PATH}/ServerDiagnostics_Users.sql ]] || { showHelp
"ERROR: Schema file not found: ${SCHEMA_PATH}/ServerDiagnostics_Users.sql";
exit 5; }
DB_ROOT="-u $DB_USER -p${DB_PASS}"
mysql $DB_ROOT -e "use $DB_NAME" &>/dev/null
RC=$?
- if [ $RC -eq 0 ]; then
+ if [[ $RC -eq 0 ]]; then
if (( CONFIRMED )); then
DELETE_DB=1
else
@@ -103,7 +103,7 @@
fi
USER_FOUND=$(mysql -NB $DB_ROOT -e "SELECT User FROM user WHERE
User='sdbroker'" mysql 2>/dev/null)
- if [ -n "$USER_FOUND" ]; then
+ if [[ -n "$USER_FOUND" ]]; then
if (( CONFIRMED )); then
DELETE_USERS=1
else
@@ -125,10 +125,10 @@
printf "$FMT" "Creating Database:" $DB_NAME
mysql $DB_ROOT -e "CREATE DATABASE $DB_NAME"
RC=$?
- [ $RC -gt 0 ] && { echo; exit $RC; }
+ [[ $RC -gt 0 ]] && { echo; exit $RC; }
cat ${SCHEMA_PATH}/ServerDiagnostics_DB.sql | mysql $DB_ROOT $DB_NAME
RC=$?
- if [ $RC -eq 0 ]; then
+ if [[ $RC -eq 0 ]]; then
printf "$FMT" "Creating Users:" "$DB_ALL_USERS"
cat ${SCHEMA_PATH}/ServerDiagnostics_Users.sql | mysql $DB_ROOT
fi
@@ -143,7 +143,7 @@
RCODE=$?
;;
file)
- if [ ! -d $OPT_INSRC_DIR ]; then
+ if [[ ! -d $OPT_INSRC_DIR ]]; then
RCODE=10
fi
;;
@@ -157,7 +157,7 @@
fi
echo
- if [ -e $BROKER_CONFIG ]; then
+ if [[ -e $BROKER_CONFIG ]]; then
OPT_EMAIL_ADMIN=$(echo $OPT_EMAIL_ADMIN | sed -e "s!,! !g;s! !
!g")
sed -i -e "s!^DB_PASS=.*!DB_PASS='$OPT_PASS'!" $BROKER_CONFIG
sed -i -e "s!^INSRC=.*!INSRC='${OPT_INSRC}'!" $BROKER_CONFIG
@@ -179,7 +179,7 @@
fi
DB_CONNECT="-u sdbroker -p${OPT_PASS} $DB_NAME"
mysql $DB_CONNECT -e "SHOW TABLES"
- if [ $? -gt 0 ]; then
+ if [[ $? -gt 0 ]]; then
echo
exit 3
else
@@ -189,7 +189,7 @@
# echo " Run 'crontab $CMB_CRON' if this server has sdbroker and
sdagent"
# echo " Run 'crontab -e sca -e' to manually edit the cron"
# echo
-# [ -e $DEF_CRON ] && cat $DEF_CRON
+# [[ -e $DEF_CRON ]] && cat $DEF_CRON
echo
echo "Run setup-sdagent on this server."
fi
