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

Merge branch 'bugfix/command-name-dot-139'

Browse source 
fixes #139
This commit is contained in:
Alexander A. Klimov 2018-04-05 13:45:14 +02:00
commit 8c8a9111f4
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/Graphite/Graphing/Template.php
View file

@ -67,18 +67,16 @@ class Template
$metricsExcluded = 0;
foreach ($this->curves as $curveName => $curve) {
$query = $dataSource->select()->from($curve[0]->resolve([
'host_name_template' => static::getHostNameTemplate()->resolve([
'host.check_command' => $checkCommand,
'' => '$$'
]),
'service_name_template' => static::getServiceNameTemplate()->resolve([
'service.check_command' => $checkCommand,
'' => '$$'
]),
$fullMetricTemplate = new MacroTemplate($curve[0]->resolve([
'host_name_template' => static::getHostNameTemplate(),
'service_name_template' => static::getServiceNameTemplate(),
'' => '$$'
]));
$query = $dataSource->select()->from($fullMetricTemplate)
->where('host.check_command', $checkCommand)
->where('service.check_command', $checkCommand);
foreach ($filter as $key => $value) {
$query->where($key, $value);
}