Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64710 discussions

Check_MK Git: check_mk: #1712 FIX hyper_vms: fixed for snapshot VMs with ( ...) in their names

by Mathias Kettner

Module: check_mk Branch: master Commit: 1577f5816924cb45259014ba92262554bf1744aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1577f5816924cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 16:08:19 2014 +0100 #1712 FIX hyper_vms: fixed for snapshot VMs with (...) in their names When restoring snapshots then HyperV creates names like <tt>VM z4058044_snap (23.05.2014 - 09:29:29)</tt>. These names had not been handled correctly by neither the agent plugin nor the check. Both has been fixed. The check is still compatible with the old agent output - and removes everying after the <tt>_snap</tt> in the VM name. Thanks to Alexander Scholler. --- .werks/1712 | 13 ++++ ChangeLog | 1 + agents/windows/plugins/hyperv_vms.ps1 | 2 +- checks/hyperv_vms | 95 ++++++++++++++++++++++------ modules/check_mk.py | 1 + web/htdocs/wato.py | 1 + web/plugins/wato/check_mk_configuration.py | 1 + 7 files changed, 93 insertions(+), 21 deletions(-) diff --git a/.werks/1712 b/.werks/1712 new file mode 100644 index 0000000..85e3f33 --- /dev/null +++ b/.werks/1712 @@ -0,0 +1,13 @@ +Title: hyper_vms: fixed for snapshot VMs with (...) in their names +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418051145 +Class: fix + +When restoring snapshots then HyperV creates names like <tt>VM z4058044_snap +(23.05.2014 - 09:29:29)</tt>. These names had not been handled correctly by +neither the agent plugin nor the check. Both has been fixed. The check is +still compatible with the old agent output - and removes everying after +the <tt>_snap</tt> in the VM name. Thanks to Alexander Scholler. diff --git a/ChangeLog b/ChangeLog index 3b8444f..0761491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 1708 FIX: cups_queues: fix outputting of current printer jobs if printer daemon is CUPS... * 1710 FIX: omd_status: Fix totally missing section in Linux agent... * 1711 FIX: win_printers.ps1: ignore temporary printers created by RDP terminal sessions... + * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/windows/plugins/hyperv_vms.ps1 b/agents/windows/plugins/hyperv_vms.ps1 index 7245f59..bc90ed4 100644 --- a/agents/windows/plugins/hyperv_vms.ps1 +++ b/agents/windows/plugins/hyperv_vms.ps1 @@ -1,3 +1,3 @@ Write-Host -NoNewLine "<<<hyperv_vms>>>" -Get-VM | format-table -HideTableHeaders -property Name, State, Uptime, Status +Get-VM | format-table -HideTableHeaders -Autosize -property Name, State, Uptime, Status Write-Host diff --git a/checks/hyperv_vms b/checks/hyperv_vms index e643266..ff30717 100644 --- a/checks/hyperv_vms +++ b/checks/hyperv_vms @@ -25,32 +25,87 @@ # Boston, MA 02110-1301 USA. # Example output from agent: -#<<<hyperv_vms>>> -#DMZ-DC1 Running 4.21:44:58 Operating normally -#DMZ-DC2 Running 4.21:44:47 Operating normally +# <<<hyperv_vms>>> +# DMZ-DC1 Running 4.21:44:58 Operating normally +# DMZ-DC2 Running 4.21:44:47 Operating normally -def inventory_hyperv_vms(info): - return [ (x[0], {'state': x[1] }) for x in info ] +# Another example, here with a snapshow with spaces in the name: +# <<<hyperv_vms>>> +# windows-hyperv2-z4058044 Running 21:33:08 Operating normally +# windows-hyperv2-z4058044_snap (23.05.2014 - 09:29:29) Running 18:20:34 Operating normally +# windows-hyperv2-z4065002 Running 11:04:50 Operating normally +# windows-hyperv2-z4065084 Running 1.10:42:33 Operating normally +# windows-hyperv2-z4133235 Running 1.03:52:18 Operating normally -def check_hyperv_vms(item, params, info): +# A broken version of the agent outputted this: +# <<<hyperv_vms>>> +# z4058044 Running 21:19:14 Operating normally +# z4058044_snap (2... Running 18:06:39 Operating normally +# z4065002 Running 10:50:55 Operating normally +# z4065084 Running 1.10:28:39 Operating normally +# z4133235 Running 1.03:38:23 Operating normally + + +# result: +# { +# "windows-hyperv2-z4058044_snap (23.05.2014 - 09:29:29)" : { +# "vm_state" : "Running", +# "uptime" : "1.10:42:33", +# "state_msg" : "Operating normally", +# } +# } + +def parse_hyperv_vms(info): + parsed = {} for line in info: - if line[0] == item: - name, vm_state, uptime = line[:3] - state_msg = " ".join(line[3:]) - if vm_state == params['state']: - state = 0 - message = "State is %s (%s)" % (vm_state, state_msg) - else: - message = "State has changed from %s to %s (%s)" % ( params['state'],\ - vm_state, state_msg) - state = 2 - return state, message - return 3, "VM not found" + if line[1].endswith("..."): # broken output + vm_name = line[0] + line = line[2:] + elif line[1].startswith("("): + idx = 2 + while idx < len(line): + if line[idx].endswith(")"): + vm_name = " ".join(line[:idx+1]) + break + idx += 1 + line = line[idx+1:] + else: + vm_name = line[0] + line = line[1:] + + parsed[vm_name] = { + "state" : line[0], + "uptime" : line[1], + "state_msg" : " ".join(line[2:]), + } + return parsed + + +def inventory_hyperv_vms(parsed): + return [ (vm_name, {'state': vm["state"] }) + for (vm_name, vm) + in parsed.items() ] + + +def check_hyperv_vms(item, params, parsed): + if item in parsed: + vm = parsed[item] + if vm["state"] == params['state']: + state = 0 + message = "State is %s (%s)" % (vm["state"], vm["state_msg"]) + else: + message = "State has changed from %s to %s (%s)" % ( + params['state'],\ + vm["state"], + vm["state_msg"]) + state = 2 + return state, message + check_info["hyperv_vms"] = { + "parse_function" : parse_hyperv_vms, "check_function" : check_hyperv_vms, "inventory_function" : inventory_hyperv_vms, - "service_description" : "hyperv_vms", - "has_perfdata" : False, + "service_description" : "VM %s", } diff --git a/modules/check_mk.py b/modules/check_mk.py index 1f2abf0..3f24123 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -370,6 +370,7 @@ old_service_descriptions = { "ps.perf" : "proc_%s", "wmic_process" : "proc_%s", "logwatch" : "LOG %s", + "hyperv_vm" : "hyperv_vms", } use_new_descriptions_for = [] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 52c6a6e..4fdac7d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15901,6 +15901,7 @@ def create_sample_config(): "wmic_process", "logwatch", "cmk-inventory", + "hyperv_vms", ], "inventory_check_interval": 120, "enable_rulebased_notifications": True, diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 626e839..8e55d5e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1106,6 +1106,7 @@ register_configvar(group, ( "wmic_process", _("Ressource consumption of windows processes")), ( "logwatch", _("Check logfiles for relevant new messages")), ( "cmk-inventory", _("Monitor hosts for unchecked services (Check_MK inventory)")), + ( "hyperv_vms", _("Hyper-V Server: State of VMs")), ], render_orientation = "vertical", ),

9 years, 10 months

Check_MK Git: check_mk: #1693 Added search form to global settings page

by Lars Michelsen

Module: check_mk Branch: master Commit: a7d748e898767b53146ff65c9ba7c1c1e9575154 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7d748e898767b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 15:53:14 2014 +0100 #1693 Added search form to global settings page It is not always easy to find a global setting in the number of foldable containers which all can be folded by default. To find a setting one might have to open multiple of the containers to get to the requested option. This search form should make it easier to find a needed option. --- .werks/1693 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 54 ++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/.werks/1693 b/.werks/1693 new file mode 100644 index 0000000..e092730 --- /dev/null +++ b/.werks/1693 @@ -0,0 +1,13 @@ +Title: Added search form to global settings page +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1418050203 +Class: feature + +It is not always easy to find a global setting in the number of +foldable containers which all can be folded by default. To find +a setting one might have to open multiple of the containers to +get to the requested option. This search form should make it +easier to find a needed option. diff --git a/ChangeLog b/ChangeLog index 6b3c831..1ea1273 100644 --- a/ChangeLog +++ b/ChangeLog @@ -204,6 +204,7 @@ * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... * 1689 Creating WATO backends for each configured site now... * 1690 Pending changes can now be discarded... + * 1693 Added search form to global settings page... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dd20af9..0cc26bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7377,8 +7377,15 @@ def mode_ldap_config(phase): # '----------------------------------------------------------------------' def mode_globalvars(phase): + search = html.var("search") + if search != None: + search = search.strip().lower() + if phase == "title": - return _("Global configuration settings for Check_MK") + if search: + return _("Global configuration settings matching %s") % html.attrencode(search) + else: + return _("Global configuration settings for Check_MK") elif phase == "buttons": global_buttons() @@ -7436,11 +7443,24 @@ def mode_globalvars(phase): else: return - render_global_configuration_variables(default_values, current_settings) + render_global_configuration_variables(default_values, current_settings, search=search) -def render_global_configuration_variables(default_values, current_settings, show_all = False): +def render_global_configuration_variables(default_values, current_settings, show_all=False, search=None): groupnames = g_configvar_groups.keys() groupnames.sort() + + html.begin_form("search") + html.write(_("Search for settings: ")) + html.text_input("search", size=32) + html.hidden_fields() + html.hidden_field("mode", "globalvars") + html.set_focus("search") + html.write(" ") + html.button("_do_seach", _("Search")) + html.end_form() + html.write('<br>') + + at_least_one_painted = False html.write('<div class=globalvars>') for groupname in groupnames: header_is_painted = False # needed for omitting empty groups @@ -7456,15 +7476,25 @@ def render_global_configuration_variables(default_values, current_settings, show else: continue + help_text = type(valuespec.help()) == unicode and valuespec.help().encode("utf-8") or valuespec.help() or '' + title_text = type(valuespec.title()) == unicode and valuespec.title().encode("utf-8") or valuespec.title() + + if search and search not in groupname \ + and search not in domain \ + and search not in varname \ + and search not in help_text \ + and search not in title_text: + continue # skip variable when search is performed and nothing matches + at_least_one_painted = True + if not header_is_painted: - forms.header(groupname, isopen=False) + # always open headers when searching + forms.header(groupname, isopen=search) header_is_painted = True defaultvalue = default_values.get(varname, valuespec.default_value()) edit_url = make_link([("mode", "edit_configvar"), ("varname", varname), ("site", html.var("site", ""))]) - help_text = type(valuespec.help()) == unicode and valuespec.help().encode("utf-8") or valuespec.help() or '' - title_text = type(valuespec.title()) == unicode and valuespec.title().encode("utf-8") or valuespec.title() title = '<a href="%s" class=%s title="%s">%s</a>' % \ (edit_url, varname in current_settings and '"modified"' or '""', html.strip_tags(help_text), title_text) @@ -7495,7 +7525,11 @@ def render_global_configuration_variables(default_values, current_settings, show "snapin_switch_" + (defaultvalue and "on" or "off")) else: html.write('<a href="%s">%s</a>' % (edit_url, to_text)) - forms.end() + + if header_is_painted: + forms.end() + if not at_least_one_painted: + html.message(_('Did not find any global setting matching your search.')) html.write('</div>') @@ -10107,7 +10141,7 @@ def mode_edit_site_globals(phase): html.show_error(_("This site is not a replication slave. You cannot configure specific settings for it.")) return - render_global_configuration_variables(default_values, current_settings, show_all = True) + render_global_configuration_variables(default_values, current_settings, show_all=True) def create_site_globals_file(siteid, tmp_dir): if not os.path.exists(tmp_dir): @@ -13839,8 +13873,8 @@ def mode_rulesets(phase, group=None): help = _("Here you can create explicit checks that are not being created by the automatic service discovery.") only_used = False elif search != None: - title = _("Rules matching ") + search - help = _("All rules that contain '%s' in their name") % search + title = _("Rules matching ") + html.attrencode(search) + help = _("All rules that contain '%s' in their name") % html.attrencode(search) only_used = False else: title, help = g_rulegroups.get(group, (group, None))

