From 6ebd33cc8a657bbb336b53b4476fdfd2f564a17e Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 4 Apr 2020 07:41:22 -0500 Subject: [PATCH] Fix adsl graphs (#11379) disable name checking --- LibreNMS/RRD/RrdDefinition.php | 7 +++++++ includes/polling/ports/port-adsl.inc.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/LibreNMS/RRD/RrdDefinition.php b/LibreNMS/RRD/RrdDefinition.php index bfe42904a4..4dfcb0440e 100644 --- a/LibreNMS/RRD/RrdDefinition.php +++ b/LibreNMS/RRD/RrdDefinition.php @@ -94,9 +94,16 @@ class RrdDefinition return $this->skipNameCheck || isset($this->dataSets[$this->escapeName($name)]); } + /** + * Disable checking if the name is valid for incoming data and just assign values + * based on order + * + * @return $this + */ public function disableNameChecking() { $this->skipNameCheck = true; + return $this; } /** diff --git a/includes/polling/ports/port-adsl.inc.php b/includes/polling/ports/port-adsl.inc.php index 81b5fae361..2cd2d4cc8f 100644 --- a/includes/polling/ports/port-adsl.inc.php +++ b/includes/polling/ports/port-adsl.inc.php @@ -43,7 +43,7 @@ use LibreNMS\RRD\RrdDefinition; // adslAturPerfInvalidIntervals.1 = 0 if (isset($this_port['adslLineCoding'])) { $rrd_name = getPortRrdName($port_id, 'adsl'); - $rrd_def = RrdDefinition::make() + $rrd_def = RrdDefinition::make()->disableNameChecking() ->addDataset('AtucCurrSnrMgn', 'GAUGE', 0, 635) ->addDataset('AtucCurrAtn', 'GAUGE', 0, 635) ->addDataset('AtucCurrOutputPwr', 'GAUGE', 0, 635)