Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

Restrict the lifetime of an InputBuffer to a single connection.

by Sven Panne

Module: check_mk Branch: master Commit: fdebf5e9345f7ce54add611b42bd74133d2f5db7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdebf5e9345f7c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 13:45:46 2016 +0100 Restrict the lifetime of an InputBuffer to a single connection. --- livestatus/src/InputBuffer.cc | 10 ++-------- livestatus/src/InputBuffer.h | 3 +-- livestatus/src/module.c | 5 ++--- livestatus/src/store_c.cc | 9 ++------- livestatus/src/store_c.h | 3 +-- 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 92c7c77..6bababb 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -67,20 +67,14 @@ pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) // pointers, offsets, etc. with vector. // cppcheck-suppress uninitMemberVar -InputBuffer::InputBuffer(int *termination_flag) - : _fd(-1), _termination_flag(termination_flag) +InputBuffer::InputBuffer(int fd, int *termination_flag) + : _fd(fd), _termination_flag(termination_flag) { _read_pointer = &_readahead_buffer[0]; // points to data not yet processed _write_pointer = _read_pointer; // points to end of data in buffer _end_pointer = _read_pointer + buffer_size; // points ot end of buffer } -void InputBuffer::setFd(int fd) -{ - _fd = fd; - _read_pointer = _write_pointer = _readahead_buffer; -} - // read in data enough for one complete request (and maybe more). pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() { diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 4f5bc07..2e7626f 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -44,8 +44,7 @@ public: timeout }; - explicit InputBuffer(int *termination_flag); - void setFd(int fd); + InputBuffer(int fd, int *termination_flag); std::pair<std::list<std::string>, Result> readRequest(); private: diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 518cde8..4de4788 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -210,7 +210,6 @@ void *main_thread(void *data __attribute__ ((__unused__))) void *client_thread(void *data __attribute__ ((__unused__))) { - void *input_buffer = create_inputbuffer(&g_should_terminate); void *output_buffer = create_outputbuffer(); while (!g_should_terminate) { @@ -220,7 +219,7 @@ void *client_thread(void *data __attribute__ ((__unused__))) if (cc >= 0) { if (g_debug_level >= 2) logger(LG_INFO, "Accepted client connection on fd %d", cc); - set_inputbuffer_fd(input_buffer, cc); + void *input_buffer = create_inputbuffer(cc, &g_should_terminate); int keepalive = 1; unsigned requestnr = 1; while (keepalive) { @@ -231,12 +230,12 @@ void *client_thread(void *data __attribute__ ((__unused__))) g_counters[COUNTER_REQUESTS]++; requestnr ++; } + delete_inputbuffer(input_buffer); close(cc); } g_num_active_connections--; } delete_outputbuffer(output_buffer); - delete_inputbuffer(input_buffer); return voidp; } diff --git a/livestatus/src/store_c.cc b/livestatus/src/store_c.cc index c36af2f..d952696 100644 --- a/livestatus/src/store_c.cc +++ b/livestatus/src/store_c.cc @@ -103,14 +103,9 @@ void delete_outputbuffer(void *ob) delete static_cast<OutputBuffer *>(ob); } -void *create_inputbuffer(int *termination_flag) +void *create_inputbuffer(int fd, int *termination_flag) { - return new InputBuffer(termination_flag); -} - -void set_inputbuffer_fd(void *ib, int fd) -{ - static_cast<InputBuffer *>(ib)->setFd(fd); + return new InputBuffer(fd, termination_flag); } void delete_inputbuffer(void *ib) diff --git a/livestatus/src/store_c.h b/livestatus/src/store_c.h index 1e885a2..b165011 100644 --- a/livestatus/src/store_c.h +++ b/livestatus/src/store_c.h @@ -43,8 +43,7 @@ extern "C" void *create_outputbuffer(); void flush_output_buffer(void *ob, int fd, int *termination_flag); void delete_outputbuffer(void *); - void *create_inputbuffer(int *termination_flag); - void set_inputbuffer_fd(void *, int fd); + void *create_inputbuffer(int fd, int *termination_flag); void delete_inputbuffer(void *); void queue_add_connection(int cc); int queue_pop_connection();

