diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-10-24 02:10:51 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-10-24 02:10:51 +0200 |
| commit | f4aeada37b662e2ff7bfc00eabeec06e6a7e3768 (patch) | |
| tree | 99e0bd341dd7d9cfb198b15419145eca98c14c08 | |
| parent | fd952ed16761afcc231f16ae566af769ae1bf929 (diff) | |
| download | conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.gz conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.bz2 conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.xz conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.zip | |
Disable X/agent forwarding and fix distcc checks
| -rw-r--r-- | netstat.conf | 9 | ||||
| -rwxr-xr-x | service/check_distcc.sh | 2 | ||||
| -rwxr-xr-x | service/check_router.sh | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/netstat.conf b/netstat.conf index 8eeab7b..c7d8f58 100644 --- a/netstat.conf +++ b/netstat.conf @@ -6,8 +6,8 @@ own_window_type override own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager own_window_colour 21449c -minimum_size 800 0 -maximum_width 800 +minimum_size 850 0 +maximum_width 850 double_buffer yes background no @@ -61,11 +61,14 @@ ${color white}ipekatrin3 ${goto 160}${lua_parse check_server_status ipekatrin3.i ${color yellow}ADEI ${hr}${lua set_width $template2}${lua set_timeout $template3} ${color white}KaaS ${goto 160}${lua_parse check_service_ adei kaas 'db_server=fpd&db_name=katrin_rep&db_group=0'}${color white} ${color white}pcebessadei ${goto 160}${lua_parse check_service_ adei pcebess}${color white} -${color white}ipemkmastadei ${goto 160}${lua_parse check_service_ adei imkmast}${color white} +${color white}imkmastadei ${goto 160}${lua_parse check_service_ adei imkmast}${color white} ${color white}CRD ${goto 160}${lua_parse check_service_ adei crd}${color white} ${color yellow}Build Farm ${hr}${lua set_width $template2}${lua set_timeout $template3} #${color white}Compute4 ${goto 160}${template0 192.168.21.1} ${template1 192.168.21.1}${color white} +${color white}Compute1 ${goto 160}${lua_parse check_service_ distcc ipepdvcompute1}${color white} +${color white}Compute2 ${goto 160}${lua_parse check_service_ distcc ipepdvcompute2}${color white} +${color white}Compute3 ${goto 160}${lua_parse check_service_ distcc ipepdvcompute3}${color white} ${color white}Compute4 ${goto 160}${lua_parse check_service_ distcc ipepdvcompute4}${color white} ${lua_parse print_server_errors $template8 conky_netstat} diff --git a/service/check_distcc.sh b/service/check_distcc.sh index 1862b52..4af7850 100755 --- a/service/check_distcc.sh +++ b/service/check_distcc.sh @@ -8,7 +8,7 @@ name=distccd [ -z "$host" ] && { echo "Host should be specified"; exit 1; } online=$(../scripts/ping.pl "$host") -healthy=$(../scripts/ping.pl "$host" 3364) +healthy=$(../scripts/ping.pl "$host:3632") function qssh { ssh "root@$host" "$@" diff --git a/service/check_router.sh b/service/check_router.sh index 82391aa..a5fb64d 100755 --- a/service/check_router.sh +++ b/service/check_router.sh @@ -49,7 +49,7 @@ else fi # VPN check -ssh darksoft.org ping -W 2 -c 2 192.168.31.1 &> /dev/null +ssh -xa darksoft.org ping -W 2 -c 2 192.168.31.1 &> /dev/null if [ $? -ne 0 ]; then echo "Can't verify availability of UFO tunnel" [ $healthy -eq 1 ] && healthy=2 @@ -61,11 +61,11 @@ if [ $? -ne 0 ]; then [ $healthy -eq 1 ] && healthy=2 fi -uptime=$(ssh $host uptime | sed -e 's/^[[:space:]]\+//') +uptime=$(ssh -xa $host uptime | sed -e 's/^[[:space:]]\+//') up=$(echo $uptime | cut -d ' ' -f 3- | cut -d ',' -f 1 | sed -re 's/^\s*//') load=$(echo $uptime | cut -d ' ' -f 3- | cut -d ',' -f 4- | cut -d ':' -f 2 | cut -d ',' -f 3 | sed -re 's/^\s*//') -ret=$(ssh $host rpm -qi redhat-release | grep Version) +ret=$(ssh -xa $host rpm -qi redhat-release | grep Version) if [ $? -eq 0 ]; then rel="RHEL $(echo "$ret" | cut -d ':' -f 2 | sed -e 's/^[[:space:]]\+//')" else |