Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64209 discussions

Check_MK Git: check_mk: WATO: honor permissions on inventory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48458a35cfa1eae6554d0ec918d7b90e34312e4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48458a35cfa1ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 16:50:15 2012 +0100 WATO: honor permissions on inventory --- .bugs/622 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.bugs/622 b/.bugs/622 index b0dbafe..314c1c2 100644 --- a/.bugs/622 +++ b/.bugs/622 @@ -1,9 +1,12 @@ Title: Inventory prüft die Rechte nicht ordentlich Component: wato -State: open +Class: bug +State: done Date: 2012-01-18 10:31:24 Targetversion: 1.2.0 -Class: bug Ich kann sowohl via Bulk Inventory, als auch über das normale Inventory das Inventory eines Hosts anstoßen, auch wenn ich keine Rechte habe. + +2012-02-21 16:50:01: changed state open -> done +Das sollte jetzt beides funktionieren. diff --git a/ChangeLog b/ChangeLog index 72dd885..08d36ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * FIX: honor write permissions on folder in "bulk delete" * FIX: honor permissions for "bulk cleanup" and "bulk edit" * FIX: honor write permissions and source folder when moving hosts + * FIX: honor permissions on hosts also on bulk inventory Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 951ccbb..b50e56e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1915,6 +1915,7 @@ def mode_inventory(phase, firsttime): elif phase == "action": config.need_permission("wato.services") + check_host_permissions(hostname) if html.check_transaction(): cache_options = not html.var("_scan") and [ '--cache' ] or [] table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) @@ -2347,7 +2348,14 @@ def mode_bulk_inventory(phase): # interactive progress is *not* done in action phase. It # renders the page content itself. + hostnames = get_hostnames_from_checkboxes() + + # check all permissions before beginning inventory + config.need_permission("wato.services") + for hostname in hostnames: + check_host_permissions(hostname) + items = [ "%s|%s" % (g_folder[".path"], hostname) for hostname in hostnames ]

12 years, 7 months

Check_MK Git: check_mk: WATO: fix permissions when moving folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0050f1f0de49923188f3dccca155aaba39e2606 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0050f1f0de499… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 16:30:41 2012 +0100 WATO: fix permissions when moving folders --- .bugs/621 | 8 ++++++-- ChangeLog | 1 + web/htdocs/wato.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/621 b/.bugs/621 index 6ebd595..d3215bc 100644 --- a/.bugs/621 +++ b/.bugs/621 @@ -1,8 +1,12 @@ Title: Bulk moveto berücksichtigt die Nutzer Rechte nicht Component: wato -State: open +Class: bug +State: done Date: 2012-01-18 10:30:57 Targetversion: 1.2.0 -Class: bug Ich kann Hosts aus anderen Foldern in meine Folder verschieben + +2012-02-21 16:30:09: changed state open -> done +Ist jetzt repariert. War auch beim normalen verschieben. Jetzt +braucht man Schreibrechte auf Quelle und Ziel. diff --git a/ChangeLog b/ChangeLog index d9dddd8..72dd885 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * FIX: honor site disabling in replication module * FIX: honor write permissions on folder in "bulk delete" * FIX: honor permissions for "bulk cleanup" and "bulk edit" + * FIX: honor write permissions and source folder when moving hosts Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb30ba3..951ccbb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1343,6 +1343,7 @@ def move_hosts_to(hostnames, path): return target_folder = g_folders[path] + check_folder_permissions(g_folder, "write") check_folder_permissions(target_folder, "write") if target_folder == g_folder:

12 years, 7 months

Check_MK Git: check_mk: FIX: honor permissions for "bulk cleanup" and " bulk edit"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7936c43a12d711fdeb52f3ebe2da38a5e168374e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7936c43a12d711… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 16:24:10 2012 +0100 FIX: honor permissions for "bulk cleanup" and "bulk edit" --- .bugs/620 | 8 ++++++-- ChangeLog | 1 + web/htdocs/wato.py | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.bugs/620 b/.bugs/620 index 4635053..849a473 100644 --- a/.bugs/620 +++ b/.bugs/620 @@ -1,8 +1,12 @@ Title: Bulk edit berücksichtigt die Nutzer Rechte nicht Component: wato -State: open +Class: bug +State: done Date: 2012-01-18 10:30:06 Targetversion: 1.2.0 -Class: bug Ich kann Hosts auf die ich keine Rechte habe über die Bulk Edit Funktion bearbeiten. + +2012-02-21 16:23:38: changed state open -> done +Bulk edit und Bulk cleanup prüft jetzt die Rechte +korrekt. diff --git a/ChangeLog b/ChangeLog index 3ef1d85..d9dddd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ users not created via WATO will not be lost. * FIX: honor site disabling in replication module * FIX: honor write permissions on folder in "bulk delete" + * FIX: honor permissions for "bulk cleanup" and "bulk edit" Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d8617f5..cb30ba3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2412,8 +2412,18 @@ def mode_bulk_edit(phase): elif phase == "action": if html.check_transaction(): + config.need_permission("wato.edit_hosts") changed_attributes = collect_attributes() + if "contactgroups" in changed_attributes: + if True != check_folder_permissions(g_folder, "write", False): + raise MKAuthException(_("Sorry. In order to change the permissions of a host you need write " + "access to the folder it is contained in.")) + hostnames = get_hostnames_from_checkboxes() + # Check all permissions for doing any edit + for hostname in hostnames: + check_host_permissions(hostname) + for hostname in hostnames: host = g_folder[".hosts"][hostname] mark_affected_sites_dirty(g_folder, hostname) @@ -2468,8 +2478,18 @@ def mode_bulk_cleanup(phase): elif phase == "action": if html.check_transaction(): + config.need_permission("wato.edit_hosts") to_clean = bulk_collect_cleaned_attributes() + if "contactgroups" in to_clean: + if True != check_folder_permissions(g_folder, "write", False): + raise MKAuthException(_("Sorry. In order to change the permissions of a host you need write " + "access to the folder it is contained in.")) hostnames = get_hostnames_from_checkboxes() + + # Check all permissions for doing any edit + for hostname in hostnames: + check_host_permissions(hostname) + for hostname in hostnames: mark_affected_sites_dirty(g_folder, hostname) host = g_folder[".hosts"][hostname]

12 years, 7 months

Check_MK Git: check_mk: FIX: honor write permissions on folder in " bulk delete"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c15b19e259894ed028d751dca7b41fad99fe976a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c15b19e259894e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 16:11:43 2012 +0100 FIX: honor write permissions on folder in "bulk delete" --- .bugs/619 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 14 +++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.bugs/619 b/.bugs/619 index 5cfca54..50dd1eb 100644 --- a/.bugs/619 +++ b/.bugs/619 @@ -1,8 +1,11 @@ Title: Bulk löschen berücksichtigt die Nutzer Rechte nicht Component: wato -State: open +Class: bug +State: done Date: 2012-01-18 10:28:38 Targetversion: 1.2.0 -Class: bug Ich kann als Nutzer ohne Rechte auf die Hosts in einem Folder alle Hosts löschen. + +2012-02-21 16:11:13: changed state open -> done +Ist erledigt, wird nun geprüft. diff --git a/ChangeLog b/ChangeLog index b79678a..3ef1d85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: Do load *all* users from htpasswd, so passwords from users not created via WATO will not be lost. * FIX: honor site disabling in replication module + * FIX: honor write permissions on folder in "bulk delete" Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5d3b2a2..d8617f5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -848,6 +848,7 @@ def mode_folder(phase): # Deletion if html.var("_bulk_delete"): config.need_permission("wato.manage_hosts") + check_folder_permissions(g_folder, "write") return delete_hosts_after_confirm(selected_hosts) # Move @@ -974,9 +975,16 @@ def check_folder_permissions(folder, how, exception=True, user = None): if c in cgs: return True - reason = _("Sorry, you have no permission on the folder '%s'. The folder's contact " - "groups are %s, your contact groups are %s.") % \ - (folder["title"], ", ".join(cgs), ", ".join(user_cgs)) + reason = _("Sorry, you have no permission on the folder '%s'. " % folder["title"]) + if not cgs: + reason += _("The folder has no contact groups assigned to.") + else: + reason += _("The folder's contact groups are %s. " % ", ".join(cgs)) + if user_cgs: + reason += _("Your contact groups are %s.") % ", ".join(user_cgs) + else: + reason += _("But you are not a member of any contact group.") + if exception: raise MKAuthException(reason) else:

12 years, 7 months

