Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4141 FIX Fixed possible exception in web cron: argument of type 'NoneType' is not iterable (g_host_attribute)

by Lars Michelsen

Module: check_mk Branch: master Commit: 004791e564d909bd05d4ba18ab4c7577b9d11708 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=004791e564d909… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 11:51:01 2016 +0100 4141 FIX Fixed possible exception in web cron: argument of type 'NoneType' is not iterable (g_host_attribute) Change-Id: Ieb9b9e9b8219983097aa3316ce7e116e97e3524e --- .werks/4141 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 16 ++++++++-------- web/htdocs/watolib.py | 30 ++++++++++++++++++++---------- 4 files changed, 38 insertions(+), 18 deletions(-) diff --git a/.werks/4141 b/.werks/4141 new file mode 100644 index 0000000..56188ec --- /dev/null +++ b/.werks/4141 @@ -0,0 +1,9 @@ +Title: Fixed possible exception in web cron: argument of type 'NoneType' is not iterable (g_host_attribute) +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i3 +Date: 1481799024 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 79fe8bb..62ba1e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 4133 FIX: Do not suppress site specific global issues during WATO activation * 4134 FIX: Unified ineffective rulesets view with other ruleset list views * 3999 FIX: Added core restart note to bulk host rename page + * 4141 FIX: Fixed possible exception in web cron: argument of type 'NoneType' is not iterable (g_host_attribute) * 4150 FIX: Avoid exception in host search when searching for empty texts Notifications: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5cbadf4..65a374a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14447,7 +14447,7 @@ def save_changed_custom_attrs(all_attrs, what): def declare_custom_host_attrs(): # First remove all previously registered custom host attributes - for attr_name in g_host_attribute.keys(): + for attr_name in all_host_attribute_names(): if attr_name not in builtin_host_attribute_names and not\ attr_name.startswith("tag_"): undeclare_host_attribute(attr_name) @@ -16350,14 +16350,13 @@ loaded_with_language = False def load_plugins(force): global builtin_host_attribute_names - # Do not cache the custom attributes. They can be created by the user - # during runtime, means they need to be loaded during each page request. - # But delete the old definitions before to also apply removals of attributes - if builtin_host_attribute_names: - declare_custom_host_attrs() - global loaded_with_language if loaded_with_language == current_language and not force: + # Do not cache the custom attributes. They can be created by the user + # during runtime, means they need to be loaded during each page request. + # But delete the old definitions before to also apply removals of attributes + if builtin_host_attribute_names: + declare_custom_host_attrs() return # Reset global vars @@ -16365,6 +16364,7 @@ def load_plugins(force): extra_buttons = [] modules = [] + initialize_host_attribute_structures() undeclare_all_host_attributes() load_notification_table() initialize_global_configvars() @@ -16620,7 +16620,7 @@ def load_plugins(force): declare_host_tag_attributes(force = True) - builtin_host_attribute_names = g_host_attribute.keys() + builtin_host_attribute_names = all_host_attribute_names() declare_custom_host_attrs() # This must be set after plugin loading to make broken plugins raise diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a41460c..f47438a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -65,9 +65,11 @@ replication_paths = [] backup_paths = [] backup_domains = {} automation_commands = {} +g_rulespecs = None def initialize_before_loading_plugins(): - g_rulespecs.clear() + if g_rulespecs: + g_rulespecs.clear() # Directories and files to synchronize during replication global replication_paths @@ -2918,16 +2920,20 @@ class ContactGroupsAttribute(Attribute): return True -# Global datastructure holding all attributes (in a defined order) -# as pairs of (attr, topic). Topic is the title under which the -# attribute is being displayed. All builtin attributes use the -# topic None. As long as only one topic is used, no topics will -# be displayed. They are useful if you have a great number of -# custom attributes. -g_host_attributes = [] +def initialize_host_attribute_structures(): + global g_host_attributes, g_host_attribute + + # Global datastructure holding all attributes (in a defined order) + # as pairs of (attr, topic). Topic is the title under which the + # attribute is being displayed. All builtin attributes use the + # topic None. As long as only one topic is used, no topics will + # be displayed. They are useful if you have a great number of + # custom attributes. + g_host_attributes = [] + + # Dictionary for quick access + g_host_attribute = {} -# Dictionary for quick access -g_host_attribute = {} # Declare attributes with this method def declare_host_attribute(a, show_in_table = True, show_in_folder = True, show_in_host_search = True, @@ -2971,6 +2977,10 @@ def all_host_attributes(): return g_host_attributes +def all_host_attribute_names(): + return g_host_attribute.keys() + + def host_attribute(name): return g_host_attribute[name]

