wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-23 11:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

rrd: Misc updates

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


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4372 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-04-20 13:09:41 +00:00
1 parent 0aa2104341
commit ba7cb8eeca
8 files changed
+22 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGES
+4 -1
View File
@@ -6,7 +6,10 @@ SVN HEAD
Library: Clean up pwm symbol names translation
Add dme1737 support
Program isadump: Detect when address bit 7 is a busy flag
Program sens_update_rrd: Support only hwmon class devices
Program rrd: Support only hwmon class devices
Look for rrd in /usr/bin by default
Add missing shell declarations
Update URI
Program sensors: Drop ddcmon and eeprom support
Add dme1737 support
Program sensors-detect: Stop Super-I/O probe after first family success
prog/rrd/Makefile
+3 -7
View File
@@ -4,18 +4,14 @@
USER=apache
# CRONTAB not used
#CRONTAB=/var/spool/cron/tabs/$(USER)
RRDPATH=/usr/local/rrdtool/bin
RRDPATH=/usr/bin
BINPATH=/usr/local/bin
RRDDIR=/var/lib/sensors-rrd
APACHE=/var/www/html
APACHDIR=$(APACHE)/senspix
MACH=`uname -n`
# 2.4 kernels
#SENSDEV=w83781d-isa-0290
#SENSDIR=/proc/sys/dev/sensors/$(SENSDEV)
# 2.6 kernels
SENSDEV=0-0290
SENSDIR=/sys/bus/i2c/devices/$(SENSDEV)
SENSDEV=hwmon0
SENSDIR=/sys/class/hwmon/$(SENSDEV)/device
################################################
# Everything below here should be fine
#
prog/rrd/README
+5 -8
View File
@@ -6,7 +6,7 @@ graphs of sensor data.
The RRD (Round Robin Database) package is REQUIRED.
Get this package from
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
http://oss.oetiker.ch/rrdtool/
A web server with CGI support is required.
@@ -26,7 +26,7 @@ following advantages:
If you are looking for something a little simpler,
that does not require RRD, try ../tellerstats.
The RRD scripts read /proc entries and do not use libsensors.
The RRD scripts read /sys entries and do not use libsensors.
Therefore the scale factors in /etc/sensors.conf are not used,
and you may have to change the scale factors in the cgi scripts.
@@ -45,15 +45,13 @@ INSTALLATION INSTRUCTIONS
- Make and install lm_sensors. Get it working (run 'sensors')
before you try this!
- Get RRD, make and install it
- cd /usr/local; ln -s rrdtool-x.y.z rrdtool
- cd back to here
- Edit the top of the Makefile. Do NOT skip this step.
The defaults will probably not work for you.
Here are the defaults:
Cron user
USER=httpd
Path to rrdtool and rrdcgi
RRDPATH=/usr/local/rrdtool/bin
RRDPATH=/usr/bin
Place to install sens_update_rrd script
BINPATH=/usr/local/bin
Place to store the database
@@ -63,8 +61,7 @@ INSTALLATION INSTRUCTIONS
APACHDIR=$(APACHE)/senspix
The sensor device in your system
(isa recommended over i2c if both are available)
SENSDEV=w83781d-isa-0290 (2.4 kernel - look in /proc/sys/dev/sensors)
SENSDEV=0-0290 (2.6 kernel - look in /sys/i2c/bus/devices)
SENSDEV=hwmon0 (look in /sys/class/hwmon)
- make
- (as root) make install, which does the following.
If you don't want it to do this, install by hand!!!
@@ -74,7 +71,7 @@ INSTALLATION INSTRUCTIONS
- Manually add the following line to the crontab for
the user specified above, which will call the data gathering
script every 5 minutes (adjust paths as necessary)
*/5 * * * * /usr/local/bin/sens_update_rrd /var/lib/sensors-rrd/sensors.rrd w83781d-isa-0290
*/5 * * * * /usr/local/bin/sens_update_rrd /var/lib/sensors-rrd/sensors.rrd hwmon0
- Load http://localhost/senspix/sens_day.cgi in your web browser
to test
prog/rrd/sens_create_rrd
+2 -1
View File
@@ -1,3 +1,4 @@
#!/bin/sh
#
# sens_create_rrd -
# Create a sensors rrd database of 14 sensor readings
@@ -19,7 +20,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
RRDPATH=/usr/local/rrdtool/bin
RRDPATH=/usr/bin
RRDB=$1
#Heartbeat 15 minutes
HB=900
prog/rrd/sens_day.in
+2 -3
View File
@@ -5,7 +5,6 @@
<TITLE>One Day Hardware Statistics for %%MACH%%</TITLE>
</HEAD>
<BODY>
<!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 -->
<H1>ONE DAY VIEW</H1>
See also: <br>
<a href="sens_week.cgi">One Week View</a> <br>
@@ -218,10 +217,10 @@ See also: <br>
</P>
This page generated with data and scripts from
<a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>;
<a href="http://www.lm-sensors.org/">the lm_sensors project</a>;
the data are stored in a Round Robin Database and
the graphs are generated by
<a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">
<a href="http://oss.oetiker.ch/rrdtool/">
RRD</a>.
</BODY>
prog/rrd/sens_update_rrd
+2 -1
View File
@@ -1,3 +1,4 @@
#!/bin/sh
#
# sens_update_rrd -
# Update a sensors rrd database.
@@ -37,7 +38,7 @@ else
HWMON=hwmon0
fi
#
RRDPATH=/usr/local/rrdtool/bin
RRDPATH=/usr/bin
RRDB=$1
SENSDIR=/sys/class/hwmon
prog/rrd/sens_week.in
+2 -3
View File
@@ -5,7 +5,6 @@
<TITLE>One Week Hardware Statistics for %%MACH%%</TITLE>
</HEAD>
<BODY>
<!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 -->
<H1>ONE WEEK VIEW</H1>
See also: <br>
<a href="sens_day.cgi">One Day View</a> <br>
@@ -218,10 +217,10 @@ See also: <br>
</P>
This page generated with data and scripts from
<a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>;
<a href="http://www.lm-sensors.org/">the lm_sensors project</a>;
the data are stored in a Round Robin Database and
the graphs are generated by
<a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">
<a href="http://oss.oetiker.ch/rrdtool/">
RRD</a>.
</BODY>
prog/rrd/summ_week.in
+2 -3
View File
@@ -5,7 +5,6 @@
<TITLE>One Week Summary Hardware Statistics for %%MACH%%</TITLE>
</HEAD>
<BODY>
<!-- From the lm_sensors package http://www.lm-sensors.nu MDS 4/01 -->
<H1>ONE WEEK SUMMARY VIEW</H1>
See also: <br>
<a href="sens_day.cgi">One Day View</a> <br>
@@ -90,10 +89,10 @@ See also: <br>
</P>
This page generated with data and scripts from
<a href="http://www.lm-sensors.nu/">The lm_sensors drivers</a>;
<a href="http://www.lm-sensors.org/">the lm_sensors project</a>;
the data are stored in a Round Robin Database and
the graphs are generated by
<a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">
<a href="http://oss.oetiker.ch/rrdtool/">
RRD</a>.
</BODY>