8 years, 8 months

#2943 FIX Preventing issues with password completion of browsers on user and profile edit pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 734ad7cadef060ee401f6cf7537f696d0a352ba0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=734ad7cadef060… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 21 13:40:58 2016 +0100 #2943 FIX Preventing issues with password completion of browsers on user and profile edit pages --- .werks/2943 | 9 +++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 7 +++++++ web/htdocs/wato.py | 4 ++++ 4 files changed, 21 insertions(+) diff --git a/.werks/2943 b/.werks/2943 new file mode 100644 index 0000000..f2f4413 --- /dev/null +++ b/.werks/2943 @@ -0,0 +1,9 @@ +Title: Preventing issues with password completion of browsers on user and profile edit pages +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1453380032 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 872a8a1..ae86c67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -267,6 +267,7 @@ * 2825 FIX: Parameter overview page no longer raises an exception in certain scenarios... * 2925 FIX: Editing a notification rule for a missing user selected random other user... * 2905 FIX: Check plugins: Non existant man pages now result in helpful error messages + * 2943 FIX: Preventing issues with password completion of browsers on user and profile edit pages Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c334b13..d0e605a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -257,6 +257,13 @@ class html(GUITester): self.write("</form>\n") self.form_name = None + def prevent_password_auto_completion(self): + # These fields are not really used by the form. They are used to prevent the browsers + # from filling the default password and previous input fields in the form + # with password which are eventually saved in the browsers password store. + self.write("<input type=\"text\" style=\"display:none;\">") + self.write("<input style=\"display:none\" type=\"password\">") + def form_submitted(self, form_name=None): if form_name: return self.var("filled_in") == form_name diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2e9e43a..f5078cf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10243,6 +10243,8 @@ def mode_edit_user(phase): load_notification_scripts() html.begin_form("user", method="POST") + html.prevent_password_auto_completion() + forms.header(_("Identity")) # ID @@ -10281,6 +10283,7 @@ def mode_edit_user(phase): forms.header(_("Security")) forms.section(_("Authentication")) + is_automation = user.get("automation_secret", None) != None html.radiobutton("authmethod", "password", not is_automation, _("Normal user login with password")) @@ -13800,6 +13803,7 @@ def page_user_profile(change_pw=False): return attr in locked_attributes html.begin_form("profile", method="POST") + html.prevent_password_auto_completion() html.write('<div class=wato>') forms.header(_("Personal Settings"))

8 years, 8 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ec850ff82248ca0d3b03eef91bd0e14020d8540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec850ff82248c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 21 13:38:31 2016 +0100 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6dabc8c..891c972 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2943 +2973

8 years, 8 months

#2935 a notification can now match multiple event console rules

by Sebastian Herbord

Module: check_mk Branch: master Commit: 99b88b73a624f11890b4deefc5bfb749480c6472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b88b73a624f1… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jan 21 11:27:50 2016 +0100 #2935 a notification can now match multiple event console rules --- .werks/2935 | 9 +++++++++ ChangeLog | 1 + modules/notify.py | 2 +- web/htdocs/wato.py | 9 ++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/2935 b/.werks/2935 new file mode 100644 index 0000000..1df76ea --- /dev/null +++ b/.werks/2935 @@ -0,0 +1,9 @@ +Title: a notification can now match multiple event console rules +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i4 +Date: 1453371980 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 664549d..872a8a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,6 +270,7 @@ Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... + * 2935 a notification can now match multiple event console rules * 2728 FIX: Removed debug notification script (was not executable)... * 2843 FIX: Hanging notification scripts could prevent all other notifications... * 2815 FIX: Notification scripts: Fixed missing environment variables... diff --git a/modules/notify.py b/modules/notify.py index 55246f5..c134718 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -721,7 +721,7 @@ def rbn_match_event_console(rule, context): if match_ec != False: # Match Event Console rule ID - if "match_rule_id" in match_ec and context["EC_RULE_ID"] != match_ec["match_rule_id"]: + if "match_rule_id" in match_ec and context["EC_RULE_ID"] not in match_ec["match_rule_id"]: return "EC Event has rule ID '%s', but '%s' is required" % ( context["EC_RULE_ID"], match_ec["match_rule_id"]) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d089fca..2e9e43a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7469,7 +7469,14 @@ def notification_rule_match_conditions(): title = _("Match only Event Console alerts"), elements = [ ( "match_rule_id", - ID(title = _("Match event rule"), label = _("Rule ID:"), size=12, allow_empty=False), + Transform( + ListOf( + ID(title = _("Match event rule"), label = _("Rule ID:"), size=12, allow_empty=False), + add_label = _("Add Rule ID"), + title = _("Rule IDs") + ), + forth = lambda x: isinstance(x, list) and x or [x] + ) ), ( "match_priority", Tuple(