7 years, 9 months

Cleaned up togglebutton a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ef39def0bea2d47c79f4b3af3ce2e283a0e979e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ef39def0bea2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 15 12:08:53 2016 +0100 Cleaned up togglebutton a bit Change-Id: I1af05f9bc5d5bd2fee7432bd30ed6ef6daf56768 --- web/htdocs/views.py | 57 ++++++++++++++++++++++++----------------------------- web/htdocs/wato.py | 10 ++++++++++ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ccabfb0..a4c1cbc 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1994,7 +1994,7 @@ def view_optiondial(view, option, choices, help): def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option) -# FIXME: Consolidate toggle rendering functions +# FIXME: Consolidate with html.toggle_button() rendering functions def toggler(id, icon, help, onclick, value, hidden = False): html.begin_context_buttons() # just to be sure hide = hidden and ' style="display:none"' or '' @@ -2023,25 +2023,25 @@ def ajax_set_viewoption(): po.save_to_config() -# FIXME: Consolidate toggle rendering functions -def togglebutton_off(id, icon, hidden = False): - html.begin_context_buttons() - hide = hidden and ' style="display:none"' or '' - html.write('<div id="%s_off" class="togglebutton off %s"%s>' - '<img src="images/icon_%s.png"></div>' % (id, icon, hide, icon)) +def togglebutton(id, isopen, icon, help, hidden=False, disabled=False): + html.begin_context_buttons() # TODO: Check all calls. If done before, remove this! - -# FIXME: Consolidate toggle rendering functions -def togglebutton(id, isopen, icon, help, hidden = False): - html.begin_context_buttons() - if isopen: - cssclass = "down" + if disabled: + state = "off" if disabled else "on" + cssclass = "" + help = "" else: - cssclass = "up" + state = "on" + if isopen: + cssclass = "down" + else: + cssclass = "up" + hide = hidden and ' style="display:none"' or '' - html.write('<div id="%s_on" class="togglebutton %s %s" title="%s" ' + html.write('<div id="%s_%s" class="togglebutton %s %s %s" title="%s" ' 'onclick="view_toggle_form(this, \'%s\');"%s>' - '<img src="images/icon_%s.png"></div>' % (id, icon, cssclass, help, id, hide, icon)) + '<img src="images/icon_%s.png"></div>' % \ + (id, state, state, icon, cssclass, help, id, hide, icon)) def show_context_links(thisview, show_filters, @@ -2054,34 +2054,29 @@ def show_context_links(thisview, show_filters, filter_isopen = html.var("filled_in") != "filter" and thisview.get("mustsearch") if display_options.enabled(display_options.F): - if len(show_filters) > 0: - if html.var("filled_in") == "filter": - icon = "filters_set" - help = _("The current data is being filtered") - else: - icon = "filters" - help = _("Set a filter for refining the shown data") - togglebutton("filters", filter_isopen, icon, help) + if html.var("filled_in") == "filter": + icon = "filters_set" + help = _("The current data is being filtered") else: - togglebutton_off("filters", "filters") + icon = "filters" + help = _("Set a filter for refining the shown data") + togglebutton("filters", filter_isopen, icon, help, disabled=not show_filters) if display_options.enabled(display_options.D): - if painter_options.painter_option_form_enabled(): - togglebutton("painteroptions", False, "painteroptions", _("Modify display options")) - else: - togglebutton_off("painteroptions", "painteroptions") + togglebutton("painteroptions", False, "painteroptions", _("Modify display options"), + disabled=not painter_options.painter_option_form_enabled()) if display_options.enabled(display_options.C): togglebutton("commands", False, "commands", _("Execute commands on hosts, services and other objects"), hidden = not enable_commands) - togglebutton_off("commands", "commands", hidden = enable_commands) + togglebutton("commands", False, "commands", "", hidden=enable_commands, disabled=True) selection_enabled = (enable_commands and enable_checkboxes) or thisview.get("force_checkboxes") if not thisview.get("force_checkboxes"): toggler("checkbox", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands"), "location.href='%s';" % html.makeuri([('show_checkboxes', show_checkboxes and '0' or '1')]), show_checkboxes, hidden = True) # not selection_enabled) - togglebutton_off("checkbox", "checkbox", hidden = not thisview.get("force_checkboxes")) + togglebutton("checkbox", False, "checkbox", "", hidden=not thisview.get("force_checkboxes"), disabled=True) html.javascript('g_selection_enabled = %s;' % (selection_enabled and 'true' or 'false')) if display_options.enabled(display_options.O): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 65a374a..640ff2b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11984,6 +11984,16 @@ def mode_rulesets(phase, group=None): return title elif phase == "buttons": + if html.has_var("filtered"): + filter_isopen = True + icon = "filters_set" + help = _("The current data is being filtered") + else: + filter_isopen = False + icon = "filters" + help = _("Set a filter for refining the shown data") + togglebutton("filters", filter_isopen, icon, help) + if only_host: home_button() if group != "static":

7 years, 9 months

Fixed several issues in refactored code

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a9b1a381c47c5625b0935b30414a4974bc59168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a9b1a381c47c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 13 17:07:15 2016 +0100 Fixed several issues in refactored code Change-Id: Ib05dcf9059850d44bd251522019da7b6dfeb9ac8 --- web/htdocs/wato.py | 203 +++++++++++++++----------------- web/htdocs/watolib.py | 315 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 280 insertions(+), 238 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a9b1a381c…

7 years, 9 months

Cleanup: Moved active checks from doc/treasures to top level dir

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fa079cd860f38d963481d9548598d1893c6173a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa079cd860f38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 19:00:08 2016 +0100 Cleanup: Moved active checks from doc/treasures to top level dir Change-Id: Ia335c8ebf3ee13da76f0ecef8698d95417c8dc54 --- Makefile | 3 ++- {doc/treasures/active_checks => active_checks}/.f12 | 0 {doc/treasures/active_checks => active_checks}/.gitignore | 0 {doc/treasures/active_checks => active_checks}/Makefile | 0 {doc/treasures/active_checks => active_checks}/check_bi_aggr | 0 {doc/treasures/active_checks => active_checks}/check_cpu_peaks | 0 {doc/treasures/active_checks => active_checks}/check_form_submit | 0 {doc/treasures/active_checks => active_checks}/check_mail | 0 {doc/treasures/active_checks => active_checks}/check_mail_loop | 0 {doc/treasures/active_checks => active_checks}/check_mailboxes | 0 {doc/treasures/active_checks => active_checks}/check_mkevents.cc | 0 {doc/treasures/active_checks => active_checks}/check_mkevents.py | 0 {doc/treasures/active_checks => active_checks}/check_notify_count | 0 {doc/treasures/active_checks => active_checks}/check_sql | 0 {doc/treasures/active_checks => active_checks}/check_traceroute | 0 {doc/treasures/active_checks => active_checks}/check_uniserv | 0 scripts/setup.sh | 3 +++ tests/general/test_find_debug_print.py | 2 +- tests/general/test_permissions.py | 2 +- tests/pylint/test_pylint_misc.py | 2 +- 20 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5f18586..36b142a 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \ - bin/mkeventd bin/*.c doc/treasures/active_checks/* \ + bin/mkeventd bin/*.c active_checks/* \ check_mk_templates.cfg \ agents/check_mk_*agent* agents/*.c \ $$(find agents/cfg_examples -type f) \ @@ -113,6 +113,7 @@ dist: mk-livestatus tar czf $(DISTNAME)/share.tar.gz $(TAROPTS) check_mk_templates.cfg tar czf $(DISTNAME)/werks.tar.gz $(TAROPTS) -C .werks $$(cd .werks ; ls [0-9]*) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) + tar czf $(DISTNAME)/active_checks.tar.gz $(TAROPTS) -C active_checks $$(cd active_checks ; ls) tar czf $(DISTNAME)/notifications.tar.gz $(TAROPTS) -C notifications $$(cd notifications ; ls) tar czf $(DISTNAME)/inventory.tar.gz $(TAROPTS) -C inventory $$(cd inventory ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) diff --git a/doc/treasures/active_checks/.f12 b/active_checks/.f12 similarity index 100% rename from doc/treasures/active_checks/.f12 rename to active_checks/.f12 diff --git a/doc/treasures/active_checks/.gitignore b/active_checks/.gitignore similarity index 100% rename from doc/treasures/active_checks/.gitignore rename to active_checks/.gitignore diff --git a/doc/treasures/active_checks/Makefile b/active_checks/Makefile similarity index 100% rename from doc/treasures/active_checks/Makefile rename to active_checks/Makefile diff --git a/doc/treasures/active_checks/check_bi_aggr b/active_checks/check_bi_aggr similarity index 100% rename from doc/treasures/active_checks/check_bi_aggr rename to active_checks/check_bi_aggr diff --git a/doc/treasures/active_checks/check_cpu_peaks b/active_checks/check_cpu_peaks similarity index 100% rename from doc/treasures/active_checks/check_cpu_peaks rename to active_checks/check_cpu_peaks diff --git a/doc/treasures/active_checks/check_form_submit b/active_checks/check_form_submit similarity index 100% rename from doc/treasures/active_checks/check_form_submit rename to active_checks/check_form_submit diff --git a/doc/treasures/active_checks/check_mail b/active_checks/check_mail similarity index 100% rename from doc/treasures/active_checks/check_mail rename to active_checks/check_mail diff --git a/doc/treasures/active_checks/check_mail_loop b/active_checks/check_mail_loop similarity index 100% rename from doc/treasures/active_checks/check_mail_loop rename to active_checks/check_mail_loop diff --git a/doc/treasures/active_checks/check_mailboxes b/active_checks/check_mailboxes similarity index 100% rename from doc/treasures/active_checks/check_mailboxes rename to active_checks/check_mailboxes diff --git a/doc/treasures/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc similarity index 100% rename from doc/treasures/active_checks/check_mkevents.cc rename to active_checks/check_mkevents.cc diff --git a/doc/treasures/active_checks/check_mkevents.py b/active_checks/check_mkevents.py similarity index 100% rename from doc/treasures/active_checks/check_mkevents.py rename to active_checks/check_mkevents.py diff --git a/doc/treasures/active_checks/check_notify_count b/active_checks/check_notify_count similarity index 100% rename from doc/treasures/active_checks/check_notify_count rename to active_checks/check_notify_count diff --git a/doc/treasures/active_checks/check_sql b/active_checks/check_sql similarity index 100% rename from doc/treasures/active_checks/check_sql rename to active_checks/check_sql diff --git a/doc/treasures/active_checks/check_traceroute b/active_checks/check_traceroute similarity index 100% rename from doc/treasures/active_checks/check_traceroute rename to active_checks/check_traceroute diff --git a/doc/treasures/active_checks/check_uniserv b/active_checks/check_uniserv similarity index 100% rename from doc/treasures/active_checks/check_uniserv rename to active_checks/check_uniserv diff --git a/scripts/setup.sh b/scripts/setup.sh index e088bb8..1c8ca37 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -478,6 +478,7 @@ modulesdir=$sharedir/modules web_dir=$sharedir/web localedir=$sharedir/locale agentsdir=$sharedir/agents +activechecksdir=${check_icmp_pathr%/*} if [ -z "$YES" ] then @@ -749,6 +750,8 @@ do mkdir -p $DESTDIR$localedir && mkdir -p $DESTDIR$checksdir && tar xzf $SRCDIR/checks.tar.gz -C $DESTDIR$checksdir && + mkdir -p $DESTDIR$activechecksdir && + tar xzf $SRCDIR/active_checks.tar.gz -C $DESTDIR$activechecksdir && mkdir -p $DESTDIR$notificationsdir && tar xzf $SRCDIR/notifications.tar.gz -C $DESTDIR$notificationsdir && mkdir -p $DESTDIR$inventorydir && diff --git a/tests/general/test_find_debug_print.py b/tests/general/test_find_debug_print.py index 9725bd4..293bc94 100644 --- a/tests/general/test_find_debug_print.py +++ b/tests/general/test_find_debug_print.py @@ -12,7 +12,7 @@ check_paths = [ "checks", "inventory", "notifications", - "doc/treasures/active_checks", + "active_checks", # CMC specific "agents/bakery", # TODO: Update all agent plugins to use sys.stdout.write instead of print diff --git a/tests/general/test_permissions.py b/tests/general/test_permissions.py index 4fea257..0d54475 100644 --- a/tests/general/test_permissions.py +++ b/tests/general/test_permissions.py @@ -13,7 +13,7 @@ def is_not_executable(path): permissions = [ # globbing pattern check function, excludes - ('doc/treasures/active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), + ('active_checks/*', is_executable, ['Makefile', 'check_mkevents.cc']), ('agents/special/*', is_executable, []), ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), ('agents/plugins/*', is_executable, ['README']), diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index ede344e..642ab72 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -15,7 +15,7 @@ def test_pylint_misc(): "bin", "notifications", "agents/plugins", - "doc/treasures/active_checks", + "active_checks", "../cmc/agents/plugins", "../cmc/bin", "../cmc/misc",

7 years, 9 months

4171 FIX perle_psmu: fixed value error

by Simon Betz

Module: check_mk Branch: master Commit: db9960c6b70b6c2bd4790d3a237d31d236a99bec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db9960c6b70b6c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 19 08:25:19 2016 +0100 4171 FIX perle_psmu: fixed value error Some power supplies report no power or voltage if the device state is failed. Change-Id: I20317c70e1d09407bc50a2c33a8ea05806cfd69f --- .werks/4171 | 10 ++++++++++ ChangeLog | 1 + checks/perle_psmu | 10 +++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/4171 b/.werks/4171 new file mode 100644 index 0000000..cb6bd1d --- /dev/null +++ b/.werks/4171 @@ -0,0 +1,10 @@ +Title: perle_psmu: fixed value error +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482132240 + +Some power supplies report no power or voltage if the device state is failed. diff --git a/ChangeLog b/ChangeLog index bab5544..79fe8bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.4.0i4: Checks & Agents: * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs + * 4171 FIX: perle_psmu: fixed value error... 1.4.0i3: diff --git a/checks/perle_psmu b/checks/perle_psmu index 5a1c9a1..85b1ae2 100644 --- a/checks/perle_psmu +++ b/checks/perle_psmu @@ -50,13 +50,17 @@ def parse_perle_psmu(info): parsed = {} for index, name, serial, psu_status, voltage_str, power_str, fan_status in info: - parsed.setdefault("%s %s" % (index, name), { + itemname = "%s %s" % (index, name) + parsed.setdefault(itemname, { "serial" : serial, "fanstate" : map_states[fan_status], "psustate" : map_states[psu_status], - "power" : float(power_str), - "voltage" : float(voltage_str) }) + for what, value_str in [ ("power", power_str), ("voltage", voltage_str) ]: + try: + parsed[itemname].setdefault(what, float(value_str)) + except ValueError: + pass return parsed

7 years, 9 months

Set version to next innovation

by Lars Michelsen

Module: check_mk Branch: master Commit: 608009fc3127aee763c1eed4963aee2dd5be52ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=608009fc3127ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 20:57:46 2016 +0100 Set version to next innovation Change-Id: I9bf1aef4301ae89a875a5891d535b946c0206847 --- .werks/4104 | 2 +- ChangeLog | 5 +++++ Makefile | 2 +- agents/Makefile | 2 +- agents/check-mk-agent-1.4.0i3-1.noarch.rpm | Bin 30328 -> 0 bytes agents/check-mk-agent-1.4.0i4-1.noarch.rpm | Bin 0 -> 30390 bytes agents/check-mk-agent_1.4.0i3-1_all.deb | Bin 21410 -> 0 bytes agents/check-mk-agent_1.4.0i4-1_all.deb | Bin 0 -> 21478 bytes agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.openwrt | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1326592 -> 1326592 bytes agents/windows/check_mk_agent.exe | Bin 1302528 -> 1302528 bytes agents/windows/check_mk_agent.msi | Bin 2898944 -> 2898944 bytes agents/windows/install_agent-64.exe | Bin 585689 -> 585694 bytes agents/windows/install_agent.exe | Bin 582514 -> 582519 bytes agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- bin/mkeventd | 2 +- debian/files | 2 +- lib/__init__.py | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 31 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.werks/4104 b/.werks/4104 index cc3317e..c590e3b 100644 --- a/.werks/4104 +++ b/.werks/4104 @@ -2,7 +2,7 @@ Title: veeam_tapejobs: New check to monitor Veeam tape jobs Level: 1 Component: checks Compatible: compat -Version: 1.4.0i3 +Version: 1.4.0i4 Date: 1481900204 Class: feature diff --git a/ChangeLog b/ChangeLog index 7734834..bab5544 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.4.0i4: + Checks & Agents: + * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs + + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... diff --git a/Makefile b/Makefile index 11e9a68..5f18586 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL := /bin/bash -VERSION := 1.4.0i3 +VERSION := 1.4.0i4 NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin diff --git a/agents/Makefile b/agents/Makefile index c8e09b8..0be2eb5 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.4.0i3 +VERSION = 1.4.0i4 RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) diff --git a/agents/check-mk-agent-1.4.0i3-1.noarch.rpm b/agents/check-mk-agent-1.4.0i3-1.noarch.rpm deleted file mode 100644 index b37c1bc..0000000 Binary files a/agents/check-mk-agent-1.4.0i3-1.noarch.rpm and /dev/null differ diff --git a/agents/check-mk-agent-1.4.0i4-1.noarch.rpm b/agents/check-mk-agent-1.4.0i4-1.noarch.rpm new file mode 100644 index 0000000..3c3693f Binary files /dev/null and b/agents/check-mk-agent-1.4.0i4-1.noarch.rpm differ diff --git a/agents/check-mk-agent_1.4.0i3-1_all.deb b/agents/check-mk-agent_1.4.0i3-1_all.deb deleted file mode 100644 index 7fa4716..0000000 Binary files a/agents/check-mk-agent_1.4.0i3-1_all.deb and /dev/null differ diff --git a/agents/check-mk-agent_1.4.0i4-1_all.deb b/agents/check-mk-agent_1.4.0i4-1_all.deb new file mode 100644 index 0000000..393d23b Binary files /dev/null and b/agents/check-mk-agent_1.4.0i4-1_all.deb differ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 43aa27e..934db96 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -121,7 +121,7 @@ function run_cached { } echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: aix echo Hostname: $(hostname) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index e362471..09501db 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -105,7 +105,7 @@ function run_cached() { } echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index c27b210..d915db4 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -49,7 +49,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2e806af..82fe4df 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -239,7 +239,7 @@ function run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: linux echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 47d16b1..f66775d 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -44,7 +44,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 2fb9ed5..ea0e124 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 4e0ba24..10b84a3 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index c247f6b..e26f5d9 100755 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -163,7 +163,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.4.0i3" +$say "Version: 1.4.0i4" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 6c8e85b..0d22dd8 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -221,7 +221,7 @@ run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: openwrt echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c9f0623..1e73af4 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -124,7 +124,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.4.0i3 +echo Version: 1.4.0i4 echo AgentOS: solaris diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 2573b1e..6c50fd2 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -24,7 +24,7 @@ SHELL = /bin/bash -VERSION = 1.4.0i3 +VERSION = 1.4.0i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres GIT_REV = $(shell git describe --abbrev=4 --dirty --always --tags) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 6fa7bbf..d086565 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 236b7a0..bbcf6b9 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 5a1adcc..a71fbb0 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 75f7ee0..8aaf204 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 2ed26e2..ba8a687 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index b747f48..d703ad6 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.4.0i3" +!define CHECK_MK_VERSION "1.4.0i4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 2dee831..8bc6fba 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.4.0i3" +!define CHECK_MK_VERSION "1.4.0i4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/bin/mkeventd b/bin/mkeventd index 3ca5f08..d86d5f3 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -44,7 +44,7 @@ try: except ImportError: import json -VERSION="1.4.0i3" +VERSION="1.4.0i4" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/debian/files b/debian/files index 6cf018f..c312ddb 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.4.0i3-1_all.deb net optional +check-mk_1.4.0i4-1_all.deb net optional diff --git a/lib/__init__.py b/lib/__init__.py index ed2561c..55bc734 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -29,7 +29,7 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" -__version__ = "1.4.0i3" +__version__ = "1.4.0i4" import os diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 560be2f..9af8614 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.4.0i3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.4.0i4], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([config.h.in]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 7a058c5..e088bb8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.4.0i3 +VERSION=1.4.0i4 NAME=check_mk LANG= LC_ALL=

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 2eb559ca03117ec90d2f5d74a99c8907def1f0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eb559ca03117e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 16 16:56:37 2016 +0100 Fetched livestatus from downstream. Change-Id: I9336ac57e7518b451dc151828273d58a306f8d16 --- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 1 + livestatus/src/TableEventConsole.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index a36454d..3faae1b 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -30,6 +30,7 @@ #include "BlobColumn.h" #include "Column.h" #include "EventConsoleConnection.h" +#include "Logger.h" #include "MonitoringCore.h" using std::make_unique; diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index b5bf706..45afa9e 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -29,6 +29,7 @@ #include <utility> #include "Column.h" #include "EventConsoleConnection.h" +#include "Logger.h" #include "Query.h" using std::ostream;

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ed156042e2f13cb6a36ec59936fe68d0f3af012a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed156042e2f13c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 16 16:45:23 2016 +0100 Fetched livestatus from downstream. Change-Id: I6e014c1aef5eff91a384c6678fa1d587368bd23d --- .../src/DynamicEventConsoleReplicationColumn.cc | 10 +++-- livestatus/src/EventConsoleConnection.cc | 45 ++++++++++++---------- livestatus/src/EventConsoleConnection.h | 8 +++- livestatus/src/TableEventConsole.cc | 9 +++-- 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc b/livestatus/src/DynamicEventConsoleReplicationColumn.cc index 0763e62..a36454d 100644 --- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc +++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc @@ -82,9 +82,13 @@ unique_ptr<Column> DynamicEventConsoleReplicationColumn::createColumn( const std::string &name, const std::string &arguments) { string result; if (_core->mkeventdEnabled()) { - ECTableConnection ec(_core, "REPLICATE " + arguments); - ec.run(); - result = ec.getResult(); + try { + ECTableConnection ec(_core, "REPLICATE " + arguments); + ec.run(); + result = ec.getResult(); + } catch (const generic_error &ge) { + // Nothing to do here, returning an empty result is OK. + } } return make_unique<ReplicationColumn>(name, "replication value", -1, -1, result); diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index 87606cc..46874c8 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -36,40 +36,31 @@ using std::ostringstream; using std::string; EventConsoleConnection::EventConsoleConnection(Logger *logger, string path) - : _path(move(path)), _socket(-1), _logger(logger, [this](ostream &os) { - os << "[mkeventd at " << _path << "] "; - }) {} + : _path(move(path)) + , _name("[mkeventd at " + _path + "]") + , _socket(-1) + , _logger(logger, [this](ostream &os) { os << _name; }) {} void EventConsoleConnection::run() { _socket = socket(PF_UNIX, SOCK_STREAM, 0); if (_socket == -1) { - generic_error ge("cannot create socket"); - Alert(&_logger) << ge; - return; + throwGenericError("cannot create socket"); } - struct sockaddr_un sa; sa.sun_family = AF_UNIX; strncpy(sa.sun_path, _path.c_str(), sizeof(sa.sun_path)); if (connect(_socket, reinterpret_cast<const struct sockaddr *>(&sa), sizeof(sockaddr_un)) == -1) { - generic_error ge("cannot connect"); - Alert(&_logger) << ge; - close(_socket); - return; + throwGenericError("cannot connect"); } Debug(&_logger) << "successfully connected"; - if (!writeRequest()) { - generic_error ge("cannot write"); - Alert(&_logger) << ge; - } else if (!receiveReply()) { - generic_error ge("cannot read"); - Alert(&_logger) << ge; + throwGenericError("cannot write"); } - - Debug(&_logger) << "closing connection"; - close(_socket); + if (!receiveReply()) { + throwGenericError("cannot read"); + } + close(); } // TODO(sp) Horribly inefficient, must be replaced. @@ -95,6 +86,20 @@ bool EventConsoleConnection::getline(string &line) { return false; // unreachable } +void EventConsoleConnection::close() { + if (_socket != -1) { + Debug(&_logger) << "closing connection"; + ::close(_socket); + } +} + +void EventConsoleConnection::throwGenericError(const string &what_arg) { + generic_error ge(_name + " " + what_arg); + Alert(&_logger) << ge; + close(); + throw move(ge); +} + bool EventConsoleConnection::writeRequest() { ostringstream os; sendRequest(os); diff --git a/livestatus/src/EventConsoleConnection.h b/livestatus/src/EventConsoleConnection.h index cb65078..443f59b 100644 --- a/livestatus/src/EventConsoleConnection.h +++ b/livestatus/src/EventConsoleConnection.h @@ -42,9 +42,13 @@ private: virtual void sendRequest(std::ostream &os) = 0; virtual bool receiveReply() = 0; - std::string _path; - int _socket; + void close(); + void throwGenericError(const std::string &what_arg); bool writeRequest(); + + const std::string _path; + const std::string _name; + int _socket; ContextLogger _logger; }; diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 0237aa2..b5bf706 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -100,8 +100,11 @@ TableEventConsole::TableEventConsole(MonitoringCore *core) void TableEventConsole::answerQuery(Query *query) { if (_core->mkeventdEnabled()) { - string internal_name = - name().substr(12); // skip "eventconsole" prefix :-P - ECTableConnection(_core, internal_name, query).run(); + try { + // skip "eventconsole" prefix :-P + ECTableConnection(_core, name().substr(12), query).run(); + } catch (const generic_error &ge) { + query->invalidRequest(ge.what()); + } } }

7 years, 9 months

4104 veeam_tapejobs: New check to monitor Veeam tape jobs

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3aa7f5a88b3541fb36fd807f040a4a24f724e778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aa7f5a88b3541… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 16 15:57:07 2016 +0100 4104 veeam_tapejobs: New check to monitor Veeam tape jobs Change-Id: I854c999570ac2772eea8cc0893dbe7e7ba5bc9ac --- .werks/4104 | 9 ++++ ChangeLog | 1 + agents/windows/plugins/veeam_backup_status.ps1_ | 13 +++++ checkman/veeam_tapejobs | 19 ++++++++ checks/veeam_tapejobs | 65 +++++++++++++++++++++++++ 5 files changed, 107 insertions(+) diff --git a/.werks/4104 b/.werks/4104 new file mode 100644 index 0000000..cc3317e --- /dev/null +++ b/.werks/4104 @@ -0,0 +1,9 @@ +Title: veeam_tapejobs: New check to monitor Veeam tape jobs +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1481900204 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 68736f9..7734834 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 4110 netscaler_vserver: now lower levels for health are configurable * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices * 4118 check_bi_aggr: changed check and WATO rule to support Kerberos auth... + * 4104 veeam_tapejobs: New check to monitor Veeam tape jobs * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 7fd893b..88df1f5 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -22,6 +22,19 @@ Add-PSSnapin VeeamPSSnapIn -ErrorAction SilentlyContinue try { +$tapeJobs = Get-VBRTapeJob +write-host "<<<veeam_tapejobs>>>" +write-host "JobName JobID LastResult LastState" +foreach ($tapeJob in $tapeJobs) + { + $jobName = $tapeJob.Name + $jobID = $tapeJob.Id + $lastResult = $tapeJob.LastResult + $lastState = $tapeJob.LastState + write-host "$jobName $jobID $lastResult $lastState" + } + + $myJobsText = "<<<veeam_jobs:sep(9)>>>`n" $myTaskText = "" diff --git a/checkman/veeam_tapejobs b/checkman/veeam_tapejobs new file mode 100644 index 0000000..9fafec6 --- /dev/null +++ b/checkman/veeam_tapejobs @@ -0,0 +1,19 @@ +title: Veeam Tape Jobs +agents: windows +catalog: os/storage +license: GPL +distribution: check_mk +description: + This check monitors the status of the tape jobs run by the Veeam + backup tool. In order to carry out the check, the Veeam agent plugin + needs to be installed on the backup server. See special instructions in the + comment section of the Veeam agent plugin powershell scripts on how to install + the scripts. + + This check is {OK} if the last tape job ran successfully and {CRIT} otherwise. + +inventory: + One check will be created for each tape job run by the Veeam tool. + +item: + The name of the tape job. diff --git a/checks/veeam_tapejobs b/checks/veeam_tapejobs new file mode 100644 index 0000000..0e45e71 --- /dev/null +++ b/checks/veeam_tapejobs @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def parse_veeam_tapejobs(info): + parsed = {} + columns = map(lambda s: s.lower(), info[0]) + + for line in info[1:]: + name = " ".join( line[:-(len(columns)-1)] ) + job_id, last_result, last_state = line[-(len(columns)-1):] + parsed[name] = { + "job_id" : job_id, + "last_result" : last_result, + "last_state" : last_state, + } + + return parsed + + +def inventory_veeam_tapejobs(parsed): + for job in parsed: + yield job, None + + +def check_veeam_tapejobs(item, _no_params, parsed): + last_result = parsed[item]["last_result"] + last_state = parsed[item]["last_state"] + + if last_result == "Success": + yield 0, "Last backup successful" + else: + yield 2, "Last backup result: " + last_result + + yield 0, "Last state: " + last_state + + +check_info["veeam_tapejobs"] = { + 'parse_function' : parse_veeam_tapejobs, + 'inventory_function' : inventory_veeam_tapejobs, + 'check_function' : check_veeam_tapejobs, + 'service_description' : 'VEEAM Tape Job %s', +}

7 years, 9 months

veeam_jobs: Improved manpage title

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2cc7169aa97ee8499be27bf8840fd35abf4f5f47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cc7169aa97ee8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 16 15:49:17 2016 +0100 veeam_jobs: Improved manpage title Change-Id: Ic840793cc72af44684c17a74112a811659983fdd --- checkman/veeam_jobs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/veeam_jobs b/checkman/veeam_jobs index fe1dbe2..37e9b69 100644 --- a/checkman/veeam_jobs +++ b/checkman/veeam_jobs @@ -1,4 +1,4 @@ -title: veeam backup server check +title: Veeam Backup Jobs agents: windows catalog: os/storage license: GPL

7 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016