Branch: refs/heads/1.6.0
Home:
https://github.com/tribe29/checkmk
Commit: 7c98b01a48602c8dcfa340336511bda1494b4cab
https://github.com/tribe29/checkmk/commit/7c98b01a48602c8dcfa340336511bda14…
Author: Mathias Laurin <mathias.laurin(a)tribe29.com>
Date: 2019-08-20 (Tue, 20 Aug 2019)
Changed paths:
A .werks/8902
M agents/plugins/apache_status
M checks/apache_status
A tests/unit/checks/generictests/datasets/apache_status.py
A tests/unit/checks/generictests/datasets/apache_status_legacy.py
Log Message:
-----------
8902 apache_status: Set optional instance name
Before, the status was reported as
Apache localhost $port Status
or
Apache $fqdn $port Status
Now, if an instance name is provided, the report is
Apache $instance $port Status
if $instance is provided. Otherwise, the reporting uses hostname/fqdn
as before.
Bakery
======
The GUI has a new "instance" element.
The bakelet does not need to be modified.
Agent and check
===============
The separator is set to | to allow spaces in the instance name. This
implies rewriting a relatively large part of the parser to accomodate
the new format.
Further changes to the parser are:
- EAFP
- defaultdict (the check is about 30% faster and it is simpler without
the explicit `__contains__()` check)
This is part 2 of CMK-1853.
Change-Id: I4efc2608a448dde51c9d02286a464eb34ba0631a