Changeset 4372

Show
Ignore:
Timestamp:
04/20/07 15:09:41 (7 years ago)
Author:
khali
Message:

rrd: Misc updates
* More hwmon class changes
* Look for rrd in /usr/bin by default
* Add missing shell declarations
* Update URI

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
8 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r4371 r4372  
    77           Add dme1737 support 
    88  Program isadump: Detect when address bit 7 is a busy flag 
    9   Program sens_update_rrd: Support only hwmon class devices 
     9  Program rrd: Support only hwmon class devices 
     10               Look for rrd in /usr/bin by default 
     11               Add missing shell declarations 
     12               Update URI 
    1013  Program sensors: Drop ddcmon and eeprom support 
    1114                   Add dme1737 support 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/Makefile

    r2982 r4372  
    55# CRONTAB not used 
    66#CRONTAB=/var/spool/cron/tabs/$(USER) 
    7 RRDPATH=/usr/local/rrdtool/bin 
     7RRDPATH=/usr/bin 
    88BINPATH=/usr/local/bin 
    99RRDDIR=/var/lib/sensors-rrd 
     
    1111APACHDIR=$(APACHE)/senspix 
    1212MACH=`uname -n` 
    13 # 2.4 kernels 
    14 #SENSDEV=w83781d-isa-0290 
    15 #SENSDIR=/proc/sys/dev/sensors/$(SENSDEV) 
    16 # 2.6 kernels 
    17 SENSDEV=0-0290 
    18 SENSDIR=/sys/bus/i2c/devices/$(SENSDEV) 
     13SENSDEV=hwmon0 
     14SENSDIR=/sys/class/hwmon/$(SENSDEV)/device 
    1915################################################ 
    2016# Everything below here should be fine 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/README

    r3075 r4372  
    77The RRD (Round Robin Database) package is REQUIRED. 
    88Get this package from 
    9          http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ 
     9         http://oss.oetiker.ch/rrdtool/ 
    1010 
    1111A web server with CGI support is required. 
     
    2727that does not require RRD, try ../tellerstats. 
    2828 
    29 The RRD scripts read /proc entries and do not use libsensors. 
     29The RRD scripts read /sys entries and do not use libsensors. 
    3030Therefore the scale factors in /etc/sensors.conf are not used, 
    3131and you may have to change the scale factors in the cgi scripts. 
     
    4646          before you try this! 
    4747        - Get RRD, make and install it 
    48         - cd /usr/local; ln -s rrdtool-x.y.z rrdtool 
    49         - cd back to here 
    5048        - Edit the top of the Makefile. Do NOT skip this step. 
    5149          The defaults will probably not work for you. 
     
    5452                        USER=httpd 
    5553                Path to rrdtool and rrdcgi 
    56                         RRDPATH=/usr/local/rrdtool/bin 
     54                        RRDPATH=/usr/bin 
    5755                Place to install sens_update_rrd script 
    5856                        BINPATH=/usr/local/bin 
     
    6462                The sensor device in your system 
    6563                (isa recommended over i2c if both are available) 
    66                         SENSDEV=w83781d-isa-0290 (2.4 kernel - look in /proc/sys/dev/sensors) 
    67                         SENSDEV=0-0290           (2.6 kernel - look in /sys/i2c/bus/devices) 
     64                        SENSDEV=hwmon0           (look in /sys/class/hwmon) 
    6865        - make 
    6966        - (as root) make install, which does the following. 
     
    7572          the user specified above, which will call the data gathering 
    7673          script every 5 minutes (adjust paths as necessary) 
    77                 */5 * * * *     /usr/local/bin/sens_update_rrd /var/lib/sensors-rrd/sensors.rrd w83781d-isa-0290 
     74                */5 * * * *     /usr/local/bin/sens_update_rrd /var/lib/sensors-rrd/sensors.rrd hwmon0 
    7875        - Load http://localhost/senspix/sens_day.cgi in your web browser 
    7976                to test 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/sens_create_rrd

    r1618 r4372  
     1#!/bin/sh 
    12# 
    23#    sens_create_rrd - 
     
    2021#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
    2122# 
    22 RRDPATH=/usr/local/rrdtool/bin 
     23RRDPATH=/usr/bin 
    2324RRDB=$1 
    2425#Heartbeat 15 minutes 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/sens_day.in

    r1955 r4372  
    66</HEAD> 
    77<BODY> 
    8 <!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 --> 
    98<H1>ONE DAY VIEW</H1> 
    109See also: <br> 
     
    219218 
    220219This page generated with data and scripts from 
    221 <a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>; 
     220<a href="http://www.lm-sensors.org/">the lm_sensors project</a>; 
    222221the data are stored in a Round Robin Database and 
    223222the graphs are generated by 
    224 <a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"> 
     223<a href="http://oss.oetiker.ch/rrdtool/"> 
    225224RRD</a>. 
    226225 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/sens_update_rrd

    r4371 r4372  
     1#!/bin/sh 
    12# 
    23#    sens_update_rrd - 
     
    3839fi 
    3940# 
    40 RRDPATH=/usr/local/rrdtool/bin 
     41RRDPATH=/usr/bin 
    4142RRDB=$1 
    4243 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/sens_week.in

    r1955 r4372  
    66</HEAD> 
    77<BODY> 
    8 <!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 --> 
    98<H1>ONE WEEK VIEW</H1> 
    109See also: <br> 
     
    219218 
    220219This page generated with data and scripts from 
    221 <a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>; 
     220<a href="http://www.lm-sensors.org/">the lm_sensors project</a>; 
    222221the data are stored in a Round Robin Database and 
    223222the graphs are generated by 
    224 <a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"> 
     223<a href="http://oss.oetiker.ch/rrdtool/"> 
    225224RRD</a>. 
    226225 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/rrd/summ_week.in

    r1955 r4372  
    66</HEAD> 
    77<BODY> 
    8 <!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 --> 
    98<H1>ONE WEEK SUMMARY VIEW</H1> 
    109See also: <br> 
     
    9190 
    9291This page generated with data and scripts from 
    93 <a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>; 
     92<a href="http://www.lm-sensors.org/">the lm_sensors project</a>; 
    9493the data are stored in a Round Robin Database and 
    9594the graphs are generated by 
    96 <a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"> 
     95<a href="http://oss.oetiker.ch/rrdtool/"> 
    9796RRD</a>. 
    9897