From 4ae4847a60760a0d831d0523f8b8f44bbfb69fc9 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sun, 12 Mar 2017 16:44:24 -0500
Subject: [PATCH] fix: Change rfc1628 'state' (est. runtime and on battery) to
 runtime (#6158)

* fix: Change rfc1628 'state' (est. runtime and on battery) to runtime

* Fix up the graph error ( : in ds name).
Change seconds on battery to minutes so the value is in minutes

* wrong scale for limits

* Don't use snmp_walk
---
 html/includes/graphs/sensor/runtime.inc.php   |  4 +-
 .../discovery/sensors/runtime/rfc1628.inc.php | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 includes/discovery/sensors/runtime/rfc1628.inc.php

diff --git a/html/includes/graphs/sensor/runtime.inc.php b/html/includes/graphs/sensor/runtime.inc.php
index 2c1eadf72c..4935ac14dc 100644
--- a/html/includes/graphs/sensor/runtime.inc.php
+++ b/html/includes/graphs/sensor/runtime.inc.php
@@ -1,8 +1,8 @@
 <?php
 $scale_min = '0';
 require 'includes/graphs/common.inc.php';
-$rrd_options .= " COMMENT:'                                 Last   Max\\n'";
-$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 28), 0, 28);
+$rrd_options .= " COMMENT:'                                       Last     Max\\n'";
+$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 32);
 $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
 $rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
 $rrd_options .= ' GPRINT:sensor:LAST:%3.0lfMin';
diff --git a/includes/discovery/sensors/runtime/rfc1628.inc.php b/includes/discovery/sensors/runtime/rfc1628.inc.php
new file mode 100644
index 0000000000..b60c66c021
--- /dev/null
+++ b/includes/discovery/sensors/runtime/rfc1628.inc.php
@@ -0,0 +1,52 @@
+<?php
+
+echo 'RFC1628 ';
+
+// UPS-MIB::upsSeconsOnBattery
+$secs_on_battery_oid = '.1.3.6.1.2.1.33.1.2.2.0';
+$secs_on_battery = snmp_get($device, $secs_on_battery_oid, '-Oqv');
+
+if (is_numeric($secs_on_battery)) {
+    discover_sensor(
+        $valid['sensor'],
+        'runtime',
+        $device,
+        $secs_on_battery_oid,
+        100,
+        'rfc1628',
+        'Time on battery',
+        60,
+        1,
+        0,
+        0,
+        1,
+        2,
+        $secs_on_battery
+    );
+}
+
+
+// UPS-MIB::upsEstimatedMinutesRemaining
+$est_battery_time_oid = ".1.3.6.1.2.1.33.1.2.3.0";
+$est_battery_time = snmp_get($device, $est_battery_time_oid, '-Ovq');
+
+if (is_numeric($est_battery_time)) {
+    discover_sensor(
+        $valid['sensor'],
+        'runtime',
+        $device,
+        $est_battery_time_oid,
+        200,
+        'rfc1628',
+        'Estimated battery time remaining',
+        1,
+        1,
+        5,
+        10,
+        null,
+        10000,
+        $est_battery_time
+    );
+}
+
+unset($secs_on_battery, $secs_on_battery_oid, $est_battery_time, $est_battery_time_oid);