tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitoring: Really show custom variable names as-is

This commit is contained in:
Johannes Meyer 2022-01-19 16:14:02 +01:00
parent 42963d1c1e
commit 6b4f4d388a
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/views/scripts/show/components/customvars.phtml
View File

@ -1,4 +1,4 @@
<?php foreach ($object->customvars as $name => $value): ?> <?php foreach ($object->customvarsWithOriginalNames as $name => $value): ?>
<tr> <tr>
<th><?= $this->escape($name) ?></th> <th><?= $this->escape($name) ?></th>
<td class="custom-variables"><?= $this->customvar($value) ?></td> <td class="custom-variables"><?= $this->customvar($value) ?></td>

35
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -58,6 +58,13 @@ abstract class MonitoredObject implements Filterable
*/ */
protected $customvars; protected $customvars;
/**
* This object's obfuscated custom variables, names not lower case
*
* @var array
*/
protected $customvarsWithOriginalNames;
/** /**
* The host custom variables * The host custom variables
* *
@ -430,6 +437,7 @@ abstract class MonitoredObject implements Filterable
$this->customvars = $customvars; $this->customvars = $customvars;
$this->hideBlacklistedProperties(); $this->hideBlacklistedProperties();
$this->customvars = $this->obfuscateCustomVars($this->customvars, null); $this->customvars = $this->obfuscateCustomVars($this->customvars, null);
$this->customvarsWithOriginalNames = $this->obfuscateCustomVars($this->customvarsWithOriginalNames, null);
return $this; return $this;
} }
@ -500,9 +508,18 @@ abstract class MonitoredObject implements Filterable
} }
$allProperties = $this->blacklistedProperties->removeMatching( $allProperties = $this->blacklistedProperties->removeMatching(
array($this->type => array('vars' => $this->customvars)) [$this->type => ['vars' => $this->customvars]]
); );
$this->customvars = isset($allProperties[$this->type]['vars']) ? $allProperties[$this->type]['vars'] : array(); $this->customvars = isset($allProperties[$this->type]['vars'])
? $allProperties[$this->type]['vars']
: [];
$allProperties = $this->blacklistedProperties->removeMatching(
[$this->type => ['vars' => $this->customvarsWithOriginalNames]]
);
$this->customvarsWithOriginalNames = isset($allProperties[$this->type]['vars'])
? $allProperties[$this->type]['vars']
: [];
} }
/** /**
@ -520,13 +537,18 @@ abstract class MonitoredObject implements Filterable
->where('object_type', static::TYPE_HOST) ->where('object_type', static::TYPE_HOST)
->where('host_name', $this->host_name); ->where('host_name', $this->host_name);
$this->hostVariables = array(); $this->hostVariables = [];
$this->customvarsWithOriginalNames = [];
foreach ($query as $row) { foreach ($query as $row) {
if ($row->is_json) { if ($row->is_json) {
$this->hostVariables[strtolower($row->varname)] = json_decode($row->varvalue); $this->hostVariables[strtolower($row->varname)] = json_decode($row->varvalue);
} else { } else {
$this->hostVariables[strtolower($row->varname)] = $row->varvalue; $this->hostVariables[strtolower($row->varname)] = $row->varvalue;
} }
if ($this->type === static::TYPE_HOST) {
$this->customvarsWithOriginalNames[$row->varname] = $this->hostVariables[strtolower($row->varname)];
}
} }
return $this; return $this;
@ -554,12 +576,15 @@ abstract class MonitoredObject implements Filterable
->where('host_name', $this->host_name) ->where('host_name', $this->host_name)
->where('service_description', $this->service_description); ->where('service_description', $this->service_description);
$this->serviceVariables = array(); $this->serviceVariables = [];
$this->customvarsWithOriginalNames = [];
foreach ($query as $row) { foreach ($query as $row) {
if ($row->is_json) { if ($row->is_json) {
$this->serviceVariables[strtolower($row->varname)] = json_decode($row->varvalue); $this->customvarsWithOriginalNames[$row->varname] = json_decode($row->varvalue);
$this->serviceVariables[strtolower($row->varname)] = $this->customvarsWithOriginalNames[$row->varname];
} else { } else {
$this->serviceVariables[strtolower($row->varname)] = $row->varvalue; $this->serviceVariables[strtolower($row->varname)] = $row->varvalue;
$this->customvarsWithOriginalNames[$row->varname] = $row->varvalue;
} }
} }