Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f60e54906f09026fd5bf1db1228200a270cf2e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f60e54906f090… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 3 16:44:09 2016 +0100 added compiled sources --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382636 -> 15382636 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893824 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13295415 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1299456 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584763 -> 584764 bytes agents/windows/install_agent.exe | Bin 581451 -> 581452 bytes 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 2ce5109..dbb8b69 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2136 +2138 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a55f3aa..8c57ce9 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-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 45be502..2956574 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index d98c4dd..d7146ae 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 62153ed..6be6e4b 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 f28ba99..919fac2 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index c226c00..3f182ec 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 2f4a545..b1c101e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 2dc0ec9..b79f061 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 d71af09..20143dd 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 11 months

clang-formatted

by Sven Panne

Module: check_mk Branch: master Commit: c014c46131f05f2f1006648be15c6208b2f2376c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c014c46131f05f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 3 16:43:03 2016 +0100 clang-formatted --- agents/windows/check_mk_agent.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 119bff1..40f5541 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -160,7 +160,8 @@ struct GlobalConfig { Configurable<bool> encrypted_rt; Configurable<bool> support_ipv6; Configurable<std::string> passphrase; - SplittingListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> + SplittingListConfigurable<only_from_t, + BlockMode::FileExclusive<only_from_t>> only_from; GlobalConfig(const Environment &env)

7 years, 11 months

Fixed unicode bug in table.py.

by Roland Halbig

Module: check_mk Branch: master Commit: b3b7be532f5c888258268ed7478bc1a98da61dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3b7be532f5c88… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Nov 3 16:39:51 2016 +0100 Fixed unicode bug in table.py. Fixed unicode bug in plugins/views/painters.py --- web/htdocs/table.py | 4 +++- web/plugins/views/painters.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 31041d1..de478a1 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -115,7 +115,9 @@ def cell(*posargs, **kwargs): next_args = posargs, kwargs def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True): - if type(text) not in (unicode, HTML): + if type(text) == HTML: + text = text.value + if type(text) != unicode: text = str(text) htmlcode = text + html.drain() if table["collect_headers"] == True: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 91b01a9..d6c29b3 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -301,7 +301,7 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): elif type(result) in [str, unicode, HTML]: if isinstance(result, HTML): - result = str(result) + result = result.value # TODO: This is handling the deprecated API with 1.2.7. Remove this one day. if result[0] == '<':

7 years, 11 months

Convert recent patch to new config API

by Mathias Kettner

Module: check_mk Branch: master Commit: 55ab63ef922046b82780fe844404b9b9c1c3a226 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55ab63ef922046… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 16:19:26 2016 +0100 Convert recent patch to new config API config.may -> config.user.may --- web/htdocs/views.py | 2 +- web/plugins/views/availability.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 862c117..1d163e5 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2219,7 +2219,7 @@ def show_context_links(thisview, show_filters, bestof = config.context_buttons_to_show) # Button for creating an instant report (if reporting is available) - if config.reporting_available() and config.may("general.reporting"): + if config.reporting_available() and config.user.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") # Buttons to other views, dashboards, etc. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 8591b20..22b0d92 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -221,7 +221,7 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) html.begin_context_buttons() togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - if config.reporting_available() and config.may("general.reporting"): + if config.reporting_available() and config.user.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") if av_mode == "table": @@ -510,7 +510,7 @@ def render_bi_availability(title, aggr_rows): html.begin_context_buttons() togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - if config.reporting_available() and config.may("general.reporting"): + if config.reporting_available() and config.user.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") if av_mode == "availability": html.context_button(_("Export as CSV"), html.makeuri([("output_format", "csv_export")]), "download_csv")

7 years, 11 months

Add missing actual fix of werk #4039

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d7403f13a21cd49a8ab9fbe0ae4e1ee9d4e44dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7403f13a21cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 16:14:45 2016 +0100 Add missing actual fix of werk #4039 --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 03645ec..31041d1 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -115,7 +115,7 @@ def cell(*posargs, **kwargs): next_args = posargs, kwargs def add_cell(title="", text="", css=None, help=None, colspan=None, sortable=True): - if type(text) != unicode: + if type(text) not in (unicode, HTML): text = str(text) htmlcode = text + html.drain() if table["collect_headers"] == True:

