Merge pull request PR2#263 from k-okada/indigo-devel

rebased version of PR2#256

Author: k-okada

pr2_bringup/config/pr2_analyzers.yaml

@@ -78,7 +78,7 @@ analyzers:
         path: Forearm (Left)
         find_and_remove_prefix: l_forearm_cam
         num_items: 2
-        
+
   computers:
     type: diagnostic_aggregator/AnalyzerGroup
     path: Computers
@@ -223,7 +223,7 @@ analyzers:
   controllers:
     type: diagnostic_aggregator/GenericAnalyzer
     path: 'Realtime Controllers'
-    expected: [ 
+    expected: [
       'Realtime Control Loop',
       'Controller (head_camera_trigger)',
       'Controller (projector_controller)',

pr2_bringup/pr2-c2.launch

@@ -28,5 +28,15 @@
         <param name="publish_intensity" value="true" />
       </node> 
 
-
+      <!-- Monitor NTP -->
+      <node pkg="pr2_computer_monitor" name="ntp_c2" type="ntp_monitor.py" args="c1 --diag-hostname=c2" machine="c2"/>
+      <!-- Monitor CPU temp, usage -->
+      <node pkg="pr2_computer_monitor" name="realtime_cpu_monitor_c2" type="cpu_monitor.py" args="--diag-hostname=c2" machine="c2" >
+	<param name="check_core_temps" type="bool" value="False" />
+	<param name="check_ipmi_tool" type="bool" value="False" />
+	<param name="enforce_clock_speed" type="bool" value="False" />
+	<param name="num_cores" value="12.0" />
+      </node>
+      <!-- Disk usage monitoring script monitors HD temperature, usage on diagnostics -->
+      <node pkg="pr2_computer_monitor" name="realtime_hd_monitor_c2" type="hd_monitor.py" args="$(optenv HOME /home) --diag-hostname=c2" machine="c2"/>
 </launch>

pr2_bringup/pr2.launch

@@ -93,6 +93,9 @@
   <!-- Monitor CPU temp, usage -->
   <node pkg="pr2_computer_monitor" name="realtime_cpu_monitor" type="cpu_monitor.py" args="--diag-hostname=c1" machine="c1" >
     <param name="check_core_temps" type="bool" value="False" />
+    <param name="check_ipmi_tool" type="bool" value="False" />
+    <param name="enforce_clock_speed" type="bool" value="False" />
+    <param name="num_cores" value="12.0" />
   </node>
 
   <!-- Monitor Wifi/ddwrt -->