Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

Graph collections: fix bogus complain about duplicate ID when cloning collections

by Mathias Kettner

Module: check_mk Branch: master Commit: 02903a59d660ecb00ee3e5669f4b94ab1fde87ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02903a59d660ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 21 15:31:01 2016 +0100 Graph collections: fix bogus complain about duplicate ID when cloning collections --- web/htdocs/pagetypes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index a05d451..d057041 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -871,12 +871,13 @@ class Overridable: def validate(page_dict): owner_user_id = html.var("owner", config.user_id) + page_name = page_dict["name"] if owner_user_id == config.user_id: page = self.find_my_page(page_name) else: page = self.find_foreign_page(owner_user_id, page_name) if page: - raise MKUserError("_p_name", _("You already have an with the ID <b>%s</b>") % page_dict["name"]) + raise MKUserError("_p_name", _("You already have an element with the ID <b>%s</b>") % page_dict["name"]) new_page_dict = forms.edit_valuespec(vs, page_dict, validate=validate) if new_page_dict != None:

8 years, 9 months

Small optical change when rendering page type tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 0bdd40660fc728adec47e0913c3d58fae2cf3a62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bdd40660fc728… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 21 15:29:33 2016 +0100 Small optical change when rendering page type tables --- web/htdocs/pagetypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 3a52777..3c741c8 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -773,7 +773,7 @@ class Overridable: ### render_custom_buttons(visual_name, visual) # Internal ID of instance (we call that 'name') - table.cell(_('ID'), instance.name()) + table.cell(_('ID'), instance.name(), css="narrow") # Title table.cell(_('Title'))

8 years, 9 months

Table of graph collections: make titles of collections clickable

by Mathias Kettner

Module: check_mk Branch: master Commit: e8349d187808ef2d937b61a35a9cf978ed67ba47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8349d187808ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 21 15:30:11 2016 +0100 Table of graph collections: make titles of collections clickable --- web/htdocs/pagetypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 3c741c8..a05d451 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -778,7 +778,7 @@ class Overridable: # Title table.cell(_('Title')) title = _u(instance.title()) - if isinstance(self, PageRenderer) and not instance.is_hidden(): + if isinstance(instance, PageRenderer) and not instance.is_hidden(): html.write("<a href=\"%s.py?%s=%s\">%s</a>" % (self.type_name(), self.ident_attr(), instance.name(), html.attrencode(instance.title()))) else:

8 years, 9 months

Refactoring: Improved naming.

by Sven Panne