8 years, 8 months

Simplify InputBuffer's API.

by Sven Panne

Module: check_mk Branch: master Commit: 17d09fa593bf0ec6271721bc7db5ade272f341cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17d09fa593bf0e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 10:02:37 2016 +0100 Simplify InputBuffer's API. The are two advantages for doing this: * It doesn't keep the textual representation of a query alive longer than needed, something which gets important when the query gets big. * It reduces coupling between classes, now only Store needs to know the InputBuffer. So it is e.g. crystal-clear now that Query simply gets a completed query and doesn't rely on any I/O for this to be done in an interleaved way. The representation of the query input has been changed from a deque to a list. The former is offers constant-time indexing at the price of being more heavy-weight, something which we don't need. --- livestatus/src/InputBuffer.cc | 96 +++++++++++++++++++---------------------- livestatus/src/InputBuffer.h | 10 ++--- livestatus/src/Query.cc | 44 +++++++++---------- livestatus/src/Query.h | 4 +- livestatus/src/Store.cc | 21 +++++---- livestatus/src/Store.h | 4 +- 6 files changed, 86 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=17d09fa593…

8 years, 8 months

Using the C preprocessor is soooo old-skool, let's use C++...

by Sven Panne

Module: check_mk Branch: master Commit: 2cb4f1039bb1dc78df078b09b86f99b9692eb67d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cb4f1039bb1dc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 08:30:35 2016 +0100 Using the C preprocessor is soooo old-skool, let's use C++... --- livestatus/src/InputBuffer.cc | 12 ++++++++---- livestatus/src/InputBuffer.h | 7 ++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index bb88846..724403d 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -33,8 +33,12 @@ using std::string; +const size_t InputBuffer::buffer_size; + +namespace { +const int read_timeout_usec = 200000; +} -#define READ_TIMEOUT_USEC 200000 extern int g_query_timeout_msec; extern int g_idle_timeout_msec; @@ -50,7 +54,7 @@ InputBuffer::InputBuffer(int *termination_flag) { _read_pointer = &_readahead_buffer[0]; // points to data not yet processed _write_pointer = _read_pointer; // points to end of data in buffer - _end_pointer = _read_pointer + IB_BUFFER_SIZE; // points ot end of buffer + _end_pointer = _read_pointer + buffer_size; // points ot end of buffer } void InputBuffer::setFd(int fd) @@ -195,8 +199,8 @@ InputBuffer::Result InputBuffer::readData() if (timeout_reached(&start, g_query_timeout_msec)) return Result::timeout; - tv.tv_sec = READ_TIMEOUT_USEC / 1000000; - tv.tv_usec = READ_TIMEOUT_USEC % 1000000; + tv.tv_sec = read_timeout_usec / 1000000; + tv.tv_usec = read_timeout_usec % 1000000; fd_set fds; FD_ZERO(&fds); diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 7b0e00a..9cbee78 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -26,11 +26,10 @@ #define InputBuffer_h #include "config.h" // IWYU pragma: keep +#include <stddef.h> #include <deque> #include <string> -#define IB_BUFFER_SIZE 65536 - class InputBuffer { public: enum class Result { @@ -51,11 +50,13 @@ public: std::string nextLine(); private: + static const size_t buffer_size = 65536; + int _fd; int *_termination_flag; typedef std::deque<std::string> _requestlines_t; _requestlines_t _requestlines; - char _readahead_buffer[IB_BUFFER_SIZE]; + char _readahead_buffer[buffer_size]; char *_read_pointer; char *_write_pointer; char *_end_pointer;

