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

update counte labels

See merge request !92

check_psqlserver

@@ -228,7 +228,7 @@ case "${sMode}" in
         typeset -i iQOther;    iQOther=$iQTotal-$iQActive-$iQIdle-$iQFastpath
 
         descr="Running total: $iQTotal ... active: $iQActive idle: $iQIdle fastpath: $iQFastpath other: $iQOther"
-        out=$( grep "^.[a-z]" <<< "${_out}" | cut -c 1-150 )
+        out=$( grep "^.[a-z]" <<< "${_out}" | cut -c 1-150 | tr '|' ':' )
         ph.perfadd "running-total"     "${iQTotal}"
         ph.perfadd "running-active"    "${iQActive}"
         ph.perfadd "running-idle"      "${iQIdle}"
@@ -238,28 +238,28 @@ case "${sMode}" in
     "conflicts")
         descr="Detected conflicts (from pg_stat_database_conflicts)"
         renderCounters "select                              \
-            sum(confl_tablespace)  as confltablespace,  \
-            sum(confl_lock)        as confllock,        \
-            sum(confl_snapshot)    as conflsnapshot,    \
-            sum(confl_bufferpin)   as conflbufferpin,   \
-            sum(confl_deadlock)    as confldeadlock     \
+            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     \
             from pg_stat_database_conflicts "
           ;;
     "dbrows")
         descr="Count of database row actions (from pg_stat_database)"
         renderCounters "select                     \
-            sum(tup_returned)     as return, \
-            sum(tup_fetched)      as fetch,  \
-            sum(tup_inserted)     as insert, \
-            sum(tup_updated)      as update, \
-            sum(tup_deleted)      as delete  \
+            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 read,    \
-            sum(blks_hit)      as cached   \
+            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 tmpfiles,         \
-            sum(temp_bytes)         as tmpbytes          \
+            sum(temp_files)         as temp-files,       \
+            sum(temp_bytes)         as temp-bytes        \
             from pg_stat_database "
           ;;
     "replication")
@@ -298,6 +298,7 @@ case "${sMode}" in
 esac
 
 ph.status "Pgsql $sMode :: $descr"
+echo
 echo "$out"
 
 ph.exit