mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support multiple params when rendering graph view (#10127)

Browse Source
This commit is contained in:
CirnoT
2019-04-30 05:03:06 +02:00
committed by Tony Murray
parent 125e8ec8e8
commit 735a81c887
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Widgets/GraphController.php
View File

@@ -160,15 +160,16 @@ class GraphController extends WidgetController
}
$type = $this->getGraphType();
$param = '';
$params = [];
if ($type == 'device') {
$param = 'device='.$settings['graph_device'];
$params[] = 'device='.$settings['graph_device'];
} elseif ($type == 'application') {
$param = 'id='.$settings['graph_application'];
$params[] = 'id='.$settings['graph_application'];
} elseif ($type == 'munin') {
if ($mplug = MuninPlugin::find($settings['graph_munin'])) {
$param = 'device='.$mplug->device_id.'&plugin='.$mplug->mplug_type;
$params[] = 'device='.$mplug->device_id;
$params[] = 'plugin='.$mplug->mplug_type;
}
} elseif ($type == 'aggregate') {
$aggregate_type = $this->getGraphType(false);
@@ -196,14 +197,14 @@ class GraphController extends WidgetController
})->pluck('port_id')->all();
}
$param = 'id=' . implode(',', $port_ids);
$params[] = 'id=' . implode(',', $port_ids);
$settings['graph_type'] = 'multiport_bits_separate';
} else {
$param = 'id='.$settings['graph_'.$type];
$params[] = 'id='.$settings['graph_'.$type];
}
$data = $settings;
$data['param'] = $param;
$data['params'] = $params;
$data['dimensions'] = $request->get('dimensions');
$data['from'] = Carbon::now()->subSeconds(Time::legacyTimeSpecToSecs($settings['graph_range']))->timestamp;
$data['to'] = Carbon::now()->timestamp;