8 years, 8 months

#2912 FIX mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"

by Lars Michelsen

Module: check_mk Branch: master Commit: 530369c4e70c3b31a8496a0c01cd1d989f5ef026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=530369c4e70c3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 21 10:42:03 2016 +0100 #2912 FIX mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]" The agent plugin did not compute the ORACLE_SID_SHORT correctly in case of databases named like this: DB Instance Name = TESTDBDB Instance RAC Knoten 1: TESTDB_1DB Instance RAC Knoten 2: TESTDB_2 --- .werks/2912 | 14 ++++++++++++++ ChangeLog | 1 + agents/plugins/mk_oracle | 2 +- agents/plugins/mk_oracle.aix | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2912 b/.werks/2912 new file mode 100644 index 0000000..9469c3a --- /dev/null +++ b/.werks/2912 @@ -0,0 +1,14 @@ +Title: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]" +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453369163 +Class: fix + +The agent plugin did not compute the ORACLE_SID_SHORT correctly in case of databases +named like this: + +DB Instance Name = TESTDBDB +Instance RAC Knoten 1: TESTDB_1DB +Instance RAC Knoten 2: TESTDB_2 diff --git a/ChangeLog b/ChangeLog index 5900b4a..664549d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -198,6 +198,7 @@ * 2909 FIX: postfix_mailq: Fixed crash when postfix mailq size can not be read * 2910 FIX: heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured * 2911 FIX: mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes + * 2912 FIX: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 3adfdcb..bb94092 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -711,7 +711,7 @@ function set_oraenv () { ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut -d":" -f2) if [ -z $ORACLE_HOME ] ; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//") + ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//") ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID_SHORT}":" | cut -d":" -f2) fi fi diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index fb1a1f6..a863072 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -697,7 +697,7 @@ function set_oraenv () { ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut -d":" -f2) if [ -z $ORACLE_HOME ] ; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//") + ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//") ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID_SHORT}":" | cut -d":" -f2) fi

8 years, 8 months