Check_MK Git: check_mk: Livestatus-API: do reconnect until timeout is used up

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1618847f4db6cdbe2f8eca8ee33551f8cb60cf9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1618847f4db6cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 15:57:40 2012 +0100 Livestatus-API: do reconnect until timeout is used up --- .bugs/608 | 7 +++- .bugs/647 | 7 +++- ChangeLog | 3 ++ web/htdocs/htmllib.py | 2 +- web/htdocs/index.py | 1 + web/htdocs/livestatus.py | 62 +++++++++++++++++++++++++++++++-------------- web/htdocs/wato.py | 7 +++-- 7 files changed, 62 insertions(+), 27 deletions(-) diff --git a/.bugs/608 b/.bugs/608 index ebd2214..483c818 100644 --- a/.bugs/608 +++ b/.bugs/608 @@ -1,9 +1,9 @@ Title: Sidebar Refresh bei Nagios Reload Component: multisite -State: open +Class: nastiness +State: done Date: 2012-01-27 16:09:02 Targetversion: 1.2.0 -Class: nastiness Wird über Wato ein Nagios Reload anstelle des Restart ausgeführt, braucht das Neuladen des Livestatus Modules zu lange und die Sidebar läuf in einen @@ -12,3 +12,6 @@ Livestatus Timeout und muss neu geladen werden. Mathias: Ich denke wir lösen das Problem in der Livestatus-API für Python. Wenn der Connect nicht klappt, probieren wir es eine Zeitlang. Dafür gibt es ja eine Timeout-Einstellung. + +2012-02-21 15:57:25: changed state open -> done +Das ist jetzt in livestatus.py umgesetzt. diff --git a/.bugs/647 b/.bugs/647 index 681efb7..6d0a5a4 100644 --- a/.bugs/647 +++ b/.bugs/647 @@ -1,11 +1,14 @@ Title: Sidebar Reload macht während Nagios Restart Probleme Component: multisite -State: open +Class: nastiness +State: done Date: 2012-02-06 12:46:07 Targetversion: future -Class: nastiness Man könnte so lange versuchen die Livestatus Verbindung aufzubauen bis das Connect Timeout erreicht ist. Momentan wird es nur einmal versucht. Dann wird mit "Connection reset by peer" abgebrochen. + +2012-02-21 15:56:50: changed state open -> done +Now within the timeout a reconnect is tried. diff --git a/ChangeLog b/ChangeLog index d2be19b..b79678a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,9 @@ * FIX: Fixed preview table styling in view editor * FIX: Multisite authed users without permission to multisite are automatically logged out after showing the error message + * Retry livestatus connect until timeout is used up. This avoids + error messages when the core is being restarted + BI: * New column (painter) for simplistic box display of tree. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9d4ff21..807f7f0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -978,7 +978,7 @@ class html: return (omd_mode, omd_site) def begin_foldable_container(self, treename, id, isopen, title, indent = True, first = False): - # try to get persistet state of tree + # try to get persisted state of tree tree_state = weblib.get_tree_states(treename) if id in tree_state: diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 4c13de4..6cffb43 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -139,6 +139,7 @@ def connect_to_livestatus(html): else: html.live = livestatus.SingleSiteConnection("unix:" + defaults.livestatus_unix_socket) + html.live.set_timeout(10) # default timeout is 10 seconds html.site_status = { '': { "state" : "dead", "site" : config.site('') } } v1, v2, ps = html.live.query_row("GET status\nColumns: livestatus_version program_version program_start") html.site_status[''].update({ "state" : "online", "livestatus_version": v1, "program_version" : v2, "program_start" : ps }) diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index eef1be3..c5211ce 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -194,7 +194,7 @@ class BaseConnection: parts = url.split(":") if parts[0] == "unix": if len(parts) != 2: - raise MKLivestatusConfigError("Invalid livestatus unix url: %s. " + raise MKLivestatusConfigError("Invalid livestatus unix URL: %s. " "Correct example is 'unix:/var/run/nagios/rw/live'" % url) self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) target = parts[1] @@ -204,21 +204,37 @@ class BaseConnection: host = parts[1] port = int(parts[2]) except: - raise MKLivestatusConfigError("Invalid livestatus tcp url '%s'. " + raise MKLivestatusConfigError("Invalid livestatus tcp URL '%s'. " "Correct example is 'tcp:somehost:6557'" % url) self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) target = (host, port) else: - raise MKLivestatusConfigError("Invalid livestatus url '%s'. " + raise MKLivestatusConfigError("Invalid livestatus URL '%s'. " "Must begin with 'tcp:' or 'unix:'" % url) - try: - if self.timeout: - self.socket.settimeout(float(self.timeout)) - self.socket.connect(target) - except Exception, e: - self.socket = None - raise MKLivestatusSocketError("Cannot connect to '%s': %s" % (self.socketurl, e)) + # If a timeout is set, then we retry after a failure with mild + # a binary backoff. + if self.timeout: + before = time.time() + sleep_interval = 0.1 + + while True: + try: + if self.timeout: + self.socket.settimeout(float(sleep_interval)) + self.socket.connect(target) + break + except Exception, e: + if self.timeout: + time_left = self.timeout - (time.time() - before) + # only try again, if there is substantial time left + if time_left > sleep_interval: + time.sleep(sleep_interval) + sleep_interval *= 1.5 + continue + + self.socket = None + raise MKLivestatusSocketError("Cannot connect to '%s': %s" % (self.socketurl, e)) if self.persist: persistent_connections[self.socketurl] = self.socket @@ -242,7 +258,7 @@ class BaseConnection: self.send_query(query, add_headers) return self.recv_response(query, add_headers) - def send_query(self, query, add_headers = ""): + def send_query(self, query, add_headers = "", do_reconnect=True): if self.socket == None: self.connect() if not query.endswith("\n"): @@ -261,7 +277,15 @@ class BaseConnection: del persistent_connections[self.socketurl] self.successful_persistence = False self.socket = None - raise MKLivestatusSocketError(str(e)) + + if do_reconnect: + # Automatically try to reconnect in case of an error, but + # only once. + self.connect() + self.send_query(query, add_headers, False) + return + + raise MKLivestatusSocketError("RC1:" + str(e)) # Reads a response from the livestatus socket. If the socket is closed # by the livestatus server, we automatically make a reconnect and send @@ -282,20 +306,20 @@ class BaseConnection: raise MKLivestatusSocketError("Malformed output") else: raise MKLivestatusQueryError(code, data.strip()) - except MKLivestatusSocketClosed: + + # In case of an IO error or the other side having + # closed the socket do a reconnect and try again, but + # only once + except (MKLivestatusSocketClosed, IOError), e: self.disconnect() if query: + time.sleep(0.1) self.connect() self.send_query(query, add_headers) return self.recv_response() # do not send query again -> danger of infinite loop else: - raise + raise MKLivestatusSocketError(str(e)) - except IOError, e: - self.socket = None - if self.persist: - del persistent_connections[self.socketurl] - raise MKLivestatusSocketError(str(e)) def do_command(self, command): if self.socket == None: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5f90ed2..5d3b2a2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5741,11 +5741,12 @@ def mode_edit_site(phase): # Timeout html.write("<tr><td class=legend>") - html.write(_("Connect Timeout This setting limits the time Multisites waits for a connection " + html.write(_("Connect Timeout This sets the time that Multisite waits for a connection " "to the site to be established before the site is considered to be unreachable. " - "If not set, the operating system defaults are begin used.")) + "If not set, the operating system defaults are begin used and just one login attempt is being. " + "performed.")) html.write("</td><td class=content>") - timeout = site.get("timeout", "") + timeout = site.get("timeout", 10) html.number_input("timeout", timeout, size=2) html.write(_(" seconds")) html.write("</td></tr>")

