[Nut-upsdev] nut-2.2.1-pre2

George Ross gdmr at inf.ed.ac.uk
Wed Dec 12 16:53:21 UTC 2007


> ... We're preparing to release 2.2.1-pre2, so if you have some fixes ...

The snmp driver reports 3-phase variables which APC's claims to support but 
returns junk for.  Patch attached for the upsstats sample files, doing 
IFSUPP against the L2 variables rather than the L1 ones.

-------------- next part --------------
--- conf/upsstats.html.sample.DIST	2007-12-12 16:24:03.000000000 +0000
+++ conf/upsstats.html.sample	2007-12-12 16:25:53.000000000 +0000
@@ -86,13 +86,13 @@
 </td>
 
 <td BGCOLOR="
- at IFSUPP input.L1-L2.voltage@
+ at IFSUPP input.L2-L3.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L1-L2.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L2-L3.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L3-L1.voltage@
 #00FF00
 @ELSE@
- at IFSUPP input.L1-N.voltage@
+ at IFSUPP input.L2-N.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L1-N.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L2-N.voltage@
 @IFBETWEEN input.transfer.low input.transfer.high input.L3-N.voltage@
@@ -105,12 +105,12 @@
 @ENDIF@
 ">
 
- at IFSUPP input.L1-L2.voltage@
+ at IFSUPP input.L2-L3.voltage@
 @VAR input.L1-L2.voltage@
 @VAR input.L2-L3.voltage@
 @VAR input.L3-L1.voltage@
 @ELSE@
- at IFSUPP input.L1-N.voltage@
+ at IFSUPP input.L2-N.voltage@
 @VAR input.L1-N.voltage@
 @VAR input.L2-N.voltage@
 @VAR input.L3-N.voltage@
@@ -121,12 +121,12 @@
 </td>
 
 <td BGCOLOR="#00FF00">
- at IFSUPP output.L1-L2.voltage@
+ at IFSUPP output.L2-L3.voltage@
 @VAR output.L1-L2.voltage@
 @VAR output.L2-L3.voltage@
 @VAR output.L3-L1.voltage@
 @ELSE@
- at IFSUPP output.L1-N.voltage@
+ at IFSUPP output.L2-N.voltage@
 @VAR output.L1-N.voltage@
 @VAR output.L2-N.voltage@
 @VAR output.L3-N.voltage@
@@ -137,12 +137,12 @@
 </td>
 
 <td BGCOLOR="#00FF00">
- at IFSUPP output.L1.power.percent@
+ at IFSUPP output.L2.power.percent@
 @VAR output.L1.power.percent@
 @VAR output.L2.power.percent@
 @VAR output.L3.power.percent@
 @ELSE@
- at IFSUPP output.L1.realpower.percent@
+ at IFSUPP output.L2.realpower.percent@
 @VAR output.L1.realpower.percent@
 @VAR output.L2.realpower.percent@
 @VAR output.L3.realpower.percent@
--- conf/upsstats-single.html.sample.DIST	2007-12-12 16:31:00.000000000 +0000
+++ conf/upsstats-single.html.sample	2007-12-12 16:34:19.000000000 +0000
@@ -118,7 +118,7 @@
 <TH VALIGN="TOP" ALIGN="RIGHT">Input: </TH>
 <TD>
 
- at IFSUPP input.L1-L2.voltage@
+ at IFSUPP input.L2-L3.voltage@
 @VAR input.L1-L2.voltage@
 V<BR>
 @VAR input.L2-L3.voltage@
@@ -128,7 +128,7 @@
 </TD>
 </TR>
 @ELSE@
- at IFSUPP input.L1-N.voltage@
+ at IFSUPP input.L2-N.voltage@
 @VAR input.L1-N.voltage@
 V<BR>
 @VAR input.L2-N.voltage@
@@ -145,7 +145,7 @@
 </TR>
 @ENDIF@
 
- at IFSUPP input.L1.current@
+ at IFSUPP input.L2.current@
 <TR>
 <TH>
 <TD>
@@ -182,7 +182,7 @@
 <TH VALIGN="TOP" ALIGN="RIGHT">Output: </TH>
 <TD>
 
- at IFSUPP output.L1-L2.voltage@
+ at IFSUPP output.L2-L3.voltage@
 @VAR output.L1-L2.voltage@
 V<BR>
 @VAR output.L2-L3.voltage@
@@ -192,7 +192,7 @@
 </TD>
 </TR>
 @ELSE@
- at IFSUPP output.L1-N.voltage@
+ at IFSUPP output.L2-N.voltage@
 @VAR output.L1-N.voltage@
 V<BR>
 @VAR output.L2-N.voltage@
@@ -209,7 +209,7 @@
 </TR>
 @ENDIF@
 
- at IFSUPP output.L1.current@
+ at IFSUPP output.L2.current@
 <TR>
 <TH>
 <TD>
@@ -259,7 +259,7 @@
 </TD>
 
 <TD ALIGN="CENTER" VALIGN="TOP" BGCOLOR="#000000">
- at IFSUPP input.L1-L2.voltage@
+ at IFSUPP input.L2-L3.voltage@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1-L2<BR>
 @IMG input.L1-L2.voltage width=68@
@@ -271,7 +271,7 @@
 @IMG input.L3-L1.voltage width=68@
 </TABLE>
 @ELSE@
- at IFSUPP input.L1-N.voltage@
+ at IFSUPP input.L2-N.voltage@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1-N<BR>
 @IMG input.L1-N.voltage width=68@
@@ -288,7 +288,7 @@
 </TD>
 
 <TD ALIGN="CENTER" VALIGN="TOP" BGCOLOR="#000000">
- at IFSUPP output.L1-L2.voltage@
+ at IFSUPP output.L2-L3.voltage@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1-L2<BR>
 @IMG output.L1-L2.voltage width=68@
@@ -300,7 +300,7 @@
 @IMG output.L3-L1.voltage width=68@
 </TABLE>
 @ELSE@
- at IFSUPP output.L1-N.voltage@
+ at IFSUPP output.L2-N.voltage@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1-N<BR>
 @IMG output.L1-N.voltage width=68@
@@ -317,7 +317,7 @@
 </TD>
 
 <TD ALIGN="CENTER" VALIGN="TOP" BGCOLOR="#000000">
- at IFSUPP output.L1.power.percent@
+ at IFSUPP output.L2.power.percent@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1<BR>
 @IMG output.L1.power.percent width=68@
@@ -329,7 +329,7 @@
 @IMG output.L3.power.percent width=68@
 </TABLE>
 @ELSE@
- at IFSUPP output.L1.realpower.percent@
+ at IFSUPP output.L2.realpower.percent@
 <TABLE BORDER="0"><TR><TD ALIGN="CENTER">
 L1<BR>
 @IMG output.L1.realpower.percent width=68@
-------------- next part --------------
Dr George D M Ross, School of Informatics, University of Edinburgh
    Kings Buildings, Mayfield Road, Edinburgh, Scotland, EH9 3JZ
Mail: gdmr at inf.ed.ac.uk   Voice: +44 131 650 5147   Fax: +44 131 667 7209
 PGP: 1024D/AD758CC5  B91E D430 1E0D 5883 EF6A  426C B676 5C2B AD75 8CC5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 236 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/nut-upsdev/attachments/20071212/57efa326/attachment.pgp 


More information about the Nut-upsdev mailing list