Renamed new check solaris_prtdiag to solaris_prtdiag_status and reworked it a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: b23d454c22c2f5e832828eaffacdd900b1646cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b23d454c22c2f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 21 10:32:26 2016 +0100 Renamed new check solaris_prtdiag to solaris_prtdiag_status and reworked it a bit --- .werks/1322 | 2 +- ChangeLog | 2 +- agents/check_mk_agent.solaris | 5 +-- agents/plugins/mk_inventory.solaris | 11 +++++ checkman/solaris_prtdiag | 12 ------ checkman/solaris_prtdiag_status | 14 +++++++ checks/{solaris_prtdiag => solaris_prtdiag_status} | 44 ++++++++------------ 7 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.werks/1322 b/.werks/1322 index 8f78dc6..0a07806 100644 --- a/.werks/1322 +++ b/.werks/1322 @@ -1,4 +1,4 @@ -Title: solaris_prtdiag: New Check for Solaris Hardware State based on prtdiag +Title: solaris_prtdiag_status: New Check for Solaris Hardware State based on prtdiag Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 01483da..5900b4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,7 +83,7 @@ * 2918 agent_jolokia: jolokia can now be monitored using a special agent * 2919 hp_webmgmt_status: New check for health status of various Hewlett-Packard devices... * 2920 hr_cpu: this check can now also supports per-core features... - * 1322 solaris_prtdiag: New Check for Solaris Hardware State based on prtdiag + * 1322 solaris_prtdiag_status: New Check for Solaris Hardware State based on prtdiag * 2921 printer_supply_ricoh: check now tries to handle negative readings properly... * 2922 check_mk_agent.linux: mrpe sections can now be cached... * 2933 openhardwaremonitor, check_mk_agent.windows: added agent support and check for monitoring hardware sensors through OpenHardwareMonitor... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ab79199..56d9c56 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -245,9 +245,8 @@ then fi if type prtdiag >/dev/null 2>&1 - then - echo '<<<solaris_prtdiag:sep(10)>>>' - run_cached prtdiag 300 '/usr/sbin/prtdiag -v;echo "SerialNumber: $(sneep -t serial)";echo "PRTDIAG_OVERALL_STATE : $(echo $?)"' +then + run_cached -s solaris_prtdiag_status 300 '/usr/sbin/prtdiag; echo $?' fi # TCP Connection stats diff --git a/agents/plugins/mk_inventory.solaris b/agents/plugins/mk_inventory.solaris index 222d8f4..eaece65 100755 --- a/agents/plugins/mk_inventory.solaris +++ b/agents/plugins/mk_inventory.solaris @@ -46,6 +46,17 @@ then echo "<<<solaris_uname:sep(61):persist($UNTIL)>>>" uname -X + if type prtdiag > /dev/null; then + echo "<<<solaris_prtdiag:sep(10):persist($UNTIL)>>>" + if type sneep >/dev/null 2>&1; then + SN=$(sneep -t serial) + else + SN=$(smbios -t SMB_TYPE_SYSTEM | grep 'Serial Number:' | awk '{print $3}') + fi + echo "SerialNumber: $SN" + prtdiag -v + fi + if type psrinfo > /dev/null; then echo "<<<solaris_psrinfo:persist($UNTIL)>>>" psrinfo -p -v diff --git a/checkman/solaris_prtdiag b/checkman/solaris_prtdiag deleted file mode 100644 index 8db3ea9..0000000 --- a/checkman/solaris_prtdiag +++ /dev/null @@ -1,12 +0,0 @@ -title: Prtdiag based health check for solaris -agents: solaris -catalog: os/solaris -license: GPL -distribution: check_mk -description: - This check looks for the return value of the prtdiag -v command on solaris based systems. - A return value of 0 is interpreted as OK as documented in the prtdiag man page. Each other return value - results in a CRITICAL state. - CAVEAT: - The extend of the hardware that is considered in the prtdiag command varies from solaris platform to platform (i.e. huge differences between e.g. M series and T series systems.) - Please have a look at the documentation of prtdiag for your system. diff --git a/checkman/solaris_prtdiag_status b/checkman/solaris_prtdiag_status new file mode 100644 index 0000000..cd36ab3 --- /dev/null +++ b/checkman/solaris_prtdiag_status @@ -0,0 +1,14 @@ +title: Prtdiag based health check for solaris +agents: solaris +catalog: os/solaris +license: GPL +distribution: check_mk +description: + This check looks for the return value of the prtdiag command on solaris based systems. + A return value of 0 is interpreted as OK as documented in the prtdiag man page. + Each other return value results in a CRITICAL state. + + CAVEAT: + The extend of the hardware that is considered in the prtdiag command varies from + solaris platform to platform (i.e. huge differences between e.g. M series and T + series systems). Please have a look at the documentation of prtdiag for your system. diff --git a/checks/solaris_prtdiag b/checks/solaris_prtdiag_status similarity index 60% rename from checks/solaris_prtdiag rename to checks/solaris_prtdiag_status index bb73b5a..95b1ca0 100644 --- a/checks/solaris_prtdiag +++ b/checks/solaris_prtdiag_status @@ -25,38 +25,30 @@ # Boston, MA 02110-1301 USA. # Example output from agent: -# . -# . -# . -# SPARC64-VII mode -# -# PRTDIAG_OVERALL_STATE : 0 -# SerialNumber: BDF112567 +# <<<solaris_prtdiag_status>>> +# 0 +def inventory_solaris_prtdiag_status(info): + if info: + return [(None, None)] -def inventory_solaris_prtdiag(info): - for line in info: - # We have to search in the agent section if we find - # that state - if line[0].startswith("PRTDIAG_OVERALL_STATE"): - return [(None, None)] -def check_solaris_prtdiag(_no_item, _no_params, info): - for line in info: - if line[0].startswith("PRTDIAG_OVERALL_STATE"): - # 0 No failures or errors are detected in the system. - # 1 Failures or errors are detected in the system. - state = int(info[-1][0].split(':')[1]) +def check_solaris_prtdiag_status(_no_item, _no_params, info): + if not info: + return - # If we not find the status in the agent output, raise error - if state == 0: - return 0, "No failures or errors are detected in the system" + # 0 No failures or errors are detected in the system. + # 1 Failures or errors are detected in the system. + state = int(info[0][0]) + if int(info[0][0]) == 0: + return 0, "No failures or errors are reported" else: - return 2, "Failures or errors are detected in the system, please check details via prtdiag -v" + return 2, "Failures or errors are reported by the system. " \ + "Please check the output of \"prtdiag -v\" for details." -check_info['solaris_prtdiag'] = { - "inventory_function" : inventory_solaris_prtdiag, - "check_function" : check_solaris_prtdiag, +check_info['solaris_prtdiag_status'] = { + "inventory_function" : inventory_solaris_prtdiag_status, + "check_function" : check_solaris_prtdiag_status, "service_description" : "Hardware Overall State" }

