contrib/snmp-data.conf: Added even more UPS stuff.

diff --git a/contrib/snmp-data.conf b/contrib/snmp-data.conf
index 5ebbf7f..fd8d404 100644 (file)
--- a/contrib/snmp-data.conf
+++ b/contrib/snmp-data.conf
@@ -44,6 +44,13 @@
     # UPS-MIB
     # Statistics about your UPS using the UPS-MIB from the RFC1628.
     #
+    # Battery branch
+    <Data "upsmib_timeleft_battery">
+       Type "timeleft"
+       Table false
+       Instance "battery"
+       Values ".1.3.6.1.2.1.33.1.2.3.0"
+    </Data>
     <Data "upsmib_charge_battery">
        Type "percent"
        Table false
@@ -55,6 +62,28 @@
        Table false
        Instance "battery"
        Values ".1.3.6.1.2.1.33.1.2.5.0"
+       Scale 0.1
+    </Data>
+    <Data "upsmib_current_battery">
+       Type "current"
+       Table false
+       Instance "battery"
+       Values ".1.3.6.1.2.1.33.1.2.6.0"
+       Scale 0.1
+    </Data>
+    <Data "upsmib_temperature_battery">
+       Type "temperature"
+       Table false
+       Instance "battery"
+       Values ".1.3.6.1.2.1.33.1.2.7.0"
+    </Data>
+    # Input branch
+    <Data "upsmib_frequency_input">
+       Type "frequency"
+       Table true
+       InstancePrefix "input"
+       Values ".1.3.6.1.2.1.33.1.3.3.1.2"
+       Scale 0.1
     </Data>
     <Data "upsmib_voltage_input">
        Type "voltage"
@@ -62,48 +91,98 @@
        InstancePrefix "input"
        Values ".1.3.6.1.2.1.33.1.3.3.1.3"
     </Data>
+    <Data "upsmib_current_input">
+       Type "current"
+       Table true
+       InstancePrefix "input"
+       Values ".1.3.6.1.2.1.33.1.3.3.1.4"
+       Scale 0.1
+    </Data>
+    <Data "upsmib_power_input">
+       Type "power"
+       Table true
+       InstancePrefix "input"
+       Values ".1.3.6.1.2.1.33.1.3.3.1.5"
+    </Data>
+    # Output branch
+    <Data "upsmib_frequency_output">
+       Type "frequency"
+       Table false
+       Instance "output"
+       Values ".1.3.6.1.2.1.33.1.4.2.0"
+       Scale 0.1
+    </Data>
     <Data "upsmib_voltage_output">
        Type "voltage"
        Table true
        InstancePrefix "output"
        Values ".1.3.6.1.2.1.33.1.4.4.1.2"
     </Data>
+    <Data "upsmib_current_output">
+       Type "current"
+       Table true
+       InstancePrefix "output"
+       Values ".1.3.6.1.2.1.33.1.4.4.1.3"
+       Scale 0.1
+    </Data>
+    <Data "upsmib_power_output">
+       Type "power"
+       Table true
+       InstancePrefix "output"
+       Values ".1.3.6.1.2.1.33.1.4.4.1.4"
+    </Data>
+    <Data "upsmib_load_output">
+       Type "percent"
+       Table true
+       InstancePrefix "load-output"
+       Values ".1.3.6.1.2.1.33.1.4.4.1.5"
+    </Data>
+    # Bypass branch
+    <Data "upsmib_frequency_bypass">
+       Type "frequency"
+       Table false
+       Instance "output"
+       Values ".1.3.6.1.2.1.33.1.5.1.0"
+       Scale 0.1
+    </Data>
     <Data "upsmib_voltage_bypass">
        Type "voltage"
        Table true
        InstancePrefix "bypass"
        Values ".1.3.6.1.2.1.33.1.5.3.1.2"
     </Data>
-    <Data "upsmib_current_battery">
+    <Data "upsmib_current_bypass">
        Type "current"
+       Table true
+       InstancePrefix "bypass"
+       Values ".1.3.6.1.2.1.33.1.5.3.1.3"
+       Scale 0.1
+    </Data>
+    <Data "upsmib_power_bypass">
+       Type "power"
+       Table true
+       InstancePrefix "bypass"
+       Values ".1.3.6.1.2.1.33.1.5.3.1.4"
+    </Data>
+    # Special definitions for broken UPSes
+    <Data "upsmib_voltage_battery_unscaled">
+       Type "voltage"
        Table false
        Instance "battery"
