remove temp limits

diff --git a/temperature.conf b/temperature.conf
index 68ed2c786999010ea6c53e32cd608dc199ddd132..c7e0ad4dda138ff7853185d86ab2708f1e6c6d0e 100644 (file)
--- a/temperature.conf
+++ b/temperature.conf
@@ -17,22 +17,22 @@ $hosts = [
                                'name' => 'Battery Temperature',
                                'oidtext' => 'PowerNet-MIB::upsAdvBatteryTemperature.0',
                                'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.2.0',
                                'name' => 'Battery Temperature',
                                'oidtext' => 'PowerNet-MIB::upsAdvBatteryTemperature.0',
                                'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.2.0',

-                               'min' => '0',
-                               'max' => '100',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                        'ambT' => {
                                'name' => 'Ambient Temperature',
                                'oidtext' => 'PowerNet-MIB::iemStatusProbeCurrentTemp.1',
                                'oid' => '1.3.6.1.4.1.318.1.1.10.2.3.2.1.4.1',
                        },
                        'ambT' => {
                                'name' => 'Ambient Temperature',
                                'oidtext' => 'PowerNet-MIB::iemStatusProbeCurrentTemp.1',
                                'oid' => '1.3.6.1.4.1.318.1.1.10.2.3.2.1.4.1',

-                               'min' => '0',
-                               'max' => '60',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                        'ambH' => {
                                'name' => 'Ambient Humidity',
                                'oidtext' => 'PowerNet-MIB::iemStatusProbeCurrentHumid.1',
                                'oid' => '1.3.6.1.4.1.318.1.1.10.2.3.2.1.6.1',
                        },
                        'ambH' => {
                                'name' => 'Ambient Humidity',
                                'oidtext' => 'PowerNet-MIB::iemStatusProbeCurrentHumid.1',
                                'oid' => '1.3.6.1.4.1.318.1.1.10.2.3.2.1.6.1',

-                               'min' => '0',
-                               'max' => '100',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                },
        },
                        },
                },
        },


@@ -49,8 +49,8 @@ $hosts = [
                                'name' => 'Battery Temperature',
                                'oidtext' => 'PowerNet-MIB::upsAdvBatteryTemperature.0',
                                'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.2.0',
                                'name' => 'Battery Temperature',
                                'oidtext' => 'PowerNet-MIB::upsAdvBatteryTemperature.0',
                                'oid' => '1.3.6.1.4.1.318.1.1.1.2.2.2.0',

-                               'min' => '0',
-                               'max' => '100',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                }
        },
                        },
                }
        },


@@ -66,8 +66,8 @@ $hosts = [
                        'temp' => {
                                'name' => 'Internal Temperature',
                                'oid' => '1.3.6.1.4.1.9.9.13.1.3.1.3.1004',
                        'temp' => {
                                'name' => 'Internal Temperature',
                                'oid' => '1.3.6.1.4.1.9.9.13.1.3.1.3.1004',

-                               'min' => '0',
-                               'max' => '200',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                }
        },
                        },
                }
        },


@@ -83,8 +83,8 @@ $hosts = [
                        'temp' => {
                                'name' => 'Internal Temperature',
                                'oid' => '1.3.6.1.4.1.9.9.13.1.3.1.3.1004',
                        'temp' => {
                                'name' => 'Internal Temperature',
                                'oid' => '1.3.6.1.4.1.9.9.13.1.3.1.3.1004',

-                               'min' => '0',
-                               'max' => '200',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                }
        },
                        },
                }
        },


@@ -100,8 +100,8 @@ $hosts = [
                                'name' => 'Arbeitszimmer',
                                'port' => '31337',
                                'proto' => 'tcp',
                                'name' => 'Arbeitszimmer',
                                'port' => '31337',
                                'proto' => 'tcp',

-                               'min' => '0',
-                               'max' => '100',
+                               'min' => 'U',
+                               'max' => 'U',

                        },
                }
        },
                        },
                }
        },

diff --git a/upsgraph.pl b/upsgraph.pl
index 91ae5adb99c055bf04f5e0b8e0ca4a876240e8a4..82e0259fc1c0cd7cec6917f125a8ee7dce324582 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -190,7 +190,6 @@ foreach my $host (@$hosts) {
 
                if (defined($rrdinfo->{"ds[${field}].max"})) {
                        if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {
 
                if (defined($rrdinfo->{"ds[${field}].max"})) {
                        if ($rrdinfo->{"ds[${field}].max"} ne $host->{'vars'}->{$field}->{'max'}) {

-                               print "Max differs\n";

                                RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
                        }
                } else {
                                RRDs::tune("${rrdfile}.${field}","-a",$field.":".$host->{'vars'}->{$field}->{'max'});
                        }
                } else {