8 years, 8 months

#2911 FIX mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes

by Lars Michelsen

Module: check_mk Branch: master Commit: 9611f9266668743840494c2cb8dae8a2911f1185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9611f926666874… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 20 16:55:40 2016 +0100 #2911 FIX mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes --- .werks/2911 | 9 +++++++++ ChangeLog | 1 + checks/diskstat.include | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/2911 b/.werks/2911 new file mode 100644 index 0000000..69551d4 --- /dev/null +++ b/.werks/2911 @@ -0,0 +1,9 @@ +Title: mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453305291 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 996e4c7..01483da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -197,6 +197,7 @@ * 2908 FIX: oracle_locks: Fixed handling of ORA- errors as sent from e.g. older AIX agents * 2909 FIX: postfix_mailq: Fixed crash when postfix mailq size can not be read * 2910 FIX: heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured + * 2911 FIX: mysql.innodb_io: Fixed crash in case averaging is set to 0 minutes Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/diskstat.include b/checks/diskstat.include index 2ab907b..d6fec9a 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -91,6 +91,9 @@ def inventory_diskstat_generic(info): def check_diskstat_line(this_time, item, params, line, mode='sectors'): average_range = params.get("average") + if average_range == 0: + average_range = None # disable averaging when 0 is set + perfdata = [] infos = [] status = 0

8 years, 8 months

#2910 FIX heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured

by Lars Michelsen

Module: check_mk Branch: master Commit: d9f019ff7a83aa7e4718f2cd4c76d53395cb80f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9f019ff7a83aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 20 16:32:10 2016 +0100 #2910 FIX heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured --- .werks/2910 | 9 +++++++++ ChangeLog | 1 + checks/heartbeat_crm | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2910 b/.werks/2910 new file mode 100644 index 0000000..3129339 --- /dev/null +++ b/.werks/2910 @@ -0,0 +1,9 @@ +Title: heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453303675 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 611e810..996e4c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ * 2907 FIX: chrony: Fixed exception in discovery function when daemon is not running * 2908 FIX: oracle_locks: Fixed handling of ORA- errors as sent from e.g. older AIX agents * 2909 FIX: postfix_mailq: Fixed crash when postfix mailq size can not be read + * 2910 FIX: heartbeat_crm: Fixed crash in case of "number of resources" paramters have been configured Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index b835b8c..5070704 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -168,7 +168,7 @@ def check_heartbeat_crm(item, params, info): if numResources == params['num_resources']: output += 'Resources: %d, ' % numResources else: - output += 'Resources: %d (Expected %d (!!)), ' % (numResources, params['num_ressources']) + output += 'Resources: %d (Expected %d (!!)), ' % (numResources, params['num_resources']) status = 2 return (status, output.rstrip(', '))

8 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016