[checkmk-commits] #2236 FIX cups_queues: Correct not working discovery after werk #2504

Module: check_mk Branch: master Commit: e3a3a258994ac191d22d093717475f069aee5539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a3a258994ac1… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Oct 25 01:40:04 2015 +0200 #2236 FIX cups_queues: Correct not working discovery after werk #2504 Corrected not working discovery of cups_queues after werk #2504. APC uses a equal service name which ends with cupsd. A strict matching is needed to get both working. --- .werks/2236 | 13 +++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2236 b/.werks/2236 new file mode 100644 index 0000000..01ad9a3 --- /dev/null +++ b/.werks/2236 @@ -0,0 +1,13 @@ +Title: cups_queues: Correct not working discovery after werk #2504 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445729860 + +Corrected not working discovery of cups_queues after werk #2504. +APC uses a equal service name which ends with cupsd. A strict matching +is needed to get both working. + diff --git a/ChangeLog b/ChangeLog index 32aa5e0..52df68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2697 FIX: hp_msa_controller.io, hp_msa_disk.io, hp_msa_volume.io: fixed broken I/O calculation * 1296 FIX: aix_memory: Check can now handle systems without swap partition * 2690 FIX: ps: Fixed processing of old inventory_processes rules in discovery function... + * 2236 FIX: cups_queues: Correct not working discovery after werk #2504... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f52cf08..811147c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -440,7 +440,7 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then - if pgrep -x cups > /dev/null 2>&1; then + if pgrep -f "\bcupsd" > /dev/null 2>&1; then # first define a function to check cups function cups_queues () { CPRINTCONF=/etc/cups/printers.conf