Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64570 discussions

Check_MK Git: check_mk: FIX apc_symmetra: transformation from old tuple to new dict format fixed and improved

by Götz Golla

Module: check_mk Branch: master Commit: 526f77440fcce9f720217683c00b17cacc1ab006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=526f77440fcce9… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Jan 15 09:53:06 2014 +0100 FIX apc_symmetra: transformation from old tuple to new dict format fixed and improved --- .werks/567 | 9 ++ ChangeLog | 3 +- checks/apc_symmetra | 47 +++++----- web/plugins/wato/check_parameters.py | 160 ++++++++++++++++++---------------- 4 files changed, 120 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=526f77440f…

10 years, 8 months

Check_MK Git: check_mk: Draft for rule based notifications updated

by Mathias Kettner

Module: check_mk Branch: master Commit: d63c167af1d2fb9561ce34c1a9fa246a6d037962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d63c167af1d2fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 15 09:44:27 2014 +0100 Draft for rule based notifications updated --- doc/drafts/README.rule_based_notifications | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/drafts/README.rule_based_notifications b/doc/drafts/README.rule_based_notifications index 1c16b99..dbbcc57 100644 --- a/doc/drafts/README.rule_based_notifications +++ b/doc/drafts/README.rule_based_notifications @@ -43,9 +43,9 @@ The condition can be formed of: * the event type (up, down, ok, crit, etc.) * a host specification like in WATO rules (using host tags, etc.) * a service specification using regular expressions (like in WATO rules) +* The original state or the complete state transition (e.g. CRIT -> WARN vs. OK -> WARN) Further conditions that we can think of are: -* The original state or the complete state transition (e.g. CRIT -> WARN vs. OK -> WARN) * the type of the check plugin, e.g. only checks of type "if" or "if64" * whether the host or service is contained in a certain host/service group * whether it's contained in a certain contact group

10 years, 8 months

Check_MK Git: check_mk: FIX LDAP: Fixed group syncrhonisation when nested group sync is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9b54c2c5273314de1d16e46299d3be561788ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9b54c2c52733… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 15 08:49:56 2014 +0100 FIX LDAP: Fixed group syncrhonisation when nested group sync is enabled --- .werks/431 | 9 +++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/431 b/.werks/431 new file mode 100644 index 0000000..8a8db8e --- /dev/null +++ b/.werks/431 @@ -0,0 +1,9 @@ +Title: LDAP: Fixed group syncrhonisation when nested group sync is enabled +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389772171 + + diff --git a/ChangeLog b/ChangeLog index 008478e..719b639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 0424 FIX: Improved error handling in case of incorrect auth config in distributed WATO environments * 0425 FIX: Fix login loop bug in distributed environments with different auth secrets * 0117 FIX: Availability button is now visible for users without the right to edit views + * 0431 FIX: LDAP: Fixed group syncrhonisation when nested group sync is enabled WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 27a6a64..3ba05d5 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -622,7 +622,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): 'cn' : cn, } for user_dn, obj in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = ['dn']): - groups[dn]['members'].append(user_dn.lower) + groups[dn]['members'].append(user_dn.lower()) g_ldap_group_cache[cache_key] = groups return groups

10 years, 8 months

Check_MK Git: check_mk: FIX wato snapshots: snapshot restore no longer fails with older python versions

by Andreas Boesl