7 years, 11 months

3987 FIX Check_MK Agent Access: Windows agent reported incorrect only from value

by Andreas Boesl

Module: check_mk Branch: master Commit: 86d25966c51f7f83ffae8daea9136a60b3b20387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86d25966c51f7f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 3 16:10:33 2016 +0100 3987 FIX Check_MK Agent Access: Windows agent reported incorrect only from value --- .werks/3987 | 9 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382636 -> 15382636 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1299456 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893824 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13295415 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1299456 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584767 -> 584763 bytes agents/windows/install_agent.exe | Bin 581457 -> 581451 bytes agents/windows/sections/SectionCheckMK.cc | 2 +- 13 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3987 b/.werks/3987 new file mode 100644 index 0000000..d00f58e --- /dev/null +++ b/.werks/3987 @@ -0,0 +1,9 @@ +Title: Check_MK Agent Access: Windows agent reported incorrect only from value +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1478185796 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index efcc31a..2c6e35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 4035 FIX: df_zos: Fixed ignoring last filesystem after new discovery... * 3741 FIX: omd_status: Fix labelling and structure of several metric graphs * 3986 FIX: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data... + * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/windows/build_version b/agents/windows/build_version index 4e14254..2ce5109 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2133 +2136 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index cf89279..a55f3aa 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-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index ae7b078..45be502 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 16f1abd..d98c4dd 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4315c37..62153ed 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 cd1849d..f28ba99 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 95f4318..c226c00 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 0a9de51..2f4a545 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 96a96f1..2dc0ec9 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 2d53be3..d71af09 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index cfa1e2a..878ace6 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -104,7 +104,7 @@ bool SectionCheckMK::produceOutputInner(std::ostream &out, // reset script statistics for next round memset(&g_script_stat, 0, sizeof(g_script_stat)); - out << "Only From:"; + out << "OnlyFrom:"; // only from, isn't this static too? if (_only_from->size() == 0) { out << " 0.0.0.0/0\n";

7 years, 11 months

4039 FIX Fix UnicodeEncodeError exception in WATO folder display

by Mathias Kettner

Module: check_mk Branch: master Commit: 870df857b836ea9be6df7be3862e5e43f9e77903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870df857b836ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 16:08:18 2016 +0100 4039 FIX Fix UnicodeEncodeError exception in WATO folder display This fixes the following exception, which happens in some situations when using the WATO hosts management: F+: Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 263, in page_handler modefunc("content") File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 482, in mode_folder show_hosts(folder) File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 805, in show_hosts table.cell(_("Permissions"), ", ".join(map(render_contact_group, permitted_groups))) File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 112, in cell finish_previous() File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 83, in finish_previous next_func(*next_args[0], **next_args[1]) File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 119, in add_cell text = str(text) UnicodeEncodeError: 'ascii' codec can't encode character u'\xfc' in position 60: ordinal not in range(128) F-: --- .werks/4039 | 28 ++++++++++++++++++++++++++++ ChangeLog | 1 + 2 files changed, 29 insertions(+) diff --git a/.werks/4039 b/.werks/4039 new file mode 100644 index 0000000..c882b24 --- /dev/null +++ b/.werks/4039 @@ -0,0 +1,28 @@ +Title: Fix UnicodeEncodeError exception in WATO folder display +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478185543 + +This fixes the following exception, which happens in some situations +when using the WATO hosts management: + +F+: +Traceback (most recent call last): +File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 263, in page_handler +modefunc("content") +File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 482, in mode_folder +show_hosts(folder) +File "/omd/sites/heute/share/check_mk/web/htdocs/wato.py", line 805, in show_hosts +table.cell(_("Permissions"), ", ".join(map(render_contact_group, permitted_groups))) +File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 112, in cell +finish_previous() +File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 83, in finish_previous +next_func(*next_args[0], **next_args[1]) +File "/omd/sites/heute/share/check_mk/web/htdocs/table.py", line 119, in add_cell +text = str(text) +UnicodeEncodeError: 'ascii' codec can't encode character u'\xfc' in position 60: ordinal not in range(128) +F-: diff --git a/ChangeLog b/ChangeLog index b367a71..efcc31a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... * 3951 FIX: oracle_sessions: fixed bug with default absolute levels... + * 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display... Notifications: * 3957 mail: now allows extra HTML section between body and table

7 years, 11 months

Fixed escaping issue of global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 166b7b7f253259837ed2cd1caf02b19f81bda187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=166b7b7f253259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 3 15:53:40 2016 +0100 Fixed escaping issue of global settings --- web/htdocs/wato.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 77c9a0d..5c2ea34 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6497,15 +6497,14 @@ def render_global_configuration_variables(group_names, default_values, current_s "snapin_switch_" + (current_settings[varname] and "on" or "off"), cssclass="modified") else: - html.a(to_text, href=edit_url, class_="modified") + html.a(HTML(to_text), href=edit_url, class_="modified") else: if is_a_checkbox(valuespec): html.icon_button(toggle_url, _("Immediately toggle this setting"), # "snapin_greyswitch_" + (defaultvalue and "on" or "off")) "snapin_switch_" + (defaultvalue and "on" or "off")) else: - # TODO: IS THIS RIGHT???? - html.a(to_text, href=edit_url) + html.a(HTML(to_text), href=edit_url) if header_is_painted: forms.end()

7 years, 11 months

Show button [Export as PDF] only if user has permission "Use Reporting"

by Mathias Kettner

Module: check_mk Branch: master Commit: ecf6528e251b8f76abe939100617b4e5f961cdea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecf6528e251b8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 15:22:18 2016 +0100 Show button [Export as PDF] only if user has permission "Use Reporting" This is part of Werk #8619 Conflicts: web/plugins/views/availability.py --- web/htdocs/views.py | 2 +- web/plugins/views/availability.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8c30636..862c117 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2219,7 +2219,7 @@ def show_context_links(thisview, show_filters, bestof = config.context_buttons_to_show) # Button for creating an instant report (if reporting is available) - if config.reporting_available(): + if config.reporting_available() and config.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") # Buttons to other views, dashboards, etc. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 618e3d6..8591b20 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -221,8 +221,7 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) html.begin_context_buttons() togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - - if config.reporting_available(): + if config.reporting_available() and config.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") if av_mode == "table": @@ -511,7 +510,7 @@ def render_bi_availability(title, aggr_rows): html.begin_context_buttons() togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") - if config.reporting_available(): + if config.reporting_available() and config.may("general.reporting"): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") if av_mode == "availability": html.context_button(_("Export as CSV"), html.makeuri([("output_format", "csv_export")]), "download_csv")

7 years, 11 months

avaya_88xx, avaya_88xx_cpu: Made scan functions more permissive

by Konstantin Büttner

Module: check_mk Branch: master Commit: a66f2a6526ee215deb4862f23c4580afa8a5e612 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66f2a6526ee21… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 3 14:48:38 2016 +0100 avaya_88xx, avaya_88xx_cpu: Made scan functions more permissive --- checks/avaya_88xx | 2 +- checks/avaya_88xx_cpu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/avaya_88xx b/checks/avaya_88xx index 6f0894e..d1ce739 100644 --- a/checks/avaya_88xx +++ b/checks/avaya_88xx @@ -77,7 +77,7 @@ check_info["avaya_88xx"] = { 'group': 'temperature', # RAPID-CITY MIB 'snmp_info': ( ".1.3.6.1.4.1.2272.1.4.7.1.1", [ 2, 3 ]), # rcChasFanOperStatus, rcChasFanAmbientTemperature - 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272.59" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272" in oid(".1.3.6.1.2.1.1.2.0"), 'includes': [ 'temperature.include' ], } diff --git a/checks/avaya_88xx_cpu b/checks/avaya_88xx_cpu index f0a082f..5e20d51 100644 --- a/checks/avaya_88xx_cpu +++ b/checks/avaya_88xx_cpu @@ -46,6 +46,6 @@ check_info["avaya_88xx_cpu"] = { 'has_perfdata': True, # RAPID-CITY MIB 'snmp_info': ( ".1.3.6.1.4.1.2272.1.1", [ 20 ]), # rcSysCpuUtil - 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272.59" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_scan_function': lambda oid: ".1.3.6.1.4.1.2272" in oid(".1.3.6.1.2.1.1.2.0"), 'includes': [ 'cpu_util.include' ], }

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016