Changeset 4373

Show
Ignore:
Timestamp:
04/20/07 15:32:53 (2 years ago)
Author:
khali
Message:

More rrd cleanups:
* Update Makefile and README to mention hwmon class for newer

2.6 kernels

* Add missing shell declarations
* Update URI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • lm-sensors/trunk/CHANGES

    r4370 r4373  
    88  Man page sensors.conf.5: Update the chip statement section 
    99  Program isadump: Detect when address bit 7 is a busy flag 
    10   Program sens_update_rrd: Support non-i2c devices (hwmon class) 
     10  Program rrd: Support non-i2c devices (hwmon class) 
     11               Add missing shell declarations 
     12               Update URI 
    1113  Program sensors: Drop ddcmon and eeprom support 
    1214                   Add dme1737 support 
  • lm-sensors/trunk/prog/rrd/Makefile

    r2982 r4373  
    1414#SENSDEV=w83781d-isa-0290 
    1515#SENSDIR=/proc/sys/dev/sensors/$(SENSDEV) 
    16 # 2.6 kernels 
    17 SENSDEV=0-0290 
    18 SENSDIR=/sys/bus/i2c/devices/$(SENSDEV) 
     16# 2.6 kernels up to 2.6.13 
     17#SENSDEV=0-0290 
     18#SENSDIR=/sys/bus/i2c/devices/$(SENSDEV) 
     19# 2.6.14 and later kernels 
     20SENSDEV=hwmon0 
     21SENSDIR=/sys/class/hwmon/$(SENSDEV)/device 
    1922################################################ 
    2023# Everything below here should be fine 
  • lm-sensors/trunk/prog/rrd/README

    r3075 r4373  
    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 /proc or /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. 
     
    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                2.4 kernel - look in /proc/sys/dev/sensors: 
     65                        SENSDEV=w83781d-isa-0290 
     66                2.6 kernel up to 2.6.13 - look in /sys/i2c/bus/devices: 
     67                        SENSDEV=0-0290 
     68                2.6.14+ kernel - look in /sys/class/hwmon: 
     69                        SENSDEV=hwmon0 
    6870        - make 
    6971        - (as root) make install, which does the following. 
  • lm-sensors/trunk/prog/rrd/sens_create_rrd

    r1618 r4373  
     1#!/bin/sh 
    12# 
    23#    sens_create_rrd - 
  • lm-sensors/trunk/prog/rrd/sens_day.in

    r1955 r4373  
    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/trunk/prog/rrd/sens_update_rrd

    r4369 r4373  
     1#!/bin/sh 
    12# 
    23#    sens_update_rrd - 
  • lm-sensors/trunk/prog/rrd/sens_week.in

    r1955 r4373  
    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/trunk/prog/rrd/summ_week.in

    r1955 r4373  
    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