diff options
Diffstat (limited to 'Monitoring')
| -rw-r--r-- | Monitoring/Makefile | 2 | ||||
| -rw-r--r-- | Monitoring/conf/shack_guests.cfg | 4 | ||||
| -rwxr-xr-x | Monitoring/plugins/check_temper | 4 | 
3 files changed, 5 insertions, 5 deletions
diff --git a/Monitoring/Makefile b/Monitoring/Makefile index e1fe7083..794f9262 100644 --- a/Monitoring/Makefile +++ b/Monitoring/Makefile @@ -20,4 +20,4 @@ debian:  	chown nagios:www-data /var/lib/nagios3 || true  	chown nagios:www-data /var/lib/nagios3/rw || true  	chmod g+x /var/lib/nagios3 || true -	chmod ug=rwx /var/lib/nagios3/rw/nagios.cmd || true +	chmod ugo=rwx /var/lib/nagios3/rw/nagios.cmd || true diff --git a/Monitoring/conf/shack_guests.cfg b/Monitoring/conf/shack_guests.cfg index 7a8cc088..711eb79c 100644 --- a/Monitoring/conf/shack_guests.cfg +++ b/Monitoring/conf/shack_guests.cfg @@ -35,7 +35,7 @@ define host{          address                 10.42.0.96          _TINC_ADDRESS           10.7.7.6          _SPEED_URL              http://leechi.kicks-ass.org/tmp/live/chinaman_bitcoinslc_live -        _TEMPER_URL              http://leechi.kicks-ass.org/tmp/live/chinaman_bitcoinslc_live +        _TEMPER_URL             http://leechi.kicks-ass.org/tmp/live/chinaman_ati_temper          hostgroups              bitcoin-miner,tinc-nodes,ssh-servers          contact_groups           krebsminers          } @@ -52,7 +52,7 @@ define service {          }  define command {          command_name  check_temper -        command_line $USER1$/check_speed $_HOSTTEMPER_URL$ $ARG1$ +        command_line $USER1$/check_temper $_HOSTTEMPER_URL$ $ARG1$          }  define service {          host_name               chinaman diff --git a/Monitoring/plugins/check_temper b/Monitoring/plugins/check_temper index f2e0fd32..95191026 100755 --- a/Monitoring/plugins/check_temper +++ b/Monitoring/plugins/check_temper @@ -16,12 +16,12 @@ try:    ret = urllib.urlopen(URL).read().split()    date = ret[0]    temps = [float(i) for i in ret[1:]] -  print ("** %s : %s" % (date,' '.join([str(i)+"°C" for i in temps]))) +  print ("** %s : %s" % (date,' '.join([str(i)+"°C" for i in temps])))    if len(temps) != len(thresholds):      raise Exception("Number of temps != number of given thresholds")    for i,temp in enumerate(temps):      if temp > thresholds[i]: -      print ("!! %.2f°C > %.2f°C (field %d)!" %(temp,thresholds[i],i)) +      print ("!! %.2f°°C > %.2f°C (field %d)!" %(temp,thresholds[i],i))        ecode=2  except Exception,e:    print("!! Something awful happened: "+str(e))  | 