9 years, 10 months

Check_MK Git: check_mk: #1692 FIX Aggregations with umlauts in title/ topic can now be displayed in BI/Availability

by Lars Michelsen

Module: check_mk Branch: master Commit: 9a2760ca63631444d0f1e27a0afd0341596ed3cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a2760ca636314… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 15:24:08 2014 +0100 #1692 FIX Aggregations with umlauts in title/topic can now be displayed in BI/Availability --- .werks/1692 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/bi.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1692 b/.werks/1692 new file mode 100644 index 0000000..4be6b1e --- /dev/null +++ b/.werks/1692 @@ -0,0 +1,9 @@ +Title: Aggregations with umlauts in title/topic can now be displayed in BI/Availability +Level: 1 +Component: bi +Compatible: compat +Version: 1.2.5i7 +Date: 1418048520 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e1484fd..6b3c831 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... * 1559 FIX: Fix link from BI icon to BI views (aggregations affected by this host/service) + * 1692 FIX: Aggregations with umlauts in title/topic can now be displayed in BI/Availability Event Console: * 1169 Added host state type filter to "recent event history" view diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index 51fa55c..e4087c5 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -75,10 +75,10 @@ class BITextFilter(Filter): html.text_input(self.htmlvars[0]) def heading_info(self): - return html.var(self.htmlvars[0]) + return html.var_utf8(self.htmlvars[0]) def filter_table(self, rows): - val = html.var(self.htmlvars[0]) + val = html.var_utf8(self.htmlvars[0]) if not val: return rows if self.how == "regex":