-       Values ".1.3.6.1.2.1.33.1.2.6.0"
+       Values ".1.3.6.1.2.1.33.1.2.5.0"
     </Data>
-    <Data "upsmib_current_input">
+    <Data "upsmib_current_input_unscaled">
        Type "current"
        Table true
        InstancePrefix "input"
        Values ".1.3.6.1.2.1.33.1.3.3.1.4"
     </Data>
-    <Data "upsmib_current_output">
+    <Data "upsmib_current_output_unscaled">
        Type "current"
        Table true
        InstancePrefix "output"
        Values ".1.3.6.1.2.1.33.1.4.4.1.3"
     </Data>
-    <Data "upsmib_current_bypass">
-       Type "current"
-       Table true
-       InstancePrefix "bypass"
-       Values ".1.3.6.1.2.1.33.1.5.3.1.3"
-    </Data>
-    <Data "upsmib_temperature_battery">
-       Type "temperature"
-       Table false
-       Instance "battery"
-       Values ".1.3.6.1.2.1.33.1.2.7.0"
-    </Data>
 
     #
     # Riello UPS
@@ -129,6 +208,108 @@
     </Data>
 
     #
+    # PowerPlus UPS, manufactured by Gamatronic, <http://www.gamatronic.com/>,
+    # distributed in Germany by AdPoS, <http://adpos-usv.de/>
+    #
+    # Global inputs
+    <Data "powerplus_voltage_input">
+       Type "voltage"
+       Table true
+       InstancePrefix "input"
+       Values ".1.3.6.1.4.1.6050.5.4.1.1.2"
+    </Data>
+    <Data "powerplus_current_input">
+       Type "current"
+       Table true
+       InstancePrefix "input"
+       Values ".1.3.6.1.4.1.6050.5.4.1.1.3"
+    </Data>
+    <Data "powerplus_power_apparent_input">
+       Type "power"
+       Table true
+       InstancePrefix "apparent-input"
+       Values ".1.3.6.1.4.1.6050.5.4.1.1.4"
+       Scale 100.0
+    </Data>
+    <Data "powerplus_power_active_input">
+       Type "power"
+       Table true
+       InstancePrefix "active-input"
+       Values ".1.3.6.1.4.1.6050.5.4.1.1.5"
+       Scale 100.0
+    </Data>
+    <Data "powerplus_performance_factor_input">
+       Type "percent"
+       Table true
+       InstancePrefix "performance_factor-input"
+       Values ".1.3.6.1.4.1.6050.5.4.1.1.6"
+    </Data>
+    # Global outputs
+    <Data "powerplus_voltage_output">
+       Type "voltage"
+       Table true
+       InstancePrefix "output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.2"
+    </Data>
+    <Data "powerplus_current_output">
+       Type "current"
+       Table true
+       InstancePrefix "output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.3"
+    </Data>
+    <Data "powerplus_power_apparent_output">
+       Type "power"
+       Table true
+       InstancePrefix "apparent-output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.4"
+       Scale 100.0
+    </Data>
+    <Data "powerplus_power_active_output">
+       Type "power"
+       Table true
+       InstancePrefix "active-output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.5"
+       Scale 100.0
+    </Data>
+    <Data "powerplus_load_level_output">
+       Type "percent"
+       Table true
+       InstancePrefix "load_level-output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.6"
+    </Data>
+    <Data "powerplus_active_load_level_output">
+       Type "percent"
+       Table true
+       InstancePrefix "active_load_level-output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.7"
+    </Data>
+    <Data "powerplus_performance_factor_output">
+       Type "percent"
+       Table true
+       InstancePrefix "performance_factor-output"
+       Values ".1.3.6.1.4.1.6050.5.5.1.1.8"
+    </Data>
+    # Global DC
+    <Data "powerplus_global_dc_positive">
+       Type "voltage"
+       Table false
+       Instance "dc_positive-global"
+       Values ".1.3.6.1.4.1.6050.5.6.1.0"
+    </Data>
+    <Data "powerplus_global_dc_negative">
+       Type "voltage"
+       Table false
+       Instance "dc_negative-global"
+       Values ".1.3.6.1.4.1.6050.5.6.2.0"
+    </Data>
+    <Data "powerplus_global_dc_total">
+       Type "voltage"
+       Table false
+       Instance "dc_total-global"
+       Values ".1.3.6.1.4.1.6050.5.6.3.0"
+    </Data>
+
+    #
     # NetApp
     # Some simple statistics of storage systems by NetApp.
     #