12 years, 7 months

Check_MK Git: check_mk: WATO: further checks are configurable.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0656ed7af004663f060e201c74167059a819a9f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0656ed7af00466… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 13:49:19 2012 +0100 WATO: further checks are configurable. --- checks/3ware_info | 2 +- checks/aironet_clients | 16 +++- checks/akcp_sensor_temp | 1 + checks/apc_symmetra_temp | 1 + checks/cisco_temp | 2 + checks/cisco_temp_perf | 1 + checks/cisco_temp_sensor | 2 + checks/cmctc | 4 +- checks/decru_temps | 1 + checks/dell_powerconnect_temp | 5 +- checks/f5_bigip_temp | 8 +- checks/fsc_temp | 6 +- checks/hp_proliant_temp | 3 +- checks/smart | 1 + doc/WATO.missing | 170 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 36 ++++++- 16 files changed, 240 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0656ed7af0…

12 years, 7 months

Check_MK Git: check_mk: Fixed manuals of akcp checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e68eb858f1548c65d2c3d4141b8d576f90bb179e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e68eb858f1548c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 13:27:48 2012 +0100 Fixed manuals of akcp checks --- checkman/akcp_sensor_humidity | 24 +++++++++++++----------- checkman/akcp_sensor_temp | 27 ++++++++++----------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/checkman/akcp_sensor_humidity b/checkman/akcp_sensor_humidity index 0842711..ee40c07 100644 --- a/checkman/akcp_sensor_humidity +++ b/checkman/akcp_sensor_humidity @@ -1,34 +1,36 @@ -title: Check AKCP Sensor Temperature +title: Check AKCP Sensor Humidity agents: snmp author: Michael Nieporte <michael.nieporte(a)uk-essen.de> license: GPL distribution: check_mk description: - This check monitors the temperature of sensors attached + This check monitors the humidity of sensors attached to AKCP SensorProbe. item: The item is the sensor description of the sensor as string. perfdata: - One variable: the current temperature in degrees celsius or fahrenheit. + the current humidity in percent, lower crit, lower warn, upper warn, upper crit inventory: - All available temperature sensors are automatically inventorized. + All available humidity sensors are automatically inventorized. examples: - # set default levels for all temperature sensors - akcp_sensor_temp_defaultlevels = (28, 32) + # set default levels for all akcp humidity sensors + akcp_sensor_humidity_defaultlevels = (35, 40, 60, 65) # to Overwrite the default levels levels for a sensor checks += [ - ( 'hostname', "akcp_sensor_temp", 'sensor description', ( warn value, crit value) ), + ( 'hostname', "akcp_sensor_humidity", 'sensor description', ( lower crit, lower warn, upper warn, upper crit ) ), ] [parameters] -warning (int): temperature at which a warning level is triggered -critical (int): critical level for temperature +critical low (int): lower border for triggering critical level +warning low (int): lower border for warning level +warning high (int): upper border for triggering warning level +critical high (int): upper border for critical level [configuration] -akcp_sensor_temp (int, int): default levels for warning - and critical. Preset to {(28,32)}. +akcp_sensor_humidity (int, int, int, int): default levels for lower critical lower warning + and upper warning, upper critical. Preset to ( 35, 40, 60, 65 ). diff --git a/checkman/akcp_sensor_temp b/checkman/akcp_sensor_temp index aab25ee..09754d4 100644 --- a/checkman/akcp_sensor_temp +++ b/checkman/akcp_sensor_temp @@ -1,36 +1,29 @@ -title: Check AKCP Sensor Humidity +title: Check AKCP Sensor Temperature agents: snmp author: Michael Nieporte <michael.nieporte(a)uk-essen.de> license: GPL distribution: description: - This check monitors the humidity of sensors attached + This check monitors the temperature of sensors attached to AKCP SensorProbe. item: The item is the sensor description of the sensor as string. perfdata: - the current humidity in percent, lower crit, lower warn, upper warn, upper crit + the current temperature in degree celsius inventory: - All available humidity sensors are automatically inventorized. + All available temperature sensors are automatically inventorized. examples: - # set default levels for all akcp humidity sensors - akcp_sensor_humidity_defaultlevels = (35, 40, 60, 65) - - # to Overwrite the default levels levels for a sensor - checks += [ - ( 'hostname', "akcp_sensor_humidity", 'sensor description', ( lower crit, lower warn, upper warn, upper crit ) ), - ] + # set default levels for all akcp temperature sensors + akcp_sensor_temp_defaultlevels = (28, 34) [parameters] -critical low (int): lower border for triggering critical level -warning low (int): lower border for warning level -warning high (int): upper border for triggering warning level -critical high (int): upper border for critical level +warning (int): temperature in degrees at which the check goes warning +critical (int): level for critical temperature [configuration] -akcp_sensor_humidity (int, int, int, int): default levels for lower critical lower warning - and upper warning, upper critical. Preset to ( 35, 40, 60, 65 ). +akcp_sensor_temp_defaultlevels (int, int): Default levels. This is +preset to {(28, 32)}.

