[checkmk-commits] Check_MK Git: check_mk: #2504 FIX cups_queues: Fixed wrong queue discovery on hosts running apcupsd

Module: check_mk Branch: master Commit: 53164e7600f28cb43a189dd8e4b1a624a6a5287b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53164e7600f28c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 6 13:33:24 2015 +0200 #2504 FIX cups_queues: Fixed wrong queue discovery on hosts running apcupsd --- .werks/2504 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2504 b/.werks/2504 new file mode 100644 index 0000000..57b1734 --- /dev/null +++ b/.werks/2504 @@ -0,0 +1,10 @@ +Title: cups_queues: Fixed wrong queue discovery on hosts running apcupsd +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438860728 + + diff --git a/ChangeLog b/ChangeLog index 20b151c..4fb896e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * 2416 FIX: agent_netapp: fixed rare problem where environmental sensor info (fan, psus, temp) were not shown... * 2418 FIX: agent_vsphere.pysphere: legacy agent no longer aborts when evaluating unknown ssl option... * 2503 FIX: diskstat: Only excluding multipath members when infos for multipath devices are available... + * 2504 FIX: cups_queues: Fixed wrong queue discovery on hosts running apcupsd Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 38faab7..8302fb4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -430,7 +430,7 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then - if pgrep cups > /dev/null 2>&1; then + if pgrep -x cups > /dev/null 2>&1; then # first define a function to check cups function cups_queues () { CPRINTCONF=/etc/cups/printers.conf