9 years, 10 months

Check_MK Git: check_mk: #1690 Pending changes can now be discarded

by Lars Michelsen

Module: check_mk Branch: master Commit: e95ddf70132b950983657eb8f1ac1cd5733efa01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e95ddf70132b95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 14:29:01 2014 +0100 #1690 Pending changes can now be discarded We added a button to the "activate changes" page which can be used to discard the currently pending changes. This is done by applying the last automatically created snapshot and activating it. --- .werks/1690 | 11 ++++ ChangeLog | 1 + web/htdocs/images/icon_discard.png | Bin 0 -> 3550 bytes web/htdocs/js/wato.js | 6 ++- web/htdocs/wato.py | 101 ++++++++++++++++++++++++------------ 5 files changed, 86 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e95ddf7013…

9 years, 10 months

Check_MK Git: check_mk: Cleaned up naming of the WATO audit log

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fcad390e7cb5d7ef1489a7690b5582a73b80af8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fcad390e7cb5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 14:37:04 2014 +0100 Cleaned up naming of the WATO audit log --- web/htdocs/wato.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 81cc79f..dd20af9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4587,7 +4587,7 @@ def create_random_hosts(folder, count, folders, levels): # '----------------------------------------------------------------------' def mode_auditlog(phase): if phase == "title": - return _("Audit logfile") + return _("Audit Log") elif phase == "buttons": home_button() @@ -4596,7 +4596,7 @@ def mode_auditlog(phase): html.context_button(_("Download"), html.makeactionuri([("_action", "csv")]), "download") if config.may("wato.edit"): - html.context_button(_("Clear Logfile"), + html.context_button(_("Clear Log"), html.makeactionuri([("_action", "clear")]), "trash") return @@ -4612,7 +4612,7 @@ def mode_auditlog(phase): audit = parse_audit_log("audit") if len(audit) == 0: - html.write("<div class=info>" + _("The audit logfile is empty.") + "</div>") + html.write("<div class=info>" + _("The audit log is empty.") + "</div>") else: render_audit_log(audit, "audit") @@ -4661,7 +4661,7 @@ def mode_changelog(phase): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") if config.may("wato.auditlog"): - html.context_button(_("Audit log"), make_link([("mode", "auditlog")]), "auditlog") + html.context_button(_("Audit Log"), make_link([("mode", "auditlog")]), "auditlog") elif phase == "action": action = html.var("_action") @@ -5094,11 +5094,11 @@ def clear_audit_log(): os.rename(path, newpath) def clear_audit_log_after_confirm(): - c = wato_confirm(_("Confirm deletion of audit logfile"), - _("Do you really want to clear audit logfile?")) + c = wato_confirm(_("Confirm deletion of audit log"), + _("Do you really want to clear the audit log?")) if c: clear_audit_log() - return None, _("Cleared audit logfile.") + return None, _("Cleared audit log.") elif c == False: # not yet confirmed return "" else: @@ -5245,7 +5245,7 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): htmlcode = '' if what == 'audit': log, times = paged_log(log) - empty_msg = _("The logfile is empty. No host has been created or changed yet.") + empty_msg = _("The log is empty. No host has been created or changed yet.") elif what == 'pending': empty_msg = _("No pending changes, monitoring server is up to date.") @@ -5254,7 +5254,7 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): return elif what == 'audit': - htmlcode += "<h3>" + _("Audit logfile for %s") % fmt_date(times[0]) + "</h3>" + htmlcode += "<h3>" + _("Audit log for %s") % fmt_date(times[0]) + "</h3>" elif what == 'pending': if is_distributed(): @@ -18468,7 +18468,7 @@ def load_plugins(): [ "admin", ]) config.declare_permission("wato.auditlog", - _("Audit log"), + _("Audit Log"), _("Access to the historic audit log. A user with write " "access can delete the audit log. " "The currently pending changes can be seen by all users "

