From: Michael Traxler <M.Traxler@gsi.de>
Date: Wed, 12 Nov 2014 20:51:12 +0000 (+0100)
Subject: update to monitoring
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=db8883e73359ccbcfb41b16c32adbbdc796e0b70;p=daqtools.git

update to monitoring
---

diff --git a/dmon/scripts/dmon_ping.pl b/dmon/scripts/dmon_ping.pl
index de05b39..219d801 100755
--- a/dmon/scripts/dmon_ping.pl
+++ b/dmon/scripts/dmon_ping.pl
@@ -4,7 +4,7 @@ use warnings;
 use POSIX qw(strftime);
 use FileHandle;
 use lib "./code";
-use lib "../tools";
+use lib "./tools";
 use HADES::TrbNet;
 use Time::HiRes qw(usleep);
 use Dmon;
@@ -13,7 +13,7 @@ use Net::Ping;
 my %config = Dmon::StartUp();
 
 
-my $ping = Net::Ping->new();
+my $ping = Net::Ping->new("external");
 while(1) {
   my $found = 0;
   my $notavail = 0;
@@ -21,6 +21,7 @@ while(1) {
   my $total = scalar @{$config{TrbIP}};
   foreach my $p (@{$config{TrbIP}}) {
     my $r = $ping->ping($p,1);
+#     print $p."\t$r\n";
     $found    += $r || 0;
     $notavail += 1-($r||0);
     $list .= " $p" unless $r;
@@ -33,4 +34,4 @@ while(1) {
   Dmon::WriteQALog($config{flog},"ping",30,$status,$title,$value,$longtext,"");
   
   sleep(15);  
-  }
\ No newline at end of file
+  }
diff --git a/dmon/scripts/dmon_qa.pl b/dmon/scripts/dmon_qa.pl
index 6248e3f..0f82f3f 100755
--- a/dmon/scripts/dmon_qa.pl
+++ b/dmon/scripts/dmon_qa.pl
@@ -2,6 +2,8 @@
 use FileHandle;
 use Data::Dumper;
 use POSIX qw(strftime);
+use FindBin;                 # locate this script
+use lib "$FindBin::Bin/..";
 use lib "./code";
 use Dmon;
 
diff --git a/users/cern_cbmrich/dmon_config.pl b/users/cern_cbmrich/dmon_config.pl
old mode 100644
new mode 100755
index 0681c6d..374d0ba
--- a/users/cern_cbmrich/dmon_config.pl
+++ b/users/cern_cbmrich/dmon_config.pl
@@ -60,26 +60,26 @@ MBSAddress => 0xf30a,
 #Addresses of all TDCs. Either single or broadcast addresses
 TdcAddress   => [0xfe4c,0xfe4e,0x7005],  
 
-TrbIP => ["192.168.0.0",
-          "192.168.0.1",
-          "192.168.0.2",
-          "192.168.0.3",
-          "192.168.0.4",
-          "192.168.0.5",
-          "192.168.0.6",
-          "192.168.0.7",
-          "192.168.0.8",
-          "192.168.0.9",
-          "192.168.0.10",
-          "192.168.0.11",
-          "192.168.0.12",
-          "192.168.0.13",
-          "192.168.0.14",
-          "192.168.0.15",
-          "192.168.0.16",
-          "192.168.0.17"],
+TrbIP => ["192.168.0.29",
+          "192.168.0.47",
+          "192.168.0.56",
+          "192.168.0.57",
+          "192.168.0.59",
+          "192.168.0.72",
+          "192.168.0.73",
+          "192.168.0.74",
+          "192.168.0.78",
+          "192.168.0.83",
+          "192.168.0.84",
+          "192.168.0.89",
+          "192.168.0.97",
+          "192.168.0.99",
+          "192.168.0.101",
+          "192.168.0.102",
+          "192.168.0.104",
+          "192.168.0.105"],
 
 
 
 #User directory
-UserDirectory => '/home/hadaq/trbsoft/daqtools/users/cern_cbmrich/';
+UserDirectory => '/home/hadaq/trbsoft/daqtools/users/cern_cbmrich/'