Don't update ospf stats if there are none. (#9133)

Also fixes fatal error ->count() on null.
This commit is contained in:
Tony Murray
2018-09-02 17:42:50 -05:00
committed by Neil Lathwood
parent 30790bafd1
commit 0f0ae34d77

View File

@@ -142,22 +142,24 @@ foreach ($vrfs_lite_cisco as $vrf_lite) {
unset($device['context_name'], $vrfs_lite_cisco, $vrf_lite); unset($device['context_name'], $vrfs_lite_cisco, $vrf_lite);
// Create device-wide statistics RRD if ($instance_count) {
$rrd_def = RrdDefinition::make() // Create device-wide statistics RRD
->addDataset('instances', 'GAUGE', 0, 1000000) $rrd_def = RrdDefinition::make()
->addDataset('areas', 'GAUGE', 0, 1000000) ->addDataset('instances', 'GAUGE', 0, 1000000)
->addDataset('ports', 'GAUGE', 0, 1000000) ->addDataset('areas', 'GAUGE', 0, 1000000)
->addDataset('neighbours', 'GAUGE', 0, 1000000); ->addDataset('ports', 'GAUGE', 0, 1000000)
->addDataset('neighbours', 'GAUGE', 0, 1000000);
$fields = [ $fields = [
'instances' => $instance_count, 'instances' => $instance_count,
'areas' => $ospf_areas->count(), 'areas' => $ospf_areas->count(),
'ports' => $ospf_ports->count(), 'ports' => $ospf_ports->count(),
'neighbours' => $ospf_neighbours->count(), 'neighbours' => $ospf_neighbours->count(),
]; ];
$tags = compact('rrd_def'); $tags = compact('rrd_def');
data_update($device, 'ospf-statistics', $tags, $fields); data_update($device, 'ospf-statistics', $tags, $fields);
}
echo PHP_EOL; echo PHP_EOL;