[checkmk-commits] Check_MK Git: check_mk: FIX Avoid sporadic errors when checking event state in Event Console

Module: check_mk Branch: master Commit: 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dfcbb60e3be64… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Jul 2 10:09:02 2014 +0200 FIX Avoid sporadic errors when checking event state in Event Console When you add the check for checking the current event state of a host in the Event Console than under heavy load it could sometimes happen that the check would run into an error (<tt>Ressource temporarily unavailable</tt>). This has been fixed by switching from the Python version of <tt>check_mkevents</tt> to the C version. This also saves CPU ressources if you have a larger number of hosts. --- .werks/1040 | 14 ++++++++++++++ ChangeLog | 3 +++ mkeventd/lib/.gitignore | 2 +- mkeventd/lib/Makefile | 8 ++++---- mkeventd/lib/{check_mkevents => check_mkevents.py} | 3 +++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/1040 b/.werks/1040 new file mode 100644 index 0000000..7e294dd --- /dev/null +++ b/.werks/1040 @@ -0,0 +1,14 @@ +Title: Avoid sporadic errors when checking event state in Event Console +Level: 2 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1404288443 + +When you add the check for checking the current event state of a host +in the Event Console than under heavy load it could sometimes happen +that the check would run into an error (<tt>Ressource temporarily unavailable</tt>). +This has been fixed by switching from the Python version of <tt>check_mkevents</tt> +to the C version. This also saves CPU ressources if you have a larger +number of hosts. diff --git a/ChangeLog b/ChangeLog index 81f7bad..1d3eb28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... + Event Console: + * 1040 FIX: Avoid sporadic errors when checking event state in Event Console... + Livestatus: * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service diff --git a/mkeventd/lib/.gitignore b/mkeventd/lib/.gitignore index eb18566..d921ff9 100644 --- a/mkeventd/lib/.gitignore +++ b/mkeventd/lib/.gitignore @@ -1 +1 @@ -check_mkevents_c +check_mkevents diff --git a/mkeventd/lib/Makefile b/mkeventd/lib/Makefile index fc6cfd7..1b433bc 100644 --- a/mkeventd/lib/Makefile +++ b/mkeventd/lib/Makefile @@ -22,10 +22,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -all: check_mkevents_c +all: check_mkevents -check_mkevents_c: check_mkevents.cc - g++ -O2 -o check_mkevents_c check_mkevents.cc +check_mkevents: check_mkevents.cc + g++ -O2 -s -o check_mkevents check_mkevents.cc clean: - rm -f check_mkevents_c + rm -f check_mkevents diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents.py similarity index 98% rename from mkeventd/lib/check_mkevents rename to mkeventd/lib/check_mkevents.py index 8d745d9..08b0b40 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents.py @@ -1,5 +1,8 @@ #!/usr/bin/python +# Old, outdated Python version of check_mkevents. Do not use +# anymore... + import os, socket, sys try: