Changeset 3402 for people

Show
Ignore:
Timestamp:
03/07/10 12:45:05 (2 years ago)
Author:
steve.schnepp
Message:

r89@sandra (orig r3394): holger | 2010-03-01 18:54:45 +0100
fix speling error detected by lintian
r92@sandra (orig r3397): knan | 2010-03-02 12:51:07 +0100
if_ cosmetic fix
r93@sandra (orig r3398): knan | 2010-03-02 12:51:08 +0100
mysql_ comment typo
r94@sandra (orig r3399): knan | 2010-03-02 14:03:04 +0100
jmx_ : respect JRE_HOME, if configured
r95@sandra (orig r3400): mha | 2010-03-02 21:06:03 +0100
Remove leftover debugging message

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/snide/pre_1.5/master/doc/munin.conf.pod.in

    r3004 r3402  
    108108 
    109109The local address to connect any node from in case the master has 
    110 several IP interfaces.  This can be overriden by a group or global 
     110several IP interfaces.  This can be overridden by a group or global 
    111111directive.  Without this directive Munins traffic will originate from 
    112112the master server according to the IP routing table. 

  • people/snide/pre_1.5/master/lib/Munin/Master/LimitsOld.pm

    r3390 r3402  
    696696                } 
    697697            } 
    698             INFO "Baz?"; 
    699698            munin_set_var_loc($contactobj, ["pipe_command"], $cmd); 
    700699            munin_set_var_loc($contactobj, ["pipe"],         $pipe); 

  • people/snide/pre_1.5/plugins/node.d.linux/if_.in

    r3142 r3402  
    135135 
    136136    case $SPEED in 
    137         U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is apropriate for the interface." 
     137        U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is appropriate for the interface." 
    138138           return;; 
    139139    esac 

  • people/snide/pre_1.5/plugins/node.d/jmx_.in

    r3229 r3402  
    2323    env.username monitorRole 
    2424    env.password SomethingSecret 
     25 
     26    env.JRE_HOME /usr/lib/jvm/java-6-sun/jre 
    2527 
    2628Needed configuration on the Tomcat side: add 
    …… 
    8082MUNIN_JAR="@@JAVALIBDIR@@/munin-jmx-plugins.jar" 
    8183 
     84if [ "x$JRE_HOME" != "x" ] ; then 
     85  JRE=$JRE_HOME/bin/java 
     86  export JRE_HOME=$JRE_HOME 
     87fi 
     88JAVA_BIN=${JRE:-@@JAVARUN@@} 
     89 
    8290ip=${ip:-127.0.0.1} 
    8391port=${port:-5400} 
    …… 
    130138    CONNECT=$? 
    131139 
    132     JAVA_BIN="@@JAVARUN@@" 
    133140    $JAVA_BIN -? >/dev/null 2>&1 
    134141    JAVA=$? 
    …… 
    166173fi 
    167174 
    168 ip=$ip port=$port @@JAVARUN@@ -cp $MUNIN_JAR org.munin.plugin.jmx.$jmxfunc $param 
     175ip=$ip port=$port $JAVA_BIN -cp $MUNIN_JAR org.munin.plugin.jmx.$jmxfunc $param 

  • people/snide/pre_1.5/plugins/node.d/mysql_.in

    r3375 r3402  
    712712#--------------------------------------------------------------------- 
    713713 
    714 # Each command handler should return an apropriate exit code 
     714# Each command handler should return an appropriate exit code 
    715715 
    716716