Merge branch '6010-check-pqsql' into 'master'

update column as values

See merge request !93

check_psqlserver

@@ -238,28 +238,28 @@ case "${sMode}" in
     "conflicts")
         descr="Detected conflicts (from pg_stat_database_conflicts)"
         renderCounters "select                              \
-            sum(confl_tablespace)  as conflicts-tablespace,  \
-            sum(confl_lock)        as conflicts-lock,        \
-            sum(confl_snapshot)    as conflicts-snapshot,    \
-            sum(confl_bufferpin)   as conflicts-bufferpin,   \
-            sum(confl_deadlock)    as conflicts-deadlock     \
+            sum(confl_tablespace)  as confl_tablespace,  \
+            sum(confl_lock)        as confl_lock,        \
+            sum(confl_snapshot)    as confl_snapshot,    \
+            sum(confl_bufferpin)   as confl_bufferpin,   \
+            sum(confl_deadlock)    as confl_deadlock     \
             from pg_stat_database_conflicts "
           ;;
     "dbrows")
         descr="Count of database row actions (from pg_stat_database)"
         renderCounters "select                     \
-            sum(tup_returned)     as tup-returned, \
-            sum(tup_fetched)      as tup-fetched,  \
-            sum(tup_inserted)     as tup-inserted, \
-            sum(tup_updated)      as tup-updated,  \
-            sum(tup_deleted)      as tup-deleted   \
+            sum(tup_returned)     as tup_returned, \
+            sum(tup_fetched)      as tup_fetched,  \
+            sum(tup_inserted)     as tup_inserted, \
+            sum(tup_updated)      as tup_updated,  \
+            sum(tup_deleted)      as tup_deleted   \
             from pg_stat_database "
           ;;
     "diskblock")
         descr="Count of diskblocks physically read or coming from cache (from pg_stat_database)"
         renderCounters "select                \
-            sum(blks_read)     as blks-read,  \
-            sum(blks_hit)      as blks-hit    \
+            sum(blks_read)     as blks_read,  \
+            sum(blks_hit)      as blks_hit    \
             from pg_stat_database "
           ;;
     "problems")
@@ -268,8 +268,8 @@ case "${sMode}" in
             sum(conflicts)          as conflicts,        \
             sum(deadlocks)          as deadlocks,        \
             sum(checksum_failures)  as checksumfailures, \
-            sum(temp_files)         as temp-files,       \
-            sum(temp_bytes)         as temp-bytes        \
+            sum(temp_files)         as temp_files,       \
+            sum(temp_bytes)         as temp_bytes        \
             from pg_stat_database "
           ;;
     "replication")
@@ -279,7 +279,7 @@ case "${sMode}" in
             out=""
         else
             descr="status (from pg_stat_replication)"
-            out="${_out}${NL}"
+            out=$( echo "${_out}${NL}" | tr '|' ':' )
         fi
         ;;