Merge branch '236-a008-disk-usage-re-fix' into 'master'

Resolve "A008 (disk usage): don't ERROR if log_directory does not exist"

Closes #236

See merge request postgres-ai-team/postgres-checkup!222

Author: Nastradamus

resources/checks/A008_disk_usage_fstype.sh

@@ -1,21 +1,21 @@
 # Check disk space and file system type for important Postgres-related disk partitions
 
-PG_MAJOR_VER=$(ssh "$HOST" "${_PSQL} -f -" <<EOF
+PG_MAJOR_VER=$(${CHECK_HOST_CMD} "${_PSQL} -f -" <<EOF
   select setting::integer / 10000 from pg_settings where name = 'server_version_num'
 EOF
 )
 
-PG_DATA_DIR=$(ssh "$HOST" "${_PSQL} -f -" <<EOF
+PG_DATA_DIR=$(${CHECK_HOST_CMD} "${_PSQL} -f -" <<EOF
   show data_directory
 EOF
 )
 
-PG_STATS_TEMP_DIR=$(ssh "$HOST" "${_PSQL} -f -" <<EOF
+PG_STATS_TEMP_DIR=$(${CHECK_HOST_CMD} "${_PSQL} -f -" <<EOF
   show stats_temp_directory
 EOF
 )
 
-PG_LOG_DIR=$(ssh "$HOST" "${_PSQL} -f -" <<EOF
+PG_LOG_DIR=$(${CHECK_HOST_CMD} "${_PSQL} -f -" <<EOF
   show log_directory
 EOF
 )
@@ -28,7 +28,7 @@ if ! [[ "${PG_STATS_TEMP_DIR}" =~ ^/ ]]; then
   PG_STATS_TEMP_DIR="${PG_DATA_DIR}/${PG_STATS_TEMP_DIR}"
 fi
 
-PG_TABLESPSACES_DIRS=$(ssh "$HOST" "${_PSQL} -f -" <<EOF
+PG_TABLESPSACES_DIRS=$(${CHECK_HOST_CMD} "${_PSQL} -f -" <<EOF
   SELECT pg_catalog.pg_tablespace_location(oid)
   FROM pg_catalog.pg_tablespace
   WHERE pg_tablespace_location(oid) ~ '/'
@@ -77,7 +77,7 @@ df_to_json() {
 #######################################
 print_df() {
   local path="$1"
-  df_to_json "${path}" $(ssh ${HOST} "sudo df -TPh \"${path}\" | tail -n +2")
+  df_to_json "${path}" $(${CHECK_HOST_CMD} "sudo df -TPh \"${path}\" | tail -n +2")
 }
 
 # json output starts here
@@ -102,10 +102,13 @@ echo ","
 
 echo "\"stats_temp_directory\":"
 print_df "$PG_STATS_TEMP_DIR"
-echo ","
 
-echo "\"log_directory\":"
-print_df "$PG_LOG_DIR"
+# do not fail if log_directory does not exist
+if $(${CHECK_HOST_CMD} "sudo stat \"$PG_LOG_DIR\" >/dev/null 2>&1"); then
+  echo ","
+  echo "\"log_directory\":"
+  print_df "$PG_LOG_DIR"
+fi
 
 echo "}"
-
+