9 years, 10 months

Check_MK Git: check_mk: #1691 FIX Fixed problem when watching BI aggregations with umlauts in titles or group name

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f99ab4fce11167cd76bbc9e418f843c2d3738d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f99ab4fce1116… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 14:57:44 2014 +0100 #1691 FIX Fixed problem when watching BI aggregations with umlauts in titles or group name --- .werks/1691 | 9 +++++++++ ChangeLog | 1 + web/htdocs/bi.py | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1691 b/.werks/1691 new file mode 100644 index 0000000..92c6635 --- /dev/null +++ b/.werks/1691 @@ -0,0 +1,9 @@ +Title: Fixed problem when watching BI aggregations with umlauts in titles or group name +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418047044 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0fc2540..96ab0c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -186,6 +186,7 @@ * 1683 FIX: Replaced a lot of old GIF images with better looking PNG images * 1687 FIX: Add visual to dashboard menu can now be closed with click anywhere on page * 1709 FIX: Fix exception when a non-Ascii character is part of the variable part of a view title + * 1691 FIX: Fixed problem when watching BI aggregations with umlauts in titles or group name WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 9fcbac7..753a76a 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1405,7 +1405,7 @@ def ajax_set_assumption(): save_assumptions() def ajax_save_treestate(): - path_id = html.var("path") + path_id = html.var_utf8("path") current_ex_level, path = path_id.split(":", 1) current_ex_level = int(current_ex_level) @@ -1419,9 +1419,9 @@ def ajax_save_treestate(): save_ex_level(current_ex_level) def ajax_render_tree(): - aggr_group = html.var("group") + aggr_group = html.var_utf8("group") reqhosts = [ tuple(sitehost.split('#')) for sitehost in html.var("reqhosts").split(',') ] - aggr_title = html.var("title") + aggr_title = html.var_utf8("title") omit_root = not not html.var("omit_root") boxes = not not html.var("boxes") only_problems = not not html.var("only_problems")

9 years, 10 months

Check_MK Git: check_mk: Fix recently introduced new bug when installing mkps via mkp install

by Mathias Kettner

Module: check_mk Branch: master Commit: 12813f655f8854e372c7888c74dc49d556a78f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12813f655f8854… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:56:45 2014 +0100 Fix recently introduced new bug when installing mkps via mkp install --- modules/packaging.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/packaging.py b/modules/packaging.py index 6808a43..d388d60 100644 --- a/modules/packaging.py +++ b/modules/packaging.py @@ -379,6 +379,7 @@ def package_install(args): if not data: break tardest.write(data) + tardest.close() # Fix permissions of extracted files for filename in filenames:

9 years, 10 months

