upstream/icingaweb2-module-graphite
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-graphite.git synced 2026-05-28 04:34:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

GraphiteQuery: work with UrlParams object

Browse source 
This is required to handle multi-instance params
This commit is contained in:
Thomas Gelf 2016-02-16 14:10:48 +01:00
parent 0824814df1
commit dbd379c74a
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/Graphite/GraphiteQuery.php
View file

@ -4,6 +4,7 @@ namespace Icinga\Module\Graphite;
use Icinga\Module\Graphite\GraphiteWeb;
use Icinga\Web\Url;
use Icinga\Web\UrlParams;
/**
* Graphite query
@ -99,13 +100,26 @@ class GraphiteQuery
public function getWrappedImageLinks(GraphTemplate $template, $params)
{
$links = array();
if ($params instanceof UrlParams) {
$urlParams = $params;
} else {
$urlParams = new UrlParams();
foreach ($params as $k => $v) {
if (is_array($v)) {
$urlParams->addValues($k, $v);
} else {
$urlParams->add($k, $v);
}
}
}
foreach ($this->listMetrics() as $metric) {
$params = clone($urlParams);
$vars = GraphiteUtil::extractVars($metric, $this->getSearchPattern());
$links[] = Url::fromPath(
'graphite/show/graph',
array_merge($params, $vars)
);
$params->mergeValues($vars);
$url = Url::fromPath('graphite/show/graph')->setParams($params);
$links[] = $url;
}
return $links;