[sr-dev] git:master:525dfe54: kamctl: compact column based printing for moni command

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 525dfe54584ea2179424e644f787f5de583eddb5
URL: https://github.com/kamailio/kamailio/commit/525dfe54584ea2179424e644f787f5de583eddb5

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-12-17T09:39:02+01:00

kamctl: compact column based printing for moni command

---

Modified: utils/kamctl/kamctl.rpcfifo

---

Diff:  https://github.com/kamailio/kamailio/commit/525dfe54584ea2179424e644f787f5de583eddb5.diff
Patch: https://github.com/kamailio/kamailio/commit/525dfe54584ea2179424e644f787f5de583eddb5.patch

---

diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo
index f529e0f..0e64520 100644
--- a/utils/kamctl/kamctl.rpcfifo
+++ b/utils/kamctl/kamctl.rpcfifo
@@ -201,8 +201,9 @@ rpc_kamailio_monitor() {
 
 		# print_stats $name $path $attempt
 		mecho "[cycle #: $attempt; if constant make sure server lives]"
+		mecho "Kamailio Runtime Details: "
 
-		cat < $path | filter_json | $EXPAND &
+		cat < $path | filter_json | $EXPAND | grep "result" | awk -F'"' '{ print $4 }' &
 		cat > $RPCFIFOPATH <<EOF
 {
   "jsonrpc": "2.0",
@@ -213,7 +214,7 @@ rpc_kamailio_monitor() {
 EOF
 		wait
 
-		cat < $path | filter_json | $EXPAND &
+		cat < $path | filter_json | $EXPAND | egrep "now|up_since|uptime" | sed 's/[",]//g' &
 		cat > $RPCFIFOPATH << EOF
 {
   "jsonrpc": "2.0",
@@ -226,12 +227,12 @@ EOF
 		echo
 
 		mecho "Transaction Statistics: "
-		cat < $path | filter_json | $EXPAND &
+		cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column &
 		cat > $RPCFIFOPATH <<EOF
 {
   "jsonrpc": "2.0",
   "method": "stats.get_statistics",
-  "params": [ "UAS_transactions", "UAC_transactions", "inuse_transactions"],
+  "params": [ "UAS_transactions", "UAC_transactions", "active_transactions", "inuse_transactions"],
   "reply_name": "${name}",
   "id": $$
 }
@@ -240,12 +241,12 @@ EOF
 		echo
 
 		mecho "Stateless Server Statistics: "
-		cat < $path | filter_json | $EXPAND &
+		cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column &
 		cat > $RPCFIFOPATH <<EOF
 {
   "jsonrpc": "2.0",
   "method": "stats.get_statistics",
-  "params": [ "sent_replies", "sent_err_replies", "received_ACKs"],
+  "params": [ "sent_replies", "sent_err_replies"],
   "reply_name": "${name}",
   "id": $$
 }
@@ -253,8 +254,8 @@ EOF
 		wait
 		echo
 
-		mecho "UsrLoc Stats: "
-		cat < $path | filter_json | $EXPAND &
+		mecho "UsrLoc Statistics: "
+		cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column &
 		cat > $RPCFIFOPATH <<EOF
 {
   "jsonrpc": "2.0",
@@ -265,6 +266,34 @@ EOF
 }
 EOF
 		wait
+		echo
+
+		mecho "Core Statistics: "
+		cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column &
+		cat > $RPCFIFOPATH <<EOF
+{
+  "jsonrpc": "2.0",
+  "method": "stats.get_statistics",
+  "params": [ "rcv_requests", "fwd_requests", "rcv_replies", "fwd_replies"],
+  "reply_name": "${name}",
+  "id": $$
+}
+EOF
+		wait
+		echo
+
+		mecho "Shared Memory Statistics: "
+		cat < $path | filter_json | $EXPAND | grep "=" | sed 's/[",]//g' | column &
+		cat > $RPCFIFOPATH <<EOF
+{
+  "jsonrpc": "2.0",
+  "method": "stats.get_statistics",
+  "params": [ "shmem:"],
+  "reply_name": "${name}",
+  "id": $$
+}
+EOF
+		wait
 
 		if [ $loops -ne $attempt ] ; then
 			sleep $WATCH_PERIOD