Check_MK Git: check_mk: #1711 FIX win_printers.ps1: ignore temporary printers created by RDP terminal sessions

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d7503a9963d9b1bfcb9ad5115c52d41f1204814 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d7503a9963d9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:35:00 2014 +0100 #1711 FIX win_printers.ps1: ignore temporary printers created by RDP terminal sessions Thanks to Ruben Bosch. --- .werks/1711 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/win_printers.ps1 | 21 +++++++++++---------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.werks/1711 b/.werks/1711 new file mode 100644 index 0000000..f02f219 --- /dev/null +++ b/.werks/1711 @@ -0,0 +1,9 @@ +Title: win_printers.ps1: ignore temporary printers created by RDP terminal sessions +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418045670 +Class: fix + +Thanks to Ruben Bosch. diff --git a/ChangeLog b/ChangeLog index 7f1614a..3b8444f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 1658 FIX: agent_vsphere: no longer crashes when decommissioned vms report no hardware information... * 1708 FIX: cups_queues: fix outputting of current printer jobs if printer daemon is CUPS... * 1710 FIX: omd_status: Fix totally missing section in Linux agent... + * 1711 FIX: win_printers.ps1: ignore temporary printers created by RDP terminal sessions... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/windows/plugins/win_printers.ps1 b/agents/windows/plugins/win_printers.ps1 index 2e8cd0f..3213c62 100644 --- a/agents/windows/plugins/win_printers.ps1 +++ b/agents/windows/plugins/win_printers.ps1 @@ -1,5 +1,5 @@ #### -# +# # http://blogs.msdn.com/b/powershell/archive/2012/07/13/join-object.aspx # #### @@ -20,6 +20,7 @@ $pswindow.buffersize = $newsize Write-Host -NoNewLine "<<<win_printers>>>" $Data_Set1 = Get-WMIObject Win32_PerfFormattedData_Spooler_PrintQueue | Select Name, @{Expression={$_.jobs};Label="CurrentJobs"} $Data_Set2 = Get-WmiObject win32_printer | select name, printerstatus, detectederrorstate +$Data_Set2 = Get-WmiObject win32_printer | ?{$_.PortName -notmatch '^TS'} | Select name, printerstatus, detectederrorstate function AddItemProperties($item, $properties, $output) @@ -34,18 +35,18 @@ function AddItemProperties($item, $properties, $output) $hashName=$propertyHash["name"] -as [string] if($hashName -eq $null) { - throw "there should be a string Name" + throw "there should be a string Name" } - + $expression=$propertyHash["expression"] -as [scriptblock] if($expression -eq $null) { - throw "there should be a ScriptBlock Expression" + throw "there should be a ScriptBlock Expression" } - + $_=$item $expressionValue=& $expression - + $output | add-member -MemberType "NoteProperty" -Name $hashName -Value $expressionValue } else @@ -63,7 +64,7 @@ function AddItemProperties($item, $properties, $output) } } - + function WriteJoinObjectOutput($leftItem, $rightItem, $leftProperties, $rightProperties, $Type) { $output = new-object psobject @@ -158,7 +159,7 @@ function Join-Object # a list of the matches in right for each object in left $leftMatchesInRight = new-object System.Collections.ArrayList - # the count for all matches + # the count for all matches $rightMatchesCount = New-Object "object[]" $Right.Count for($i=0;$i -lt $Right.Count;$i++) @@ -205,7 +206,7 @@ function Join-Object $null = $leftItemMatchesInRight.Add($rightItem) $rightMatchesCount[$i]++ } - + } } @@ -214,7 +215,7 @@ function Join-Object { $leftItemMatchesInRight=$leftMatchesInRight[$i] $leftItem=$left[$i] - + if($leftItemMatchesInRight.Count -eq 0) { if($Type -ne "OnlyIfInBoth")

9 years, 10 months

Check_MK Git: check_mk: #1710 FIX omd_status: Fix totally missing section in Linux agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 28c844617cd31c606d59d08467039c235c4a5d13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28c844617cd31c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:30:31 2014 +0100 #1710 FIX omd_status: Fix totally missing section in Linux agent Reason was an invalid call to <tt>run_cached</tt>. As a result the agent section <tt>omd_status</tt> was always empty. This has been fixed. --- .werks/1710 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1710 b/.werks/1710 new file mode 100644 index 0000000..6e5dfcc --- /dev/null +++ b/.werks/1710 @@ -0,0 +1,10 @@ +Title: omd_status: Fix totally missing section in Linux agent +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418045381 +Class: fix + +Reason was an invalid call to <tt>run_cached</tt>. As a result the agent section +<tt>omd_status</tt> was always empty. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 5e46b51..7f1614a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation * 1658 FIX: agent_vsphere: no longer crashes when decommissioned vms report no hardware information... * 1708 FIX: cups_queues: fix outputting of current printer jobs if printer daemon is CUPS... + * 1710 FIX: omd_status: Fix totally missing section in Linux agent... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 3dbaaa1..5f925e1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -529,7 +529,7 @@ fi # Check status of OMD sites if type omd >/dev/null then - run_cached omd_status 60 "echo '<<<omd_status>>>' ; omd status --bare --auto" + run_cached -s omd_status 60 "omd status --bare --auto" fi

9 years, 10 months

Check_MK Git: check_mk: check_mk_agent.linux: prevent creation of nohup.out by cached checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c45263d4714f4d5f0d49b2d9e5b615c1b774faa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c45263d4714f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:29:37 2014 +0100 check_mk_agent.linux: prevent creation of nohup.out by cached checks --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a0d7b78..3dbaaa1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -100,7 +100,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash 2>/dev/null & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & fi }

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits