upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-01-09 14:42:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make sure to expect ITL compatible custom var names

Browse source
This commit is contained in:
Johannes Meyer 2022-07-21 15:58:26 +02:00
parent 104e2ab488
commit d34da32f28
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/10-Monitoring.md
View file

@ -39,11 +39,11 @@ configuration:
checkcommand_name=businessprocess-check
```
A service can define specific custom variables for this. Some are mandatory.
If they are not defined, the detail view integration won't be active.
A service can define specific custom variables for this. Mandatory ones
that are not defined, cause the detail view integration to not be active.
| Variable Name | Mandatory | Description |
|---------------------------|-----------|----------------------------------------------|
| businessprocess\_process | Yes | The `<process>` being checked |
| businessprocess\_config | Yes | Name of the config that contains `<process>` |
| businessprocess\_as\_tree | No | Whether to show `<process>` as tree or tiles |
| Variable Name | Mandatory | Description |
|--------------------------------------|-----------|----------------------------------------------|
| icingacli\_businessprocess\_process | Yes | The `<process>` being checked |
| icingacli\_businessprocess\_config | No | Name of the config that contains `<process>` |
| icingaweb\_businessprocess\_as\_tree | No | Whether to show `<process>` as tree or tiles |

8
library/Businessprocess/ProvidedHook/Icingadb/ServiceDetailExtension.php
View file

@ -46,12 +46,12 @@ class ServiceDetailExtension extends ServiceDetailExtensionHook
return HtmlString::create('');
}
$bpName = $service->customvars['businessprocess_config'] ?? null;
$bpName = $service->customvars['icingacli_businessprocess_config'] ?? null;
if (! $bpName) {
return HtmlString::create('');
$bpName = key($this->storage->listProcessNames());
}
$nodeName = $service->customvars['businessprocess_process'] ?? null;
$nodeName = $service->customvars['icingacli_businessprocess_process'] ?? null;
if (! $nodeName) {
return HtmlString::create('');
}
@ -61,7 +61,7 @@ class ServiceDetailExtension extends ServiceDetailExtensionHook
IcingaDbState::apply($bp);
if ($service->customvars['businessprocess_as_tree'] ?? false) {
if ($service->customvars['icingaweb_businessprocess_as_tree'] ?? false) {
$renderer = new TreeRenderer($bp, $node);
$tag = 'ul';
} else {

8
library/Businessprocess/ProvidedHook/Monitoring/DetailviewExtension.php
View file

@ -52,12 +52,12 @@ class DetailviewExtension extends DetailviewExtensionHook
return '';
}
$bpName = $object->_service_businessprocess_config;
$bpName = $object->_service_icingacli_businessprocess_config;
if (! $bpName) {
return '';
$bpName = key($this->storage->listProcessNames());
}
$nodeName = $object->_service_businessprocess_process;
$nodeName = $object->_service_icingacli_businessprocess_process;
if (! $nodeName) {
return '';
}
@ -67,7 +67,7 @@ class DetailviewExtension extends DetailviewExtensionHook
MonitoringState::apply($bp);
if (filter_var($object->_service_businessprocess_as_tree, FILTER_VALIDATE_BOOLEAN)) {
if (filter_var($object->_service_icingaweb_businessprocess_as_tree, FILTER_VALIDATE_BOOLEAN)) {
$renderer = new TreeRenderer($bp, $node);
$tag = 'ul';
} else {