Module: check_mk Branch: master Commit: ff98ddeab25831ba4d752105e16e99b724cd1cd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff98ddeab25831… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 16:58:39 2014 +0100 FIX wato snapshots: snapshot restore no longer fails with older python versions Python versions <= 2.6.6 had problems on restoring snapshots files.<br> The python tarfile module crashed when it tried to unpack tarfiles with no content.<br> The new implementation now uses the tar from the command line instead of the python tarfile module. --- .werks/256 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 32 +++++++++++++++++--------------- web/plugins/wato/backup_domains.py | 2 ++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.werks/256 b/.werks/256 new file mode 100644 index 0000000..ae07b2b --- /dev/null +++ b/.werks/256 @@ -0,0 +1,11 @@ +Title: wato snapshots: snapshot restore no longer fails with older python versions +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389714765 + +Python versions <= 2.6.6 had problems on restoring snapshots files.<br> +The python tarfile module crashed when it tried to unpack tarfiles with no content.<br> +The new implementation now uses the tar from the command line instead of the python tarfile module. diff --git a/ChangeLog b/ChangeLog index 35e92bd..008478e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -174,6 +174,7 @@ * 0422 FIX: Fixed numbers shown in log entries of bulk inventory... * 0252 FIX: ESX vSphere configuration: Fixed non-working configuration parameters... * 0456 FIX: Column was too short... + * 0256 FIX: wato snapshots: snapshot restore no longer fails with older python versions... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index e818524..45a991e 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -98,10 +98,12 @@ def get_file_content(tarfilename, filename): return tar.extractfile(filename).read() def extract_domains(tar, domains): + import subprocess tar_domains = {} for member in tar.getmembers(): try: - tar_domains[member.name[:-7]] = member + if member.name.endswith(".tar.gz"): + tar_domains[member.name[:-7]] = member except Exception, e: pass @@ -133,21 +135,27 @@ def extract_domains(tar, domains): # The complete tar file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) - subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) - # Set group id of extracted files, except base paths.. - for entry in subtar.getmembers(): - full_path = prefix + "/" + entry.name + # Older versions of python tarfile handle empty subtar archives :( + # This won't work: subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) + p = subprocess.Popen("tar tzf %s/%s" % (restore_dir, tar_member.name), shell = True, stdout = subprocess.PIPE) + stdout, stderr = p.communicate() + for line in stdout: + full_path = prefix + "/" + line path_tokens = full_path.split("/") check_exists_or_writable(path_tokens) # Cleanup os.unlink("%s/%s" % (restore_dir, tar_member.name)) - return len(errors) == 0, errors + return errors def cleanup_domain(domain): + # Some domains, e.g. authorization, do not get a cleanup + if domain.get("cleanup") == False: + return + def path_valid(prefix, path): if path.startswith("/") or path.startswith(".."): return False @@ -170,21 +178,15 @@ def extract_domains(tar, domains): return # The complete tar.gz file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) - subtar = tarfile.open("%s/%s" % (restore_dir, tar_member.name)) - subtar.extractall(target_dir) - - # Set group id of extracted files, except base paths.. - base_paths = [path[1] for path in domain.get("paths") if path[0] == "dir"] - for entry in subtar.getmembers(): - if entry.name not in base_paths: - os.chown("%s/%s" % (target_dir, entry.name), -1, gid) + p = subprocess.Popen("tar xzf %s/%s -C %s" % (restore_dir, tar_member.name, target_dir), shell = True) + p.communicate() # Check write permissions for target directories and files errors = [] for name, tar_member in tar_domains.items(): if name in domains: - result, dom_errors = check_domain_permissions(domains[name], tar_member) + dom_errors = check_domain_permissions(domains[name], tar_member) errors.extend(dom_errors) if len(errors): errors = list(set(errors)) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 771e60e..19b103d 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -30,6 +30,7 @@ if not defaults.omd_root: ("file", "auth.secret"), ("file", "auth.serials") ], + "cleanup" : False, "default" : True }}) else: @@ -61,6 +62,7 @@ else: ("file", "auth.secret"), ("file", "auth.serials") ], + "cleanup" : False, "default" : True }, "personalsettings": {

10 years, 8 months

Check_MK Git: check_mk: wato snapshots: show filesizes human readable

by Andreas Boesl

Module: check_mk Branch: master Commit: 928e78da6a84f583acf75b1d28033cdab2ebec8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=928e78da6a84f5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 16:38:53 2014 +0100 wato snapshots: show filesizes human readable --- web/htdocs/wato.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 992568a..db695c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4313,6 +4313,15 @@ def fmt_date(t): def fmt_time(t): return time.strftime('%H:%M:%S', time.localtime(t)) +def fmt_bytes(num): + for x in ['Bytes', 'KB', 'MB', 'GB', 'TB']: + if num < 1024.0: + if x == "Bytes": + return "%d %s" % (num, x) + else: + return "%3.1f %s" % (num, x) + num /= 1024.0 + def paged_log(log): start = int(html.var('start', 0)) if not start: @@ -5543,7 +5552,7 @@ def get_snapshot_status(name): files = tokens[1].splitlines() for filename in files: name, info = filename.split(":",1) - file_info[name] = { "size" :info } + file_info[name] = {"size" : info} status["files"] = file_info else: # tarfile is finished, read comment # Determine snapshot type: legacy / new @@ -5586,6 +5595,7 @@ def get_snapshot_status(name): def mode_snapshot_detail(phase): snapshot_name = html.var("_snapshot_name") status = get_snapshot_status(snapshot_name) + if phase == "title": return _("Snapshot details of %s") % status["name"] elif phase == "buttons": @@ -5629,7 +5639,7 @@ def mode_snapshot_detail(phase): domain_id = key[:-7] if domain_id in backup_domains: html.write("<tr><td>%s</td>" % backup_domains.get(domain_id)["title"]) - html.write("<td align='right'>%s</td></tr>" % files[key]["size"]) + html.write("<td align='right'>%s</td></tr>" % fmt_bytes(files[key]["size"])) else: other_content.append(key) except: @@ -5638,7 +5648,7 @@ def mode_snapshot_detail(phase): html.write("<tr><td>%s</td></tr>" % _("Other content")) for key in other_content: html.write("<tr><td>%s</td>" % key) - html.write("<td align='right'>%s</td></tr>" % files[key]["size"]) + html.write("<td align='right'>%s</td></tr>" % fmt_bytes(files[key]["size"])) html.write("</table>") forms.end() if snapshot_name != "uploaded_snapshot": @@ -5850,7 +5860,7 @@ def mode_snapshot(phase): # Age and Size st = os.stat(snapshot_dir + name) age = time.time() - st.st_mtime - table.cell(_("Size"), "%d" % st.st_size, css="number"), + table.cell(_("Size"), fmt_bytes(st.st_size), css="number"), # Status icons table.cell(_("Status"))

10 years, 8 months

Check_MK Git: check_mk: wato snapshot: add missing i8n

by Andreas Boesl

Module: check_mk Branch: master Commit: 45615ffd6b7c1d609f78bfdd045664c3f632ffe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45615ffd6b7c1d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 16:25:55 2014 +0100 wato snapshot: add missing i8n --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3a38420..992568a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5828,8 +5828,8 @@ def mode_snapshot(phase): html.write("<br>") html.write("<h3>" + _("Restore from uploaded file") + "</h3>") - html.write("Only supports snapshots up to 100MB. If your snapshot is larger than 100MB please copy it into the sites<br>" - "backup directory %s/wato/snapshots. It will then show up in the snapshots table.<br><br>" % defaults.var_dir) + html.write(_("Only supports snapshots up to 100MB. If your snapshot is larger than 100MB please copy it into the sites<br>" + "backup directory %s/wato/snapshots. It will then show up in the snapshots table.<br><br>") % defaults.var_dir) html.begin_form("upload_form", method = "POST") html.upload_file("_upload_file") html.button("upload_button", _("Restore from file"), "submit")

10 years, 8 months

Check_MK Git: check_mk: snapshot upload: add comment to 'Restore from file' feature

by Andreas Boesl

Module: check_mk Branch: master Commit: a7e26a0c55454be4d53d51b6ea8e10f77bcea83d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7e26a0c55454b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 16:10:20 2014 +0100 snapshot upload: add comment to 'Restore from file' feature --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d1ca549..3a38420 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5828,6 +5828,8 @@ def mode_snapshot(phase): html.write("<br>") html.write("<h3>" + _("Restore from uploaded file") + "</h3>") + html.write("Only supports snapshots up to 100MB. If your snapshot is larger than 100MB please copy it into the sites<br>" + "backup directory %s/wato/snapshots. It will then show up in the snapshots table.<br><br>" % defaults.var_dir) html.begin_form("upload_form", method = "POST") html.upload_file("_upload_file") html.button("upload_button", _("Restore from file"), "submit")

10 years, 8 months

Check_MK Git: check_mk: Prepare display of check paramters right in WATO table

by Mathias Kettner

Module: check_mk Branch: master Commit: 17d452b1bbef0b8823a7beba093ede9539e3c993 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17d452b1bbef0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 15:35:27 2014 +0100 Prepare display of check paramters right in WATO table --- web/htdocs/wato.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8e60990..d1ca549 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2541,6 +2541,9 @@ def show_service_table(host, firsttime): table.begin(css ="data", searchable = False) + # This option will later be switchable somehow + parameter_column = False + for state_name, state_type, checkbox in [ ( _("Available (missing) services"), "new", firsttime ), ( _("Already configured services"), "old", True, ), @@ -2579,7 +2582,7 @@ def show_service_table(host, firsttime): table.cell(_("Plugin output"), html.attrencode(output)) # Icon for Rule editor, Check parameters - table.cell() + table.cell(parameter_column and _("Check Parameters") or "") varname = None if checkgroup: varname = "checkgroup_parameters:" + checkgroup @@ -2600,14 +2603,17 @@ def show_service_table(host, firsttime): paramtext = _("Invalid check parameter: %s!") % e paramtext += _(" The parameter is: %r") % (params,) - # Strip all html code from the paramtext - paramtext = paramtext.replace('</td>', '\t') - paramtext = paramtext.replace('</tr>', '\n') - paramtext = html.strip_tags(paramtext) - - title = _("Check parameters for this service") + ": \n" + paramtext - html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % - (url, title)) + if parameter_column: + html.write(paramtext) + else: + # Strip all HTML code from the paramtext + paramtext = paramtext.replace('</td>', '\t') + paramtext = paramtext.replace('</tr>', '\n') + paramtext = html.strip_tags(paramtext) + + title = _("Check parameters for this service") + ": \n" + paramtext + html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % + (url, title)) # Permanently disable icon

10 years, 8 months