Module: check_mk Branch: master Commit: e3bb09bb6384ebbc50f486fb9b0b40459f258c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3bb09bb6384eb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 15:13:15 2016 +0100 Refactoring: Improved naming. --- livestatus/src/InputBuffer.cc | 54 ++++++++++++++++++++--------------------- livestatus/src/InputBuffer.h | 6 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index c0c8ec1..a79bb95 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -70,9 +70,9 @@ pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) InputBuffer::InputBuffer(int fd, int *termination_flag) : _fd(fd), _termination_flag(termination_flag) { - _read_pointer = 0; // points to data not yet processed - _write_pointer = 0; // points to end of data in buffer - _end_pointer = buffer_size; // points ot end of buffer + _read_index = 0; // points to data not yet processed + _write_index = 0; // points to end of data in buffer + _end_index = buffer_size; // points ot end of buffer } // read in data enough for one complete request (and maybe more). @@ -90,28 +90,28 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() // queries. bool query_started = false; - // _read_pointer points to the place in the buffer, where the - // next valid data begins. This data ends at _write_pointer. + // _read_index points to the place in the buffer, where the + // next valid data begins. This data ends at _write_index. // That data might have been read while reading the previous // request. // r is used to find the end of the line - size_t r = _read_pointer; + size_t r = _read_index; while (true) { // Try to find end of the current line in buffer - while (r < _write_pointer && _readahead_buffer[r] != '\n') + while (r < _write_index && _readahead_buffer[r] != '\n') r++; // now r is at end of data or at '\n' // If we cannot find the end of line in the data // already read, then we need to read new data from // the client. - if (r == _write_pointer) + if (r == _write_index) { // Is there still space left in the buffer => read in // further data into the buffer. - if (_write_pointer < _end_pointer) + if (_write_index < _end_index) { Result rd = readData(); // tries to read in further data into buffer if (rd == Result::timeout) { @@ -130,7 +130,7 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() // read an incomplete line. If the last thing we read was // a linefeed, then we consider the current request to // be valid, if it is not empty. - else if (rd == Result::eof && r == _read_pointer /* currently at beginning of a line */) + else if (rd == Result::eof && r == _read_index /* currently at beginning of a line */) { if (request_lines.empty()) { return failure(Result::eof); // empty request -> no request @@ -139,7 +139,7 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() // socket has been closed but request is complete return make_pair(request_lines, Result::request_read); // the current state is now: - // _read_pointer == r == _write_pointer => buffer is empty + // _read_index == r == _write_index => buffer is empty // that way, if the main program tries to read the // next request, it will get an IB_UNEXPECTED_EOF } @@ -155,15 +155,15 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() } // OK. So no space is left in the buffer. But maybe at the // *beginning* of the buffer is space left again. This is - // very probable if _write_pointer == _end_pointer. Most + // very probable if _write_index == _end_index. Most // of the buffer's content is already processed. So we simply // shift the yet unprocessed data to the very left of the buffer. - else if (_read_pointer > 0) { - int shift_by = _read_pointer; // distance to beginning of buffer - int size = _write_pointer - _read_pointer; // amount of data to shift - memmove(&_readahead_buffer[0], &_readahead_buffer[_read_pointer], size); - _read_pointer = 0; // unread data is now at the beginning - _write_pointer -= shift_by; // write pointer shifted to the left + else if (_read_index > 0) { + int shift_by = _read_index; // distance to beginning of buffer + int size = _write_index - _read_index; // amount of data to shift + memmove(&_readahead_buffer[0], &_readahead_buffer[_read_index], size); + _read_index = 0; // unread data is now at the beginning + _write_index -= shift_by; // write pointer shifted to the left r -= shift_by; // current scan position also shift left // continue -> still no data in buffer, but it will // be read, as now is space @@ -176,8 +176,8 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() } else // end of line found { - if (_read_pointer == r) { // empty line found => end of request - _read_pointer = r + 1; + if (_read_index == r) { // empty line found => end of request + _read_index = r + 1; // Was ist, wenn noch keine korrekte Zeile gelesen wurde? if (request_lines.empty()) { return failure(Result::empty_request); @@ -186,16 +186,16 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() return make_pair(request_lines, Result::request_read); } else { // non-empty line: belongs to current request - int length = r - _read_pointer; - for (size_t end = r; end > _read_pointer && isspace(_readahead_buffer[--end]);) + int length = r - _read_index; + for (size_t end = r; end > _read_index && isspace(_readahead_buffer[--end]);) length--; if (length > 0) - request_lines.push_back(string(&_readahead_buffer[_read_pointer], length)); + request_lines.push_back(string(&_readahead_buffer[_read_index], length)); else logger(LG_INFO, "Warning ignoring line containing only whitespace"); query_started = true; - _read_pointer = r + 1; - r = _read_pointer; + _read_index = r + 1; + r = _read_index; } } } @@ -224,7 +224,7 @@ InputBuffer::Result InputBuffer::readData() int retval = select(_fd + 1, &fds, NULL, NULL, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { - ssize_t r = read(_fd, &_readahead_buffer[_write_pointer], _end_pointer - _write_pointer); + ssize_t r = read(_fd, &_readahead_buffer[_write_index], _end_index - _write_index); if (r < 0) { return Result::eof; } @@ -232,7 +232,7 @@ InputBuffer::Result InputBuffer::readData() return Result::eof; } else { - _write_pointer += r; + _write_index += r; return Result::data_read; } } diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 5457e2b..9a5ffe7 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -53,9 +53,9 @@ private: int _fd; int *_termination_flag; char _readahead_buffer[buffer_size]; - size_t _read_pointer; - size_t _write_pointer; - size_t _end_pointer; + size_t _read_index; + size_t _write_index; + size_t _end_index; Result readData(); };

8 years, 9 months

Some const-correctness fixes.

by Sven Panne

Module: check_mk Branch: master Commit: f013adebbdb67369b7f78adbb54da04a45b25821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f013adebbdb673… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 15:15:04 2016 +0100 Some const-correctness fixes. --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/InputBuffer.h | 4 ++-- livestatus/src/store_c.cc | 2 +- livestatus/src/store_c.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index a79bb95..0290641 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -67,7 +67,7 @@ pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) // pointers, offsets, etc. with vector. // cppcheck-suppress uninitMemberVar -InputBuffer::InputBuffer(int fd, int *termination_flag) +InputBuffer::InputBuffer(int fd, const int *termination_flag) : _fd(fd), _termination_flag(termination_flag) { _read_index = 0; // points to data not yet processed diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 9a5ffe7..5c0256f 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -44,14 +44,14 @@ public: timeout }; - InputBuffer(int fd, int *termination_flag); + InputBuffer(int fd, const int *termination_flag); std::pair<std::list<std::string>, Result> readRequest(); private: static const size_t buffer_size = 65536; int _fd; - int *_termination_flag; + const int *_termination_flag; char _readahead_buffer[buffer_size]; size_t _read_index; size_t _write_index; diff --git a/livestatus/src/store_c.cc b/livestatus/src/store_c.cc index d952696..7ded0b1 100644 --- a/livestatus/src/store_c.cc +++ b/livestatus/src/store_c.cc @@ -103,7 +103,7 @@ void delete_outputbuffer(void *ob) delete static_cast<OutputBuffer *>(ob); } -void *create_inputbuffer(int fd, int *termination_flag) +void *create_inputbuffer(int fd, const int *termination_flag) { return new InputBuffer(fd, termination_flag); } diff --git a/livestatus/src/store_c.h b/livestatus/src/store_c.h index b165011..bfd231e 100644 --- a/livestatus/src/store_c.h +++ b/livestatus/src/store_c.h @@ -43,7 +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 fd, int *termination_flag); + void *create_inputbuffer(int fd, const int *termination_flag); void delete_inputbuffer(void *); void queue_add_connection(int cc); int queue_pop_connection();

8 years, 9 months

Refactoring only: Use indices instead of pointers.

by Sven Panne

Module: check_mk Branch: master Commit: 38394981ae2a85d1e1f2ae68dd18191e5e4e8cab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38394981ae2a85… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 21 15:10:20 2016 +0100 Refactoring only: Use indices instead of pointers. This will enable us to use a resizable vector more easily. --- livestatus/src/InputBuffer.cc | 25 ++++++++++++------------- livestatus/src/InputBuffer.h | 6 +++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index 6bababb..c0c8ec1 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -70,9 +70,9 @@ pair<list<string>, InputBuffer::Result> failure(InputBuffer::Result r) 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 + _read_pointer = 0; // points to data not yet processed + _write_pointer = 0; // points to end of data in buffer + _end_pointer = buffer_size; // points ot end of buffer } // read in data enough for one complete request (and maybe more). @@ -96,12 +96,12 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() // request. // r is used to find the end of the line - char *r = _read_pointer; + size_t r = _read_pointer; while (true) { // Try to find end of the current line in buffer - while (r < _write_pointer && r[0] != '\n') + while (r < _write_pointer && _readahead_buffer[r] != '\n') r++; // now r is at end of data or at '\n' // If we cannot find the end of line in the data @@ -158,11 +158,11 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() // very probable if _write_pointer == _end_pointer. Most // of the buffer's content is already processed. So we simply // shift the yet unprocessed data to the very left of the buffer. - else if (_read_pointer > _readahead_buffer) { - int shift_by = _read_pointer - _readahead_buffer; // distance to beginning of buffer + else if (_read_pointer > 0) { + int shift_by = _read_pointer; // distance to beginning of buffer int size = _write_pointer - _read_pointer; // amount of data to shift - memmove(_readahead_buffer, _read_pointer, size); - _read_pointer = _readahead_buffer; // unread data is now at the beginning + memmove(&_readahead_buffer[0], &_readahead_buffer[_read_pointer], size); + _read_pointer = 0; // unread data is now at the beginning _write_pointer -= shift_by; // write pointer shifted to the left r -= shift_by; // current scan position also shift left // continue -> still no data in buffer, but it will @@ -186,12 +186,11 @@ pair<list<string>, InputBuffer::Result> InputBuffer::readRequest() return make_pair(request_lines, Result::request_read); } else { // non-empty line: belongs to current request - // storeRequestLine(_read_pointer, r - _read_pointer); int length = r - _read_pointer; - for (char *end = r; end > _read_pointer && isspace(*--end);) + for (size_t end = r; end > _read_pointer && isspace(_readahead_buffer[--end]);) length--; if (length > 0) - request_lines.push_back(string(_read_pointer, length)); + request_lines.push_back(string(&_readahead_buffer[_read_pointer], length)); else logger(LG_INFO, "Warning ignoring line containing only whitespace"); query_started = true; @@ -225,7 +224,7 @@ InputBuffer::Result InputBuffer::readData() int retval = select(_fd + 1, &fds, NULL, NULL, &tv); if (retval > 0 && FD_ISSET(_fd, &fds)) { - ssize_t r = read(_fd, _write_pointer, _end_pointer - _write_pointer); + ssize_t r = read(_fd, &_readahead_buffer[_write_pointer], _end_pointer - _write_pointer); if (r < 0) { return Result::eof; } diff --git a/livestatus/src/InputBuffer.h b/livestatus/src/InputBuffer.h index 2e7626f..5457e2b 100644 --- a/livestatus/src/InputBuffer.h +++ b/livestatus/src/InputBuffer.h @@ -53,9 +53,9 @@ private: int _fd; int *_termination_flag; char _readahead_buffer[buffer_size]; - char *_read_pointer; - char *_write_pointer; - char *_end_pointer; + size_t _read_pointer; + size_t _write_pointer; + size_t _end_pointer; Result readData(); };

8 years, 9 months

#2944 FIX Fixed exception during config activation having clusters with unresolvable node IP addresses

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c62b03a28fadb41c01858e2754b715d68bc0e70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c62b03a28fadb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 21 14:38:03 2016 +0100 #2944 FIX Fixed exception during config activation having clusters with unresolvable node IP addresses --- .werks/2944 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 24 +++++++++++++++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.werks/2944 b/.werks/2944 new file mode 100644 index 0000000..af4723d --- /dev/null +++ b/.werks/2944 @@ -0,0 +1,9 @@ +Title: Fixed exception during config activation having clusters with unresolvable node IP addresses +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1453383432 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6dd77ed..7b675ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 2848 FIX: Fixed cleanup of old autocheck files of cluster hosts... * 2894 FIX: Fixed broken cluster checks when using Nagios core... * 2926 FIX: Fix exception in WATO when a check man page has not catalog entry + * 2944 FIX: Fixed exception during config activation having clusters with unresolvable node IP addresses Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index e453a55..5a1d584 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2020,7 +2020,11 @@ def lookup_ipv4_address(hostname): def lookup_ipv6_address(hostname): return lookup_ip_address(hostname, 6) -# Determine the IP address of a host +# Determine the IP address of a host. It returns either an IP address, +# or raise an exception when a hostname can not be resolved on the first +# try to resolve a hostname. On later tries to resolve a hostname it +# returns None instead of raising an exception. +# FIXME: This different handling is bad. Clean this up! def lookup_ip_address(hostname, family=None): if family == None: # choose primary family family = is_ipv6_primary(hostname) and 6 or 4 @@ -3280,11 +3284,21 @@ def get_cluster_attributes(hostname, nodes): attrs = {} node_ips_4 = [] if is_ipv4_host(hostname): - node_ips_4 = [ ip_address_of(h, 4) for h in nodes ] + for h in nodes: + addr = ip_address_of(h, 4) + if addr != None: + node_ips_4.append(addr) + else: + node_ips_4.append(fallback_ip_for(hostname, 4)) node_ips_6 = [] if is_ipv6_host(hostname): - node_ips_6 = [ ip_address_of(h, 6) for h in nodes ] + for h in nodes: + addr = ip_address_of(h, 6) + if addr != None: + node_ips_6.append(addr) + else: + node_ips_6.append(fallback_ip_for(hostname, 6)) if is_ipv6_primary(hostname): node_ips = node_ips_6 @@ -3307,8 +3321,8 @@ def ip_address_of(hostname, family=None): g_failed_ip_lookups.append(hostname) addr = fallback_ip_for(hostname, family) if not ignore_ip_lookup_failures: - configuration_warning("Cannot lookup IP address of '%s': %s, using " - "address %s instead" % (hostname, e, addr)) + configuration_warning("Cannot lookup IP address of '%s' (%s). Using " + "address %s instead." % (hostname, e, addr)) return addr

8 years, 9 months

merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 67c90d81ee34114db1b12d2e0867bbd146a90716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c90d81ee3411… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 21 14:11:56 2016 +0100 merge conflict --- checks/win_printers | 36 +++++++++++----- web/plugins/wato/check_parameters.py | 78 +++++++++++++++++++++++++++++----- 2 files changed, 93 insertions(+), 21 deletions(-) diff --git a/checks/win_printers b/checks/win_printers index 80000f1..28280fa 100644 --- a/checks/win_printers +++ b/checks/win_printers @@ -31,10 +31,16 @@ # WH1_BC_O3_UPS 0 3 0 +factory_settings['win_printer_default_levels'] = { + "levels" : (None, None), + "warn_states" : [ 8, 11 ], + "crit_states" : [ 9, 10 ], +} + def inventory_win_printers(info): for line in info: if line[-1] != '9': # Do not discovery offline printers - yield " ".join(line[:-3]), None + yield " ".join(line[:-3]), {} def check_win_printers(item, params, info): status_map = { @@ -61,10 +67,17 @@ def check_win_printers(item, params, info): 11 : "Output Bin Full" } - if params == None: - warn, crit = None, None + if type(params) != dict: + # Legacy params: + if params == None: + warn, crit = None, None + else: + warn, crit = params + params = {} + params['crit_states'] = [9,10] + params['warn_states'] = [8,11] else: - warn, crit = params + warn, crit = params['levels'] for line in info: name = " ".join(line[:-3]) @@ -73,10 +86,10 @@ def check_win_printers(item, params, info): current_jobs, status, error = map(int, line[-3:]) error_text = "" - if error in [ 9, 10 ]: + if error in params['crit_states']: state = 2 error_text = "Error State: %s(!!)" % error_map[error] - elif error in [ 8, 11 ]: + elif error in params['warn_states']: state = 1 error_text = "Error State: %s(!)" % error_map[error] @@ -94,10 +107,11 @@ def check_win_printers(item, params, info): return 3, "Printer not found in agent output" check_info["win_printers"] = { - "check_function" : check_win_printers, - "group" : "windows_printer_queues", - "inventory_function" : inventory_win_printers, - "service_description" : "Printer %s", - "has_perfdata" : False, + "check_function" : check_win_printers, + "group" : "windows_printer_queues", + "inventory_function" : inventory_win_printers, + "service_description" : "Printer %s", + "has_perfdata" : False, + "default_level_variable" : "win_printer_default_levels", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 337f235..cf63990 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4505,23 +4505,81 @@ register_check_parameters( ), match_type = "first", ) + +def windows_printer_queues_forth(old): + default = { + "levels" : (None, None), + "warn_states" : [ 8, 11 ], + "crit_states" : [ 9, 10 ], + } + if type(old) == tuple: + default['levels'] = old + if type(old) == dict: + return old + return default + register_check_parameters( subgroup_printing, "windows_printer_queues", _("Number of open jobs of a printer on windows" ), Transform( - Optional( - Tuple( - help = _("This rule is applied to the number of print jobs " - "currently waiting in windows printer queue."), - elements = [ - Integer(title = _("Warning at"), unit = _("jobs"), default_value = 40), - Integer(title = _("Critical at"), unit = _("jobs"), default_value = 60), + Dictionary( + title = _("Windows Printer Configuration"), + elements = [ + ( "levels", + Tuple( + title = _("Levels for the number of print jobs"), + help = _("This rule is applied to the number of print jobs " + "currently waiting in windows printer queue."), + elements = [ + Integer(title = _("Warning at"), unit = _("jobs"), default_value = 40), + Integer(title = _("Critical at"), unit = _("jobs"), default_value = 60), + ] + ), + ), + ("crit_states", + ListChoice( + title = _("States who should lead to critical"), + choices = [ + ( 0, "Unkown"), + ( 1, "Other"), + ( 2, "No Error"), + ( 3, "Low Paper"), + ( 4, "No Paper"), + ( 5, "Low Toner"), + ( 6, "No Toner"), + ( 7, "Door Open"), + ( 8, "Jammed"), + ( 9, "Offline"), + ( 10, "Service Requested"), + ( 11, "Output Bin Full"), + ], + default_value = [9, 10], + ) + ), + ("warn_states", + ListChoice( + title = _("States who should lead to warning"), + choices = [ + ( 0, "Unkown"), + ( 1, "Other"), + ( 2, "No Error"), + ( 3, "Low Paper"), + ( 4, "No Paper"), + ( 5, "Low Toner"), + ( 6, "No Toner"), + ( 7, "Door Open"), + ( 8, "Jammed"), + ( 9, "Offline"), + ( 10, "Service Requested"), + ( 11, "Output Bin Full"), + ], + default_value = [8, 11], + ) + ), ] - ), - label=_('Enable thresholds on the number of jobs'), ), - forth = lambda old: old != (None, None) and old or None, + forth = windows_printer_queues_forth, ), TextAscii( title = _("Printer Name"),

8 years, 9 months

#1323 win_printers: Warning and Critical levels can now be set

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6120b59d90353139320c091c13a8a5da53f1a176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6120b59d903531… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 21 14:15:37 2016 +0100 #1323 win_printers: Warning and Critical levels can now be set The change can be found in commit #67c90d81ee34114db1b12d2e0867bbd146a90716 --- .werks/1323 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/1323 b/.werks/1323 new file mode 100644 index 0000000..9aa0051 --- /dev/null +++ b/.werks/1323 @@ -0,0 +1,10 @@ +Title: win_printers: Warning and Critical levels can now be set +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453382032 +Class: feature + +The change can be found in commit #67c90d81ee34114db1b12d2e0867bbd146a90716 + diff --git a/ChangeLog b/ChangeLog index de09450..1e1852d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 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 + * 1323 win_printers: Warning and Critical levels can now be set... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list...

8 years, 9 months

Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2ca5b63a217902ca555f3915ad2a052926222728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ca5b63a217902… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 21 14:16:25 2016 +0100 Merge conflict ---

8 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
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