Skip to content

Commit addd4fd

Browse files
tariqbuildstariqbuilds
committed
fixed missing quote in user_accounts json api call
1 parent 23587f4 commit addd4fd

File tree

1 file changed

+73
-73
lines changed

1 file changed

+73
-73
lines changed

‎app/server/linux_json_api.sh

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
_parseAndPrint() {
44
while read data; do
5-
echo -n "$data" | sed -r "s/\"/\\\\\"/g" | tr -d "\n";
5+
echo -n "$data" | sed -r "s/'/\\\\'/g" | tr -d "\n";
66
done;
77
}
88

99
arp_cache() {
1010
arpCommand=$(command -v arp)
1111

1212
result=$($arpCommand | awk 'BEGIN {print "["} NR>1 \
13-
{print "{ \"addr\": \"" $1 "\", " \
14-
"\"hw_type\": \"" $2 "\", " \
15-
"\"hw_addr.\": \"" $3 "\", " \
16-
"\"mask\": \"" $5 "\" }, " \
13+
{print "{ 'addr': '" $1 "', " \
14+
"'hw_type': '" $2 "', " \
15+
"'hw_addr.': '" $3 "', " \
16+
"'mask': '" $5 "' }, " \
1717
} \
1818
END {print "]"}' \
1919
| /bin/sed 'N;$s/},/}/;P;D')
@@ -26,9 +26,9 @@ arp_cache() {
2626
bandwidth() {
2727

2828
/bin/cat /proc/net/dev \
29-
| awk 'BEGIN {print "["} NR>2 {print "{ \"interface\": \"" $1 "\"," \
30-
" \"tx\": " $2 "," \
31-
" \"rx\": " $10 " }," } END {print "]"}' \
29+
| awk 'BEGIN {print "["} NR>2 {print "{ 'interface': '" $1 "'," \
30+
" 'tx': " $2 "," \
31+
" 'rx': " $10 " }," } END {print "]"}' \
3232
| /bin/sed 'N;$s/,\n/\n/;P;D' \
3333
| _parseAndPrint
3434
}
@@ -38,9 +38,9 @@ common_applications() {
3838
| awk -F: '{if(length($2)==0) { installed="false"; } else { installed="true"; } \
3939
print \
4040
"{ \
41-
\"binary\": \""$1"\", \
42-
\"location\": \""$2"\", \
43-
\"installed\": "installed" \
41+
'binary': '"$1"', \
42+
'location': '"$2"', \
43+
'installed': "installed" \
4444
},"}')
4545

4646
echo "[" ${result%?} "]" | _parseAndPrint
@@ -49,7 +49,7 @@ common_applications() {
4949
cpu_info() {
5050

5151
result=$(/usr/bin/lscpu \
52-
| /usr/bin/awk -F: '{print "\""$1"\": \""$2"\"," } '\
52+
| /usr/bin/awk -F: '{print "'"$1"': '"$2"'," } '\
5353
)
5454

5555
echo "{" ${result%?} "}" | _parseAndPrint
@@ -59,12 +59,12 @@ cpu_intensive_processes() {
5959

6060
result=$(/bin/ps axo pid,user,pcpu,rss,vsz,comm --sort -pcpu,-rss,-vsz \
6161
| head -n 15 \
62-
| /usr/bin/awk 'BEGIN{OFS=":"} NR>1 {print "{ \"pid\": " $1 \
63-
", \"user\": \"" $2 "\"" \
64-
", \"cpu%\": " $3 \
65-
", \"rss\": " $4 \
66-
", \"vsz\": " $5 \
67-
", \"cmd\": \"" $6 "\"" "},"\
62+
| /usr/bin/awk 'BEGIN{OFS=":"} NR>1 {print "{ 'pid': " $1 \
63+
", 'user': '" $2 "'" \
64+
", 'cpu%': " $3 \
65+
", 'rss': " $4 \
66+
", 'vsz': " $5 \
67+
", 'cmd': '" $6 "'" "},"\
6868
}')
6969

7070
echo "[" ${result%?} "]" | _parseAndPrint
@@ -132,9 +132,9 @@ cron_history() {
132132

133133
result=$($grepCmd -m$numberOfLines CRON $cronLog \
134134
| awk '{ s = ""; for (i = 6; i <= NF; i++) s = s $i " "; \
135-
print "{\"time\" : \"" $1" "$2" "$3 "\"," \
136-
"\"user\" : \"" $6 "\"," \
137-
"\"message\" : \"" $5" "gensub("\"", "\\\\\"", "g", s) "\"" \
135+
print "{'time' : '" $1" "$2" "$3 "'," \
136+
"'user' : '" $6 "'," \
137+
"'message' : '" $5" "gensub("'", "\\\\'", "g", s) "'" \
138138
"},"
139139
}'
140140
)
@@ -155,12 +155,12 @@ current_ram() {
155155

156156
memInfo=`$catCmd $memInfoFile | $grepCmd 'MemTotal\|MemFree\|Buffers\|Cached'`
157157

158-
echo $memInfo | $awkCmd '{print "{ \"total\": " ($2/1024) ", \"used\": " ( ($2-($5+$8+$11))/1024 ) ", \"available\": " (($5+$8+$11)/1024) " }" }' | _parseAndPrint
158+
echo $memInfo | $awkCmd '{print "{ 'total': " ($2/1024) ", 'used': " ( ($2-($5+$8+$11))/1024 ) ", 'available': " (($5+$8+$11)/1024) " }" }' | _parseAndPrint
159159
}
160160

161161
disk_partitions() {
162162

163-
result=$(/bin/df -Ph | awk 'NR>1 {print "{\"file_system\": \"" $1 "\", \"size\": \"" $2 "\", \"used\": \"" $3 "\", \"avail\": \"" $4 "\", \"used%\": \"" $5 "\", \"mounted\": \"" $6 "\"},"}')
163+
result=$(/bin/df -Ph | awk 'NR>1 {print "{'file_system': '" $1 "', 'size': '" $2 "', 'used': '" $3 "', 'avail': '" $4 "', 'used%': '" $5 "', 'mounted': '" $6 "'},"}')
164164

165165
echo [ ${result%?} ] | _parseAndPrint
166166
}
@@ -172,12 +172,12 @@ docker_processes() {
172172
for i in $containers; do
173173
result="$result $(/usr/bin/docker top $i axo pid,user,pcpu,pmem,comm --sort -pcpu,-pmem \
174174
| head -n 15 \
175-
| /usr/bin/awk -v cnt="$i" 'BEGIN{OFS=":"} NR>1 {print "{ \"cname\": \"" cnt \
176-
"\", \"pid\": " $1 \
177-
", \"user\": \"" $2 "\"" \
178-
", \"cpu%\": " $3 \
179-
", \"mem%\": " $4 \
180-
", \"cmd\": \"" $5 "\"" "},"\
175+
| /usr/bin/awk -v cnt="$i" 'BEGIN{OFS=":"} NR>1 {print "{ 'cname': '" cnt \
176+
"', 'pid': " $1 \
177+
", 'user': '" $2 "'" \
178+
", 'cpu%': " $3 \
179+
", 'mem%': " $4 \
180+
", 'cmd': '" $5 "'" "},"\
181181
}')"
182182
done
183183

@@ -212,7 +212,7 @@ download_transfer_rate() {
212212
in_kbytes=$((in_bytes / 1024))
213213

214214
# convert transfer rate to KB
215-
json_output="$json_output \"$basename\": $in_kbytes"
215+
json_output="$json_output '$basename': $in_kbytes"
216216

217217
# if it is not the last line
218218
if [[ ! $interface == $last ]]
@@ -248,14 +248,14 @@ general_info() {
248248
uptime_seconds=$(/bin/cat /proc/uptime | awk '{print $1}')
249249
server_time=$(date)
250250

251-
echo "{ \"OS\": \"$os\", \"Hostname\": \"$hostname\", \"Uptime\": \" $(displaytime ${uptime_seconds%.*}) \", \"Server Time\": \"$server_time\" }" | _parseAndPrint
251+
echo "{ 'OS': '$os', 'Hostname': '$hostname', 'Uptime': ' $(displaytime ${uptime_seconds%.*}) ', 'Server Time': '$server_time' }" | _parseAndPrint
252252
}
253253

254254
io_stats() {
255255

256256
result=$(/bin/cat /proc/diskstats | /usr/bin/awk \
257257
'{ if($4==0 && $8==0 && $12==0 && $13==0) next } \
258-
{print "{ \"device\": \"" $3 "\", \"reads\": \""$4"\", \"writes\": \"" $8 "\", \"in_prog.\": \"" $12 "\", \"time\": \"" $13 "\"},"}'
258+
{print "{ 'device': '" $3 "', 'reads': '"$4"', 'writes': '" $8 "', 'in_prog.': '" $12 "', 'time': '" $13 "'},"}'
259259
)
260260

261261
echo [ ${result%?} ] | _parseAndPrint
@@ -276,10 +276,10 @@ ip_addresses() {
276276

277277
for item in $($ifconfigCmd | $grepCmd -oP "^[a-zA-Z0-9:]*(?=:)")
278278
do
279-
echo -n "{\"interface\" : \""$item"\", \"ip\" : \"$( $ifconfigCmd $item | $grepCmd "inet" | $awkCmd '{match($0,"inet (addr:)?([0-9.]*)",a)}END{ if (NR != 0){print a[2]; exit}{print "none"}}')\"}, "
279+
echo -n "{'interface' : '"$item"', 'ip' : '$( $ifconfigCmd $item | $grepCmd "inet" | $awkCmd '{match($0,"inet (addr:)?([0-9.]*)",a)}END{ if (NR != 0){print a[2]; exit}{print "none"}}')'}, "
280280
done
281281

282-
echo "{ \"interface\": \"external\", \"ip\": \"$externalIp\" } ]" | _parseAndPrint
282+
echo "{ 'interface': 'external', 'ip': '$externalIp' } ]" | _parseAndPrint
283283
}
284284

285285
load_avg() {
@@ -294,14 +294,14 @@ load_avg() {
294294
numberOfCores=1
295295
fi
296296

297-
result=$($catCmd /proc/loadavg | $awkCmd '{print "{ \"1_min_avg\": " ($1*100)/'$numberOfCores' ", \"5_min_avg\": " ($2*100)/'$numberOfCores' ", \"15_min_avg\": " ($3*100)/'$numberOfCores' "}," }')
297+
result=$($catCmd /proc/loadavg | $awkCmd '{print "{ '1_min_avg': " ($1*100)/'$numberOfCores' ", '5_min_avg': " ($2*100)/'$numberOfCores' ", '15_min_avg': " ($3*100)/'$numberOfCores' "}," }')
298298

299299
echo ${result%?} | _parseAndPrint
300300
}
301301

302302
logged_in_users() {
303303

304-
result=$(COLUMNS=300 /usr/bin/w -h | /usr/bin/awk '{print "{\"user\": \"" $1 "\", \"from\": \"" $3 "\", \"when\": \"" $4 "\"},"}')
304+
result=$(COLUMNS=300 /usr/bin/w -h | /usr/bin/awk '{print "{'user': '" $1 "', 'from': '" $3 "', 'when': '" $4 "'},"}')
305305

306306
echo [ ${result%?} ] | _parseAndPrint
307307
}
@@ -310,7 +310,7 @@ memcached() {
310310
echo "stats" \
311311
| /bin/nc -w 1 127.0.0.1 11211 \
312312
| /bin/grep 'bytes' \
313-
| /usr/bin/awk 'BEGIN {print "{"} {print "\"" $2 "\": " $3 } END {print "}"}' \
313+
| /usr/bin/awk 'BEGIN {print "{"} {print "'" $2 "': " $3 } END {print "}"}' \
314314
| /usr/bin/tr '\r' ',' \
315315
| /bin/sed 'N;$s/,\n/\n/;P;D' \
316316
| _parseAndPrint
@@ -319,7 +319,7 @@ memcached() {
319319
memory_info() {
320320

321321
/bin/cat /proc/meminfo \
322-
| /usr/bin/awk -F: 'BEGIN {print "{"} {print "\"" $1 "\": \"" $2 "\"," } END {print "}"}' \
322+
| /usr/bin/awk -F: 'BEGIN {print "{"} {print "'" $1 "': '" $2 "'," } END {print "}"}' \
323323
| /bin/sed 'N;$s/,\n/\n/;P;D' \
324324
| _parseAndPrint
325325
}
@@ -336,7 +336,7 @@ network_connections() {
336336
| $awkCmd 'NR>2 {print $5}' \
337337
| $sortCmd \
338338
| $uniqCmd -c \
339-
| $awkCmd 'BEGIN {print "["} {print "{ \"connections\": " $1 ", \"address\": \"" $2 "\" }," } END {print "]"}' \
339+
| $awkCmd 'BEGIN {print "["} {print "{ 'connections': " $1 ", 'address': '" $2 "' }," } END {print "]"}' \
340340
| $sedCmd 'N;$s/},/}/;P;D' \
341341
| _parseAndPrint
342342
}
@@ -368,7 +368,7 @@ ping() {
368368
| while read output
369369
do
370370
singlePing=$($pingCmd -qc 2 $output \
371-
| $awkCmd -F/ 'BEGIN { endLine="}," } /^rtt/ { if ('$numOfLinesInConfig'==1){endLine="}"} print "{" "\"host\": \"'$output'\", \"ping\": " $5 " " endLine }' \
371+
| $awkCmd -F/ 'BEGIN { endLine="}," } /^rtt/ { if ('$numOfLinesInConfig'==1){endLine="}"} print "{" "'host': ''$output'', 'ping': " $5 " " endLine }' \
372372
)
373373
numOfLinesInConfig=$(($numOfLinesInConfig-1))
374374
result=$result$singlePing
@@ -395,15 +395,15 @@ pm2_stats() {
395395
#don't process last 2 lines
396396
json=$( echo "$data" | tail -n +4 | head -n +2 \
397397
| awk '{print "{"}\
398-
{print "\"appName\":\"" $2 "\","} \
399-
{print "\"id\":\"" $4 "\","} \
400-
{print "\"mode\":\"" $6 "\","} \
401-
{print "\"pid\":\"" $8 "\","}\
402-
{print "\"status\":\"" $10 "\","}\
403-
{print "\"restart\":\"" $12 "\","}\
404-
{print "\"uptime\":\"" $14 "\","}\
405-
{print "\"memory\":\"" $16 $17 "\","}\
406-
{print "\"watching\":\"" $19 "\""}\
398+
{print "'appName':'" $2 "',"} \
399+
{print "'id':'" $4 "',"} \
400+
{print "'mode':'" $6 "',"} \
401+
{print "'pid':'" $8 "',"}\
402+
{print "'status':'" $10 "',"}\
403+
{print "'restart':'" $12 "',"}\
404+
{print "'uptime':'" $14 "',"}\
405+
{print "'memory':'" $16 $17 "',"}\
406+
{print "'watching':'" $19 "'"}\
407407
{print "},"}')
408408
#make sure to remove last comma and print in array
409409
echo "[" ${json%?} "]" | _parseAndPrint
@@ -417,13 +417,13 @@ ram_intensive_processes() {
417417

418418
result=$(/bin/ps axo pid,user,pmem,rss,vsz,comm --sort -pmem,-rss,-vsz \
419419
| head -n 15 \
420-
| /usr/bin/awk 'NR>1 {print "{ \"pid\": " $1 \
421-
", \"user\": \"" $2 \
422-
"\", \"mem%\": " $3 \
423-
", \"rss\": " $4 \
424-
", \"vsz\": " $5 \
425-
", \"cmd\": \"" $6 \
426-
"\"},"}')
420+
| /usr/bin/awk 'NR>1 {print "{ 'pid': " $1 \
421+
", 'user': '" $2 \
422+
"', 'mem%': " $3 \
423+
", 'rss': " $4 \
424+
", 'vsz': " $5 \
425+
", 'cmd': '" $6 \
426+
"'},"}')
427427

428428
echo [ ${result%?} ] | _parseAndPrint
429429
}
@@ -433,9 +433,9 @@ recent_account_logins() {
433433
result=$(/usr/bin/lastlog -t 365 \
434434
| /usr/bin/awk 'NR>1 {\
435435
print "{ \
436-
\"user\": \"" $1 "\", \
437-
\"ip\": \"" $3 "\","" \
438-
\"date\": \"" $5" "$6" "$7" "$8" "$9 "\"},"
436+
'user': '" $1 "', \
437+
'ip': '" $3 "',"" \
438+
'date': '" $5" "$6" "$7" "$8" "$9 "'},"
439439
}'
440440
)
441441
echo [ ${result%?} ] | _parseAndPrint
@@ -455,7 +455,7 @@ redis() {
455455

456456
result=$($redisCommand INFO \
457457
| grep 'redis_version\|connected_clients\|connected_slaves\|used_memory_human\|total_connections_received\|total_commands_processed' \
458-
| awk -F: '{print "\"" $1 "\":" "\"" $2 }' \
458+
| awk -F: '{print "'" $1 "':'" $2 "'" }' \
459459
| tr '\r' '"' | tr '\n' ','
460460
)
461461
echo { ${result%?} } | _parseAndPrint
@@ -539,15 +539,15 @@ scheduled_crons() {
539539

540540
$catCmd "${temp}" \
541541
| awk 'BEGIN {print "["} \
542-
{print "{ \"min\": \"" $1 \
543-
"\", \"hrs\": \"" $2 "\", " \
544-
" \"day\": \"" $3 "\", " \
545-
" \"month\": \"" $4 "\", " \
546-
" \"wkday\": \"" $5 "\", " \
547-
" \"user\": \"" $6 "\", " \
548-
" \"CMD\": \""} \
549-
{for(i=7;i<=NF;++i) printf("%s ", gensub("\"", "\\\\\"", "g", $i) ) } \
550-
{print "\" " \
542+
{print "{ 'min': '" $1 \
543+
"', 'hrs': '" $2 "', " \
544+
" 'day': '" $3 "', " \
545+
" 'month': '" $4 "', " \
546+
" 'wkday': '" $5 "', " \
547+
" 'user': '" $6 "', " \
548+
" 'CMD': '"} \
549+
{for(i=7;i<=NF;++i) printf("%s ", gensub("'", "\\\\'", "g", $i) ) } \
550+
{print "' " \
551551
"}," } \
552552
END {print "]"}' \
553553
| $sedCmd 'N;$s/,\n//;P;D' \
@@ -567,7 +567,7 @@ swap() {
567567
if [ "$swapLineCount" -gt 1 ]; then
568568

569569
result=$($catCmd /proc/swaps \
570-
| $awkCmd 'NR>1 {print "{ \"filename\": \"" $1"\", \"type\": \""$2"\", \"size\": \""$3"\", \"used\": \""$4"\", \"priority\": \""$5"\"}," }'
570+
| $awkCmd 'NR>1 {print "{ 'filename': '" $1"', 'type': '"$2"', 'size': '"$3"', 'used': '"$4"', 'priority': '"$5"'}," }'
571571
)
572572

573573
echo [ ${result%?} ] | _parseAndPrint
@@ -605,7 +605,7 @@ upload_transfer_rate() {
605605
out_kbytes=$((out_bytes / 1024))
606606

607607
# convert transfer rate to KB
608-
json_output="$json_output \"$basename\": $out_kbytes"
608+
json_output="$json_output '$basename': $out_kbytes"
609609

610610
# if it is not the last line
611611
if [[ ! $interface == $last ]]
@@ -624,13 +624,13 @@ user_accounts() {
624624
result=$(/usr/bin/awk -F: '{ \
625625
if ($3<=499){userType="system";} \
626626
else {userType="user";} \
627-
print "{ \"type\": \"" userType "\"" ", \"user\": \"" $1 "\", \"home\": \"" $6 "\" }," }' < /etc/passwd
627+
print "{ 'type': '" userType "'" ", 'user': '" $1 "', 'home': '" $6 "' }," }' < /etc/passwd
628628
)
629629

630630
length=$(echo ${#result})
631631

632632
if [ $length -eq 0 ]; then
633-
result=$(getent passwd | /usr/bin/awk -F: '{ if ($3<=499){userType="system";} else {userType="user";} print "{ \"type\": \"" userType "\"" ", \"user\": \"" $1 "\", \"home\": \"" $6 "\" }," }')
633+
result=$(getent passwd | /usr/bin/awk -F: '{ if ($3<=499){userType="system";} else {userType="user";} print "{ 'type': '" userType "'" ", 'user': '" $1 "', 'home': '" $6 "' }," }')
634634
fi
635635

636636
echo [ ${result%?} ] | _parseAndPrint

0 commit comments

Comments
 (0)