12 years, 7 months

Check_MK Git: check_mk: WATO: yet some more checks configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52b24b54564df85d68025385a3f7db904499e4c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b24b54564df8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 12:24:47 2012 +0100 WATO: yet some more checks configurable --- checks/hpux_multipath | 1 + checks/hpux_serviceguard | 2 +- checks/ironport_misc | 2 ++ web/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/checks/hpux_multipath b/checks/hpux_multipath index 72913e3..23c46ad 100644 --- a/checks/hpux_multipath +++ b/checks/hpux_multipath @@ -110,3 +110,4 @@ def check_hpux_multipath(item, params, info): check_info['hpux_multipath'] = (check_hpux_multipath, "Multipath %s", 0, inventory_hpux_multipath ) +checkgroup_of['hpux_multipath'] = "hpux_multipath" diff --git a/checks/hpux_serviceguard b/checks/hpux_serviceguard index 2eb4734..0236060 100644 --- a/checks/hpux_serviceguard +++ b/checks/hpux_serviceguard @@ -51,7 +51,7 @@ def inventory_hpux_serviceguard(info): inventory.append((item, None)) return inventory -def check_hpux_serviceguard(item, params, info): +def check_hpux_serviceguard(item, _no_params, info): for line in info: if (item == "Total Status" and len(line) == 1) or \ (item == line[0] and len(line) == 2): diff --git a/checks/ironport_misc b/checks/ironport_misc index 284ee76..dad22dd 100644 --- a/checks/ironport_misc +++ b/checks/ironport_misc @@ -33,3 +33,5 @@ check_info['ironport_misc'] = ( "%s", 0, no_inventory_possible) + +checkgroup_of['ironport_misc'] = "obsolete" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d7c6337..3681933 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -883,6 +883,22 @@ checkgroups.append(( "first")) checkgroups.append(( + "hpux_multipath", + _("Multipathing on HPUX - state of paths of a LUN"), + Tuple( + title = _("Expected path situation"), + elements = [ + Integer(title = _("Number of active paths")), + Integer(title = _("Number of standby paths")), + Integer(title = _("Number of failed paths")), + Integer(title = _("Number of unopen paths")), + ]), + TextAscii( + title = _("WWID of the LUN")), + "first")) + + +checkgroups.append(( "services", _("Windows services"), None,

12 years, 7 months

Check_MK Git: check_mk: WATO: formalized yet further checks ( 200 still to go)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89e9a1a7cdf484c003cc4b9299f62c2ae80294c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89e9a1a7cdf484… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 12:07:01 2012 +0100 WATO: formalized yet further checks (200 still to go) --- ChangeLog | 4 +- checkman/fjdarye100_disks | 2 +- checkman/fjdarye60_disks | 2 +- checks/3ware_disks | 3 +- checks/3ware_units | 3 +- checks/fjdarye.include | 5 +-- checks/fjdarye100_disks | 1 + checks/fjdarye60_disks | 1 + checks/lsi | 5 +++- checks/md | 5 ++- checks/megaraid_pdisks | 1 + checks/mounts | 1 + web/plugins/wato/check_parameters.py | 42 ++++++++++++++++++++++++++++++++++ 13 files changed, 63 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index af32aea..d2be19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,8 +11,8 @@ * FIX: fix problem with check includes in subchecks WATO: - * More checks are configurable via WATO now - * Distributed WATO: Made all url calls using curl now + * Much more checks are configurable via WATO now + * Distributed WATO: Made all URL calls using curl now * FIX: fix bug in inventory in validate_datatype() * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD diff --git a/checkman/fjdarye100_disks b/checkman/fjdarye100_disks index 61f3a1f..7bb7d94 100644 --- a/checkman/fjdarye100_disks +++ b/checkman/fjdarye100_disks @@ -1,4 +1,4 @@ -title: Monitor status of disks in Fujitsu ETERNUS DX80 S2 storage systems +title: Monitor status of disk in Fujitsu ETERNUS DX80 S2 storage systems agents: SNMP author: Philipp Hoefflin <hoefflin+cmk(a)fuh-e.de> license: GPLv2 diff --git a/checkman/fjdarye60_disks b/checkman/fjdarye60_disks index 211919e..0af70f0 100644 --- a/checkman/fjdarye60_disks +++ b/checkman/fjdarye60_disks @@ -1,4 +1,4 @@ -title: Monitor status of disks in Fujitsu ETERNUS DX storage systems +title: Monitor status of disk in Fujitsu ETERNUS DX storage systems agents: SNMP author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL diff --git a/checks/3ware_disks b/checks/3ware_disks index 89e2681..b9a4c41 100644 --- a/checks/3ware_disks +++ b/checks/3ware_disks @@ -61,7 +61,7 @@ def inventory_3ware_disks(info): inventory.append( (disk, None) ) return inventory -def check_3ware_disks(item, params, info): +def check_3ware_disks(item, _no_params, info): for line in info: if line[0] == item: status = line[1] @@ -81,3 +81,4 @@ def check_3ware_disks(item, params, info): # declare the check to Check_MK check_info['3ware_disks'] = \ (check_3ware_disks, "RAID 3ware disk %s", 0, inventory_3ware_disks) +checkgroup_of['3ware_disks'] = "raid_disk" diff --git a/checks/3ware_units b/checks/3ware_units index 00859a5..8284343 100644 --- a/checks/3ware_units +++ b/checks/3ware_units @@ -47,7 +47,7 @@ def inventory_3ware_units(info): return inventory # check -def check_3ware_units(item, param, info): +def check_3ware_units(item, _no_params, info): for line in info: if line[0] == item: unit_type = line[1] @@ -77,3 +77,4 @@ def check_3ware_units(item, param, info): # declare the check to Check_MK check_info['3ware_units'] = \ (check_3ware_units, "RAID 3ware unit %s", 0, inventory_3ware_units) +checkgroup_of['3ware_units'] = "raid" diff --git a/checks/fjdarye.include b/checks/fjdarye.include index 6eed9b7..877de9d 100644 --- a/checks/fjdarye.include +++ b/checks/fjdarye.include @@ -78,7 +78,7 @@ def fjdarye_disks_summary(info): def inventory_fjdarye_disks_summary(info): current_state = fjdarye_disks_summary(info) if len(current_state) > 0: - return [ (None, '', current_state) ] + return [ (None, current_state) ] def fjdarye_disks_printstates(state): return ", ".join(["%s: %s" % (s,c) for (s,c) in state.items()]) @@ -101,7 +101,7 @@ def check_fjdarye_disks_summary(index, expected_status, info): # -------------------------------------------------------------------------------- # 2. Single disk version of check -> one check for each disk def inventory_fjdarye_disks(info): - return [ (int(index), '', repr(fjdarye_disks_status[int(status)])) for index, status in info if int(status) != 3 ] + return [ (int(index), repr(fjdarye_disks_status[int(status)])) for index, status in info if int(status) != 3 ] def check_fjdarye_disks(index, expected_status, info): for line in info: @@ -115,4 +115,3 @@ def check_fjdarye_disks(index, expected_status, info): return (3, "UNKNOWN - No status for disk number %d present" % index) -# vim: tabstop=4 shiftwidth=4 expandtab diff --git a/checks/fjdarye100_disks b/checks/fjdarye100_disks index 65b1092..f50cd20 100644 --- a/checks/fjdarye100_disks +++ b/checks/fjdarye100_disks @@ -74,6 +74,7 @@ snmp_scan_functions['fjdarye100_disks.summary'] \ check_info['fjdarye100_disks'] = (check_fjdarye_disks, "Disk %s", 0, inventory_fjdarye_disks) check_includes['fjdarye100_disks'] = ["fjdarye.include"] +checkgroup_of['fjdarye100_disks'] = "raid_disk" # 1: fjdaryDiskIndex, 3: fjdaryDiskStatus snmp_info['fjdarye100_disks'] = (".1.3.6.1.4.1.211.1.21.1.100.2.19.2.1", [ 1, 3 ]) diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index 57d7a89..9a61bff 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -38,6 +38,7 @@ snmp_scan_functions['fjdarye60_disks.summary'] \ check_info['fjdarye60_disks'] = (check_fjdarye_disks, "Disk %s", 0, inventory_fjdarye_disks) check_includes['fjdarye60_disks'] = ["fjdarye.include"] snmp_info['fjdarye60_disks'] = (".1.3.6.1.4.1.211.1.21.1.60.2.12.2.1", [ 1, 3 ]) +checkgroup_of['fjdarye60_disks'] = "raid_disk" snmp_scan_functions['fjdarye60_disks'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" diff --git a/checks/lsi b/checks/lsi index bf2c2b7..f9966ba 100644 --- a/checks/lsi +++ b/checks/lsi @@ -46,7 +46,7 @@ def inventory_lsi(check_type, info): else: return [(id, '"%s"' % state) for (id, state) in disks] -def check_lsi_array(item, params, info): +def check_lsi_array(item, _no_params, info): volumeid = -1 for line in info: if line[0] == 'VolumeID': @@ -75,4 +75,7 @@ def check_lsi_disk(item, target_state, info): check_info['lsi.array'] = (check_lsi_array, "RAID array %s", 0, lambda info: inventory_lsi('lsi.array', info)) +checkgroup_of['lsi.array'] = "raid" + check_info['lsi.disk'] = (check_lsi_disk, "RAID disk %s", 0, lambda info: inventory_lsi('lsi.disk', info)) +checkgroup_of['lsi.disk'] = "raid_disk" diff --git a/checks/md b/checks/md index ce769fe..b211fcf 100644 --- a/checks/md +++ b/checks/md @@ -74,10 +74,10 @@ def inventory_md(info): elif line[1] == 'blocks': if line[-1] != "chunks": # ignore RAID 0 devices disk_state = line[-1][1:-1] - inventory.append( (device, '%s / %s' % (raid_state, disk_state), None) ) + inventory.append( (device, None) ) return inventory -def check_md(item, params, info): +def check_md(item, _no_params, info): raid_state = '' its_next = False for line in info: @@ -104,3 +104,4 @@ def check_md(item, params, info): check_info['md'] = (check_md, "MD Softraid %s", 0, inventory_md) +checkgroup_of['md'] = "raid" diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 91ecd77..0cdf8c7 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -98,3 +98,4 @@ def check_megaraid_pdisks(item, target_state, info): return (3, "UNKNOWN - No disk in encl/slot %s found" % item) check_info['megaraid_pdisks'] = (check_megaraid_pdisks, "RAID PDisk Adapt/Enc/Sl %s", 1, inventory_megaraid_pdisks) +checkgroup_of['megaraid_pdisks'] = "raid_disk" diff --git a/checks/mounts b/checks/mounts index 54a7f4f..521023b 100644 --- a/checks/mounts +++ b/checks/mounts @@ -70,3 +70,4 @@ def check_mounts(item, targetopts, info): check_info['mounts'] = ( check_mounts, "Mount options of %s", 0, inventory_mounts) +checkgroup_of['mounts'] = "fs_mount_options" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 64085c7..d7c6337 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -242,6 +242,22 @@ checkgroups.append(( )) checkgroups.append(( + "fs_mount_options", + _("Filesystem mount options (Linux/UNIX)"), + ListOfStrings( + title = _("Expected mount options"), + help = _("Specify all expected mount options here. If the list of " + "actually found options differs from this list, the check will go " + "warning or critical. Just the option <tt>commit</tt> is being " + "ignored since it is modified by the power saving algorithms.")), + TextAscii( + title = _("Mount point"), + allow_empty = False), + "first")) + + + +checkgroups.append(( "systemtime", _("System time offset"), Tuple( @@ -882,6 +898,32 @@ checkgroups.append(( "first")) checkgroups.append(( + "raid", + _("RAID: overal state"), + None, + TextAscii( + title = _("Name of the device"), + help = _("For Linux MD specify the device name without the " + "<tt>/dev/</tt>, e.g. <tt>md0</tt>, for hardware raids " + "please refer to the manual of the actual check being used.")), + "first")) + +checkgroups.append(( + "raid_disk", + _("RAID: state of a single disk"), + TextAscii( + title = _("Target state"), + help = _("State the disk is expected to be in. Typical good states " + "are online, host spare, OK and the like. The exact way of how " + "to specify a state depends on the check and hard type being used. " + "Please take examples from inventorized checks for reference.")), + TextAscii( + title = _("Number or ID of the disk"), + help = _("How the disks are named depends on the type of hardware being " + "used. Please look at already inventorized checks for examples.")), + "first")) + +checkgroups.append(( "room_temperature", _("Room temperature (e.g. external thermal sensors in datacenters)"), Tuple(

12 years, 7 months

Check_MK Git: check_mk: Fix some layout problems in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59864ec002eb55b22d3675ab4be5fcd82535f20a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59864ec002eb55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 10:44:39 2012 +0100 Fix some layout problems in WATO --- web/htdocs/check_mk.css | 6 +++--- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.css | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 52f5bef..5f3572e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -283,12 +283,12 @@ div.dictelement { float: none; } -td.content table.valuespec_tuple td.left { +table.valuespec_tuple td.tuple_left { padding-right: 10px; } -td.content table.valuespec_tuple td.right, -td.content table.valuespec_tuple td.left { +table.valuespec_tuple td.tuple_right, +table.valuespec_tuple td.tuple_left { vertical-align: top; padding-bottom: 10px; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 83c370c..565b2f2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1173,8 +1173,8 @@ class Tuple(ValueSpec): html.write("<tr>") if self._show_titles: title = element.title()[0].upper() + element.title()[1:] - html.write("<td class=left>%s:%s</td>" % (title, help)) - html.write("<td class=right>") + html.write("<td class=tuple_left>%s:%s</td>" % (title, help)) + html.write("<td class=tuple_right>") element.render_input(vp, val) html.write("</td></tr>") html.write("</table>") diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 296c666..71862de 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -377,10 +377,12 @@ table.validationerror img { padding: 0; } -.wato table.form td.content td { +/* This style destroys many other td styles since + it is too specific or too unspecific */ +/* .wato table.form td.content td { padding: 0; vertical-align: middle; -} +}*/ .wato table.data.ruleset td { /* vertical-align: top; */

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits