Revert "Refactor datastores to classes (#9179)" (#11273)

This reverts commit e5dad7a64e.
This commit is contained in:
Tony Murray
2020-03-11 07:52:52 -05:00
committed by GitHub
parent e5dad7a64e
commit 7fe895bd08
51 changed files with 1007 additions and 2523 deletions
+2 -2
View File
@@ -21,7 +21,6 @@ use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Validator;
use LibreNMS\Alerting\QueryBuilderParser;
use LibreNMS\Config;
use LibreNMS\Data\Store\Datastore;
use LibreNMS\Exceptions\InvalidIpException;
use LibreNMS\Util\IPv4;
@@ -84,8 +83,9 @@ function api_get_graph(array $vars)
ob_start();
rrdtool_initialize(false);
include 'includes/html/graphs/graph.inc.php';
Datastore::terminate();
rrdtool_close();
$image = ob_get_contents();
ob_end_clean();
@@ -18,7 +18,7 @@
require 'includes/html/graphs/common.inc.php';
$proxmox_rrd = Rrd::proxmoxName($vars['cluster'], $vars['vmid'], $vars['port']);
$proxmox_rrd = proxmox_rrd_name($vars['cluster'], $vars['vmid'], $vars['port']);
if (rrdtool_check_rrd_exists($proxmox_rrd)) {
$rrd_filename = $proxmox_rrd;