Merge fa52619 into 78e0257

atanas-vladimirov · web-flow · commit b6012865913a · 2025-11-12T16:02:50.000+02:00
diff --git a/NEWS.adoc b/NEWS.adoc
@@ -200,8 +200,11 @@ several `FSD` notifications into one executed action. [PR #3097]
 
  - `upsset` should now recognize `RANGE NUMBER` and `NUMBER` types. [#3164]
 
- - `upsstats` has now JSON output mode via `?json` (or `&json`) CGI query
-    parameter. [issue #2524, PR #3171]
+ - `upsstats` tool updates:
+   * Now has JSON output mode via `?json` (or `&json`) CGI query
+     parameter. [issue #2524, PR #3171]
+   * Handle `device.model` in addition to `ups.model` in upsstats HTML
+     templates. [#XXXX]
 
  - `upssched` tool updates:
    * Previously in PR #2896 (NUT releases v2.8.3 and v2.8.4) the `UPSNAME` and
diff --git a/conf/upsstats-single.html.sample b/conf/upsstats-single.html.sample
@@ -24,7 +24,15 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 @REFRESH@
-<title>@HOSTDESC@ : @VAR ups.model@ on @HOST@</title>
+<title>
+@HOSTDESC@ :
+@IFSUPP device.model@
+@VAR device.model@
+@ELSE@
+@VAR ups.model@
+@ENDIF@
+on @HOST@
+</title>
 <!-- LINK REL="stylesheet" TYPE="text/css" HREF="http://localhost/nut/nut.css" / -->
 <style type="text/css">
 body{color:#00fc00; background:#808080; font-family:"Times New Roman", Times, serif;}
@@ -38,7 +46,15 @@ table{background:#000;}
 <table style="margin:auto" BORDER="1" CELLSPACING="0" CELLPADDING="10">
 
 <tr>
-<th COLSPAN="20">Network UPS Tools upsstats @VERSION@ - @HOSTDESC@ - @VAR ups.model@ on @HOST@</th>
+<th COLSPAN="20">
+Network UPS Tools upsstats @VERSION@ - @HOSTDESC@ -
+@IFSUPP device.model@
+@VAR device.model@
+@ELSE@
+@VAR ups.model@
+@ENDIF@
+on @HOST@
+</th>
 </tr>
 
 <tr>
@@ -63,7 +79,13 @@ table{background:#000;}
 
 <tr>
 <th ALIGN="RIGHT">UPS Model:</th>
-<td>@VAR ups.model@</td>
+<td>
+@IFSUPP device.model@
+@VAR device.model@
+@ELSE@
+@VAR ups.model@
+@ENDIF@
+</td>
 </tr>
 
 <tr>
diff --git a/conf/upsstats.html.sample b/conf/upsstats.html.sample
@@ -79,7 +79,11 @@ th, td{padding:0.5ex;}
 </td>
 
 <td class="t1">
+@IFSUPP device.model@
+@VAR device.model@
+@ELSE@
 @VAR ups.model@
+@ENDIF@
 </td>
 
 <td style="background:@STATUSCOLOR@">