Check_MK Git: check_mk: FIX Column was too short

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5d780dfee6a85a5c473db924d34af0eeba64029c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d780dfee6a85a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jan 14 15:21:56 2014 +0100 FIX Column was too short when activating changes by another user, the column showing the username was too short for it's content --- .werks/456 | 9 +++++++++ ChangeLog | 3 ++- web/htdocs/wato.css | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/456 b/.werks/456 new file mode 100644 index 0000000..05af86e --- /dev/null +++ b/.werks/456 @@ -0,0 +1,9 @@ +Title: Column was too short +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1389709232 +Class: fix + +when activating changes by another user, the column showing the username was too +short for it's content diff --git a/ChangeLog b/ChangeLog index e94c309..35e92bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,8 +41,8 @@ * 0324 hitachi_hnas_cifs: new check for the number of users using a CIFS share * 0455 hitachi_hnas_span: new check for Spans (Storage Pools) in Hitachi HNAS storage systems * 0445 mem.win: Allow time-averaging of values before applying levels... - * 0566 services.summary: new check to monitor stopped services of mode autostart in windows * 0446 mem.used, solaris_mem: Introduce optional averaging of used memory... + * 0566 services.summary: new check to monitor stopped services of mode autostart in windows * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... @@ -173,6 +173,7 @@ * 0250 FIX: Fixed error on creating very large WATO snapshots... * 0422 FIX: Fixed numbers shown in log entries of bulk inventory... * 0252 FIX: ESX vSphere configuration: Fixed non-working configuration parameters... + * 0456 FIX: Column was too short... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 7cd2eb1..03dd57e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -147,7 +147,7 @@ Boston, MA 02110-1301 USA. margin: 0 5px 0 0; padding: 0; border-style: none; - float: left; + float: none; } .wato table.foreignchanges {

10 years, 8 months

Check_MK Git: check_mk: services.summary: new check to monitor stopped services of mode autostart in windows

by Götz Golla

Module: check_mk Branch: master Commit: f7741b0fc6eb4c5998ca4cd85b76263a83121f8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7741b0fc6eb4c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Jan 14 15:12:13 2014 +0100 services.summary: new check to monitor stopped services of mode autostart in windows --- .werks/566 | 8 +++++ ChangeLog | 1 + checkman/services.summary | 30 ++++++++++++++++ checks/services | 62 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 33 ++++++++++++++++++ 5 files changed, 134 insertions(+) diff --git a/.werks/566 b/.werks/566 new file mode 100644 index 0000000..d375693 --- /dev/null +++ b/.werks/566 @@ -0,0 +1,8 @@ +Title: services.summary: new check to monitor stopped services of mode autostart in windows +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1389708658 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2f8e444..cc4e873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 0324 hitachi_hnas_cifs: new check for the number of users using a CIFS share * 0455 hitachi_hnas_span: new check for Spans (Storage Pools) in Hitachi HNAS storage systems * 0445 mem.win: Allow time-averaging of values before applying levels... + * 0566 services.summary: new check to monitor stopped services of mode autostart in windows * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/services.summary b/checkman/services.summary new file mode 100644 index 0000000..2071226 --- /dev/null +++ b/checkman/services.summary @@ -0,0 +1,30 @@ +title: Windows Services +agents: windows +catalog: applications +license: GPL +distribution: check_mk +description: + This check gives a summary of the windows services and monitors + the number of services of mode "autostart" which are stopped. + The state of the check as soon as such a stopped service is found + can be configured to be any valid state. The default is {OK}. Also, + if no such stopped service is found, the state is {OK}. + + A list of ignored services can be configured. These services will not be + considered when determining the stopped services. + +[configuration] +{services_summary_default_levels(dict):} A dictionary with the following preset keys + +{"ignored": (),} +{"state_of_stopped": 0} + + +[parameters] +parameters(dict): A dictionary with the following keys: + + {"ignored"}: tuple: A tuple of service names or regular expressions for + services. These services will be disregarded when determining the state of the check + + {"state_if_stopped"}: int: The monitoring state that should be applied if + stopped services are found diff --git a/checks/services b/checks/services index decd941..5fa1f4e 100644 --- a/checks/services +++ b/checks/services @@ -235,3 +235,65 @@ check_info['services'] = { "group" : "services", "default_levels_variable" : "services_default_levels", } + +factory_settings["services_summary_default_levels"] = { + "ignored": (), + "state_if_stopped": 0 +} + +def inventory_services_summary(info): + if info[0]: + return [ (None, "services_summary_default_levels") ] + +def check_services_summary(item, params, info): + blacklist = params.get("ignored", () ) + stoplist = [] + num_blacklist = 0 + num_auto = 0 + for line in info: + startstop, auto = line[2].split("/") + srv_name = line[1] + if auto == "auto": + num_auto += 1 + if startstop == "stopped": + match = False + for srv in blacklist: + if re.match(srv,srv_name): + match = True + if match == False: + stoplist.append(srv_name) + else: + num_blacklist += 1 + + num_stoplist = len(stoplist) + num_srv = len(info) + length_runlist = len(info) - len(stoplist) - num_blacklist + + if len(stoplist) > 0: + stopped_srvs = " ("+", ".join(stoplist)+")" + state = params.get("state_if_stopped") + if state == 1: + sym = "(!)" + elif state == 2: + sym="(!!)" + else: + sym = "" + else: + stopped_srvs = "" + state = 0 + sym = "" + + + infotext = "%d services, %d services in autostart - of which %d services are stopped%s%s, %d services stopped but ignored" % \ + ( num_srv, num_auto, num_stoplist, sym, stopped_srvs, num_blacklist ) + + return state, infotext + +check_info['services.summary'] = { + "check_function" : check_services_summary, + "inventory_function" : inventory_services_summary, + "default_levels_variable" : "services_summary_default_levels", + "service_description" : "Services Summary", + "node_info" : True, + "group" : "services_summary", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9af97d5..f51346e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2083,6 +2083,38 @@ register_check_parameters( None, "dict", ) + +register_check_parameters( + subgroup_applications, + "services_summary", + _("Windows Service Summary"), + Dictionary( + title = _('Autostart Services'), + elements = [ + ('ignored', + ListOfStrings( + title = _("Ignored autostart services"), + help = _('Regular expressions matching the begining of the internal name ' + 'or the description of the service. ' + 'If no name is given then this rule will match all services. The ' + 'match is done on the <i>beginning</i> of the service name. It ' + 'is done <i>case sensitive</i>. You can do a case insensitive match ' + 'by prefixing the regular expression with <tt>(?i)</tt>. Example: ' + '<tt>(?i).*mssql</tt> matches all services which contain <tt>MSSQL</tt> ' + 'or <tt>MsSQL</tt> or <tt>mssql</tt> or...'), + orientation = "horizontal", + )), + ('state_if_stopped', + MonitoringState( + title = _("Default state if stopped autostart services are found"), + default_value = 0, + )), + ], + ), + None, + "dict" +) + register_check_parameters( subgroup_applications, "esx_vsphere_objects", @@ -4536,3 +4568,4 @@ register_check_parameters( ), "first", False ) +

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits