Added support to Disk Assisted queues

Linux Script/configure-linux.sh

@@ -15,7 +15,7 @@ function ctrl_c()  {
 #name of the current script. This will get overwritten by the child script which calls this
 SCRIPT_NAME=configure-linux.sh
 #version of the current script. This will get overwritten by the child script which calls this
-SCRIPT_VERSION=1.10
+SCRIPT_VERSION=1.12
 
 #application tag. This will get overwritten by the child script which calls this
 APP_TAG=
@@ -142,7 +142,7 @@ installLogglyConf()
 	fi
 
 	#if all the above check passes, write the 22-loggly.conf file
-	write22LogglyConfFile
+	checkAuthTokenAndWriteContents
 
 	#create rsyslog dir if it doesn't exist, Modify the permission on rsyslog directory if exist on Ubuntu
 	createRsyslogDir
@@ -416,23 +416,10 @@ checkIfSelinuxServiceEnforced()
 	fi
 }
 
-#write 22-loggly,conf file to /etc/rsyslog.d directory after checking with user if override is needed
-write22LogglyConfFile()
-{
-	echo "INFO: Checking if loggly sysconf file $LOGGLY_RSYSLOG_CONFFILE exist."
-	if [ -f "$LOGGLY_RSYSLOG_CONFFILE" ]; then
-		logMsgToConfigSysLog "INFO" "INFO: Loggly rsyslog file $LOGGLY_RSYSLOG_CONFFILE already exist."
-		checkIfConfigurationChanged
-	else
-		logMsgToConfigSysLog "INFO" "INFO: Loggly rsyslog file $LOGGLY_RSYSLOG_CONFFILE does not exist, creating file $LOGGLY_RSYSLOG_CONFFILE"
-		checkAuthTokenAndWriteContents
-	fi
-}
-
 #check if authentication token is valid and then write contents to 22-loggly.conf file to /etc/rsyslog.d directory
 checkAuthTokenAndWriteContents()
 {
-	if [ "$LOGGLY_ACCOUNT" != "" ]; then
+	if [ "$LOGGLY_AUTH_TOKEN" != "" ]; then
 		writeContents $LOGGLY_ACCOUNT $LOGGLY_AUTH_TOKEN $LOGGLY_DISTRIBUTION_ID $LOGS_01_HOST $LOGGLY_SYSLOG_PORT
 		restartRsyslog
 	else
@@ -441,57 +428,12 @@ checkAuthTokenAndWriteContents()
 	fi
 }
 
-#matches if the content of 22-loggly.conf content is changed
-checkIfConfigurationChanged()
-{
-	ASK_FOR_VERIFICATION="false"
-
-	#strings to be checked which should be present in the existing 22-loggly.conf. 
-	#If these strings are not same then a warning message will be shown to user to update the 22-loggly.conf file
-	STR_TO_BE_CHECKED[0]="\$template LogglyFormat,\"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [$LOGGLY_AUTH_TOKEN@$LOGGLY_DISTRIBUTION_ID] %msg%\n\""
-	STR_TO_BE_CHECKED[1]="*.*             @@$LOGS_01_HOST:$LOGGLY_SYSLOG_PORT;LogglyFormat"
-
-	for i in "${STR_TO_BE_CHECKED[@]}"
-	do
-		if ! sudo grep -Fxq "$i" $LOGGLY_RSYSLOG_CONFFILE; then
-			ASK_FOR_VERIFICATION="true"
-			break;
-		fi
-	done
-
-	if [ "$ASK_FOR_VERIFICATION" == "true" ]; then
-		logMsgToConfigSysLog "WARN" "WARN: Loggly rsyslog file /etc/rsyslog.d/22-loggly.conf content has changed."
-		if [ "$SUPPRESS_PROMPT" == "false" ]; then
-			while true; 
-			do
-				read -p "Do you wish to override $LOGGLY_RSYSLOG_CONFFILE and re-verify configuration? (yes/no)" yn
-				case $yn in
-					[Yy]* )
-					logMsgToConfigSysLog "INFO" "INFO: Going to back up the conf file: $LOGGLY_RSYSLOG_CONFFILE to $LOGGLY_RSYSLOG_CONFFILE_BACKUP";
-					sudo mv -f $LOGGLY_RSYSLOG_CONFFILE $LOGGLY_RSYSLOG_CONFFILE_BACKUP;
-					checkAuthTokenAndWriteContents;
-					break;;
-					[Nn]* )
-					LINUX_DO_VERIFICATION="false"
-					logMsgToConfigSysLog "INFO" "INFO: Skipping Linux verification."
-					break;;
-					* ) echo "Please answer yes or no.";;
-				esac
-			done
-		else
-			logMsgToConfigSysLog "INFO" "INFO: Going to back up the conf file: $LOGGLY_RSYSLOG_CONFFILE to $LOGGLY_RSYSLOG_CONFFILE_BACKUP";
-			sudo mv -f $LOGGLY_RSYSLOG_CONFFILE $LOGGLY_RSYSLOG_CONFFILE_BACKUP;
-			checkAuthTokenAndWriteContents;
-		fi
-	else
-		LINUX_DO_VERIFICATION="false"
-	fi
-
-}
 
 #write the contents to 22-loggly.conf file
 writeContents()
 {
+
+WRITE_SCRIPT_CONTENTS="false"
 inputStr="
 #          -------------------------------------------------------
 #          Syslog Logging Directives for Loggly ($1.loggly.com)
@@ -500,16 +442,67 @@ inputStr="
 # Define the template used for sending logs to Loggly. Do not change this format.
 \$template LogglyFormat,\"<%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [$2@$3] %msg%\n\"
 
+\$WorkDirectory /var/spool/rsyslog # where to place spool files
+\$ActionQueueFileName fwdRule1 # unique name prefix for spool files
+\$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+\$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+\$ActionQueueType LinkedList   # run asynchronously
+\$ActionResumeRetryCount -1    # infinite retries if host is down
+
 # Send messages to Loggly over TCP using the template.
 *.*             @@$4:$5;LogglyFormat
 
-#          -------------------------------------------------------
-#          End of Syslog Logging Directives for Loggly
-#          -------------------------------------------------------
+#     -------------------------------------------------------
 "
+	if [ -f "$LOGGLY_RSYSLOG_CONFFILE" ]; then
+		logMsgToConfigSysLog "INFO" "INFO: Loggly rsyslog file $LOGGLY_RSYSLOG_CONFFILE already exist."
+
+		STR_SIZE=${#inputStr}
+		SIZE_FILE=$(stat -c%s "$LOGGLY_RSYSLOG_CONFFILE")
+
+		#actual file size and variable size with same contents always differ in size with one byte
+		STR_SIZE=$(( STR_SIZE + 1 ))
+
+		if [ "$STR_SIZE" -ne "$SIZE_FILE" ]; then
+
+			logMsgToConfigSysLog "WARN" "WARN: Loggly rsyslog file /etc/rsyslog.d/22-loggly.conf content has changed."
+			if [ "$SUPPRESS_PROMPT" == "false" ]; then
+					while true; 
+					do
+						read -p "Do you wish to override $LOGGLY_RSYSLOG_CONFFILE and re-verify configuration? (yes/no)" yn
+						case $yn in
+						[Yy]* )
+							logMsgToConfigSysLog "INFO" "INFO: Going to back up the conf file: $LOGGLY_RSYSLOG_CONFFILE to $LOGGLY_RSYSLOG_CONFFILE_BACKUP";
+							sudo mv -f $LOGGLY_RSYSLOG_CONFFILE $LOGGLY_RSYSLOG_CONFFILE_BACKUP;
+							WRITE_SCRIPT_CONTENTS="true"
+							break;;
+						[Nn]* )
+							LINUX_DO_VERIFICATION="false"
+							logMsgToConfigSysLog "INFO" "INFO: Skipping Linux verification."
+							break;;
+						* ) echo "Please answer yes or no.";;
+						esac
+					done
+			else
+				logMsgToConfigSysLog "INFO" "INFO: Going to back up the conf file: $LOGGLY_RSYSLOG_CONFFILE to $LOGGLY_RSYSLOG_CONFFILE_BACKUP";
+				sudo mv -f $LOGGLY_RSYSLOG_CONFFILE $LOGGLY_RSYSLOG_CONFFILE_BACKUP;
+				WRITE_SCRIPT_CONTENTS="true"
+			fi
+		else
+			 LINUX_DO_VERIFICATION="false"
+		fi
+	else
+		WRITE_SCRIPT_CONTENTS="true"
+	fi
+
+	if [ "$WRITE_SCRIPT_CONTENTS" == "true" ]; then
+
 sudo cat << EOIPFW >> $LOGGLY_RSYSLOG_CONFFILE
 $inputStr
 EOIPFW
+
+	fi
+
 }
 
 #create /var/spool/rsyslog directory if not already present. Modify the permission of this directory for Ubuntu
@@ -774,4 +767,6 @@ else
 	IS_INVOKED="true"
 fi
 
-##########  Get Inputs from User - End  ##########
+##########  Get Inputs from User - End  ##########       -------------------------------------------------------
+#          End of Syslog Logging Directives for Loggly
+#