Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#1301 FIX cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: 78b511f8c4374fd6f89637e567dbb812dbb55bc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78b511f8c4374f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 4 17:10:16 2015 +0100 #1301 FIX cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks The Temperature part now uses the default Check_MK Temperature features. This means you can set levels with WATO now. The Power Phase Check didn't work with Rittal MPSM Devices so it was needed to rewrite it. Cause of this, the name of the Item has changed, and you have to do a rediscovery. --- .werks/1301 | 13 ++++++++++ ChangeLog | 2 ++ checks/cmciii | 74 +++++++++++++++++++++++++-------------------------------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/.werks/1301 b/.werks/1301 new file mode 100644 index 0000000..f1a639c --- /dev/null +++ b/.werks/1301 @@ -0,0 +1,13 @@ +Title: cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1446653239 +Class: fix + +The Temperature part now uses the default Check_MK Temperature features. This means you can set levels with WATO now. + +The Power Phase Check didn't work with Rittal MPSM Devices so it was needed to rewrite it. Cause of this, the name of the Item has changed, +and you have to do a rediscovery. + diff --git a/ChangeLog b/ChangeLog index 0d63b3d..219e99b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ * 2734 FIX: cmctc.temp: fix exception of type UnicodeDecodeError * 2446 FIX: Active checks check_mail, check_mail_loop: did not work with POP3 protocol... * 1300 FIX: ovs_bonding: Fixed discovery exception in case of not active bond + * 1301 FIX: cmciii: Some rewrites of the cmciii Temperature and Power Phase Checks... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cmciii b/checks/cmciii index 0176256..fd1c8ae 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -185,7 +185,8 @@ def parse_units(info): # Caveat: info ist hier nicht SNMP-info, sondern SNM def get_unit_number(units,unit_name): namelist = map(list, zip(*units))[1] if unit_name in namelist: - return str(namelist.index(unit_name)+1) + name = str(namelist.index(unit_name)+1) + return name cmciii_snmp_info = [ [ ".1.3.6.1.4.1.2606.7.4.2.2.1", [ @@ -469,10 +470,6 @@ def check_cmciii_temp(item, params, info): if not entry: return 3, "No such temperature data found" - descr = entry.get('DescName') - status = entry.get('Status') - offset = entry.get('Offset') - def parse_temp(val): if re.search(" B0 ", val): # is encoded string @@ -481,7 +478,7 @@ def check_cmciii_temp(item, params, info): # omit special characters in unit, because they # cause problems in rrdtools t_unit = re.sub("[^\w]","", t_unit) - return val, t_unit + return float(val), t_unit value, t_unit = parse_temp(entry.get('Value')) highalarm = parse_temp(entry.get('SetPtHighAlarm'))[0] @@ -489,18 +486,7 @@ def check_cmciii_temp(item, params, info): lowalarm = parse_temp(entry.get('SetPtLowAlarm'))[0] lowwarning = parse_temp(entry.get('SetPtLowWarning'))[0] - if status == "OK": - state = 0 - status = "" - else: - state = 2 - - perfdata = [ ("temp", value+t_unit, 0, 0 ) ] - - infotext = "%s %s %s - Limits low %s/%s high %s/%s, Offset %s" % \ - ( descr, value, status, lowalarm, lowwarning, highwarning, highalarm, offset ) - - return (state, infotext, perfdata) + return check_temperature(value, params, t_unit, (highwarning, highalarm), (lowwarning, lowalarm)) check_info['cmciii.temp'] = { "check_function" : check_cmciii_temp, @@ -509,6 +495,8 @@ check_info['cmciii.temp'] = { "has_perfdata" : True, "snmp_scan_function" : cmciii_scan, "snmp_info" : cmciii_snmp_info, + "includes" : [ "temperature.include" ], + "group" : "temperature", } #. @@ -737,35 +725,37 @@ check_info['cmciii.humidity'] = { # | |_| | # '----------------------------------------------------------------------' -def inventory_cmciii_phase(info): - phases = {} +def parse_cmciii_phase(info): parsed = parse_cmciii_inputs(info[0]) - units = parse_units(info[1]) - for (unit, raw_item_name), entry in parsed.iteritems(): - unit_type, unit_name = units[int(unit)-1][0:2] - if 'Phase' in raw_item_name: - item_name = raw_item_name.split(".")[1] - phases["%s Phase %s" % (unit_name, item_name[-1])] = {} - elif 'Unit.General' in raw_item_name: - phases["%s Summary" % unit_name] = {} - return phases.items() + units = parse_units(info[1]) + + output = {} + for name, value in parsed.items(): + if name[1].find("Phase") != -1: + device, phase, value_name = name[1].split('.') + unit_id = int( name[0]) + unit = units[unit_id-1][1] + phase = phase[-1] + output.setdefault((unit, device, phase), {}) + output[(unit, device, phase)][value_name] = value + return output + +def inventory_cmciii_phase(info): + parsed = parse_cmciii_phase(info) + for (device, unit, phase), values in parsed.items(): + yield "%s %s Phase %s" % (device, unit, phase), {} def check_cmciii_phase(item, params, info): - unit_name = item.split(" ")[0] - item_name = item.split(" ")[-1] - semiparsed = parse_cmciii_inputs(info[0]) - unit = get_unit_number(parse_units(info[1]), unit_name) + device, unit, word, phase = item.split() + data = parse_cmciii_phase(info)[(device, unit, phase)] + parsed = {} parsed[item] = {} - if "Phase" in item: - parsed[item]["voltage"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Voltage")]["Value"].split()[0]), None - parsed[item]["current"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Current")]["Value"].split()[0]), None - parsed[item]["power"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Power.Active")]["Value"].split()[0]), None - parsed[item]["appower"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Power.Apparent")]["Value"].split()[0]), None - parsed[item]["energy"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Energy.Active")]["Value"].split()[0]), None - elif "Summary" in item: - parsed[item]["power"] = float(semiparsed[(unit, "Unit.General.Power")]["Value"].split()[0]), None - parsed[item]["energy"] = float(semiparsed[(unit, "Unit.General.Energy.Active")]["Value"].split()[0]), None + parsed[item]["voltage"] = float(data['Voltage']['Value'].split()[0]), None + parsed[item]["current"] = float(data['Current']['Value'].split()[0]), None + parsed[item]["power"] = float(data['Power']['Value'].split()[0]), None + #parsed[item]["appower"] = float(data['Current']['Value'].split()[0]), None + parsed[item]["energy"] = float(data['Energy']['Value'].split()[0]), None return check_elphase(item, params, parsed)

8 years, 8 months

#2723 FIX Hiding "discard changes button" after successful activation of changes

by Lars Michelsen

Module: check_mk Branch: master Commit: ba0ab9859591b95b229bc86dbdb4e433c7190618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0ab9859591b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 4 13:43:49 2015 +0100 #2723 FIX Hiding "discard changes button" after successful activation of changes --- .werks/2723 | 9 +++++ ChangeLog | 1 + web/htdocs/js/wato.js | 88 ++++++++++++++----------------------------------- web/htdocs/wato.py | 18 ---------- 4 files changed, 34 insertions(+), 82 deletions(-) diff --git a/.werks/2723 b/.werks/2723 new file mode 100644 index 0000000..feb9275 --- /dev/null +++ b/.werks/2723 @@ -0,0 +1,9 @@ +Title: Hiding "discard changes button" after successful activation of changes +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1446641006 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 04d5dcd..0d63b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 1298 FIX: Fixed broken WebAPI... * 1299 FIX: BI: Fixed recently introduced bug when editing BI Rules... * 2721 FIX: Fixed user profile sync in distributed environments after profile change + * 2723 FIX: Hiding "discard changes button" after successful activation of changes Event Console: * 2733 Visibility of Event Console events more flexible now... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index e0748f5..d71c54f 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -509,63 +509,6 @@ function update_bulk_moveto(val) { fields = null; } -// .----------------------------------------------------------------------. -// | _ _ _ _ _ | -// | / \ ___| |_(_)_ ____ _| |_(_) ___ _ __ | -// | / _ \ / __| __| \ \ / / _` | __| |/ _ \| '_ \ | -// | / ___ \ (__| |_| |\ V / (_| | |_| | (_) | | | | | -// | /_/ \_\___|\__|_| \_/ \__,_|\__|_|\___/|_| |_| | -// | | -// +----------------------------------------------------------------------+ - -function wato_do_activation(est) { - var siteid = 'local'; - - // Hide the activate changes button - var button = document.getElementById('act_changes_button'); - if (button) { - button.style.display = 'none'; - } - button = document.getElementById('discard_changes_button'); - if (button) { - button.style.display = 'none'; - button = null; - } - - get_url("wato_ajax_activation.py", - wato_activation_result, siteid); - replication_progress[siteid] = 20; // 10 of 10 10ths - setTimeout("replication_step('"+siteid+"',"+est+");", est/10); -} - -function wato_activation_result(siteid, code) { - replication_progress[siteid] = 0; - var oState = document.getElementById("repstate_" + siteid); - var oMsg = document.getElementById("repmsg_" + siteid); - if (code.substr(0, 3) == "OK:") { - oState.innerHTML = "<div class='repprogress ok' style='width: 160px;'>OK</div>"; - oMsg.innerHTML = code.substr(3); - - // Reload page after 1 secs - setTimeout(wato_replication_finish, 1000); - } else { - oState.innerHTML = ''; - oMsg.innerHTML = code; - wato_hide_changes_button(); - } - oState = null; - oMsg = null; -} - -function wato_hide_changes_button() -{ - var button = document.getElementById('act_changes_button'); - if (button) { - button.style.display = 'none'; - button = null; - } -} - // +----------------------------------------------------------------------+ // | ____ _ _ _ _ | // | | _ \ ___ _ __ | (_) ___ __ _| |_(_) ___ _ __ | @@ -601,27 +544,29 @@ function wato_replication_result(siteid, code) { var oDiv = document.getElementById("repstate_" + siteid); if (code.substr(0, 3) == "OK:") { oDiv.innerHTML = "<div class='repprogress ok' style='width: 160px;'>" + - code.substr(3) + "</div>"; + code.substr(3) + "</div>"; num_replsites--; } else oDiv.innerHTML = code; if (0 == num_replsites) { - setTimeout(wato_replication_finish, 1000); + setTimeout(finish_replication, 1000); } } -function wato_replication_finish() { +function finish_replication() +{ // check if we have a sidebar-main frame setup if (this.parent && parent && parent.frames[1] == this) reload_sidebar(); - var oDiv = document.getElementById("act_changes_button"); - oDiv.style.display = "none"; - oDiv = null + hide_changes_buttons(); + hide_pending_changes_container(); +} - // Hide the pending changes container +function hide_pending_changes_container() +{ var oPending = document.getElementById("pending_changes"); if (oPending) { oPending.style.display = "none"; @@ -629,6 +574,21 @@ function wato_replication_finish() { } } +function hide_changes_buttons() +{ + var button = document.getElementById('act_changes_button'); + if (button) { + button.style.display = 'none'; + button = null; + } + + button = document.getElementById('discard_changes_button'); + if (button) { + button.style.display = 'none'; + button = null; + } +} + function wato_randomize_secret(id, len) { var secret = ""; for (var i=0; i<len; i++) { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1921720..e71b80f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5414,24 +5414,6 @@ def mode_changelog(phase): if sitestatus_do_async_replication and num_replsites > 0: html.javascript("var num_replsites = %d;\n" % num_replsites) - elif sitestatus_do_async_replication: - # Single site setup - if cmc_rush_ahead_activation(): - html.message(_("All changes have been activated.")) - changes_activated = True - else: - # Is rendered on the page after hitting the "activate" button - # Renders the html to show the progress and starts the sync via javascript - html.write("<table class=data>") - html.write("<tr><th class=left>%s</th><th>%s</th></tr>" % (_('Progress'), _('Status'))) - html.write('<tr class="data odd0"><td class=repprogress><div id="repstate_local"></div></td>') - html.write('<td id="repmsg_local"><i>%s</i></td></tr></table>' % _('activating...')) - - srs = load_replication_status().get(None, {}) - estimated_duration = srs.get("times", {}).get('act', 2.0) - html.javascript("wato_do_activation(%d);" % - (int(estimated_duration * 1000.0))) - sitestatus_do_async_replication = None # could survive in global context! pending = parse_audit_log("pending")

8 years, 8 months

Fixed overlay of "Actions" table title in activate changes dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ec04cecc12e126da0ba877c2190fd2c38da6adc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec04cecc12e12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 4 14:20:09 2015 +0100 Fixed overlay of "Actions" table title in activate changes dialog --- web/htdocs/pages.css | 8 ++++++-- web/htdocs/table.py | 7 ++++++- web/htdocs/wato.py | 18 +----------------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 6a646c7..3105eb6 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -394,9 +394,13 @@ table.data tr th { vertical-align: baseline; } +table.data tr div.toggle_actions { + position: relative; + padding-left: 14px; +} + table.data tr a.toggle_actions { - display: inline-block; - float: left; + position: absolute; top: 0; left: 0; margin: 0; diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 932e296..b86bf30 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -279,11 +279,16 @@ def end(): state = '1' help = _('Display table actions') img = 'table_actions_off' + html.write("<div class=\"toggle_actions\">") html.icon_button(html.makeuri([('_%s_actions' % table_id, state)]), help, img, cssclass = 'toggle_actions') + html.write("<span>%s</span>" % header) + html.write("</div>") first_col = False + else: + html.write("%s" % header) - html.write("%s</th>\n" % header) + html.write("</th>\n") html.write(" </tr>\n") # If we have no group headers then paint the headers now diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e71b80f..f91afb9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5270,23 +5270,7 @@ def mode_changelog(phase): sites = [(name, config.site(name)) for name in config.sitenames() ] sort_sites(sites) - table.begin(_("Site Status"), searchable=False) - # html.write("<table class=data>") - # html.write("<tr>") - # html.write("<th>%s</th>" % _("Actions") + - # "<th>%s</th>" % _("ID") + - # "<th>%s</th>" % _("Alias")) - # html.write("<th>%s</th>" % _("Status") + - # "<th>%s</th>" % _("Version") + - # "<th>%s</th>" % _("Core") + - # "<th>%s</th>" % _("Hosts") + - # "<th>%s</th>" % _("Services")) - # if sitestatus_do_async_replication: - # html.write("<th>%s</th>" % _("Replication result")) - # else: - # html.write("<th colspan=2>%s</th>" % _("Pending changes") + - # "<th>%s</th>" % _("Last result")) - # html.write("</tr>") + table.begin("site-status", searchable=False) num_replsites = 0 # for detecting end of bulk replication for site_id, site in sites:

8 years, 8 months

#2743 FIX Fixed handling of column types in "GET columns"

by Sven Panne

Module: check_mk Branch: master Commit: 52bb998bf7c838538b1a4a06162bae8d0fee7c70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52bb998bf7c838… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 4 12:56:11 2015 +0100 #2743 FIX Fixed handling of column types in "GET columns" Under rare circumstances the core could crash during the processing of a columns query. --- .werks/2743 | 11 +++++++++++ ChangeLog | 3 +++ livestatus/src/TableColumns.cc | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2743 b/.werks/2743 new file mode 100644 index 0000000..37c5f07 --- /dev/null +++ b/.werks/2743 @@ -0,0 +1,11 @@ +Title: Fixed handling of column types in "GET columns" +Level: 1 +Component: livestatus +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446637947 + +Under rare circumstances the core could crash during the processing of a +columns query. \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 77c20eb..04d5dcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,9 @@ * 2733 Visibility of Event Console events more flexible now... * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... + Livestatus: + * 2743 FIX: Fixed handling of column types in "GET columns"... + HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... * 2440 VMware ESX inventory: Now able to display ESX hostsystems and virtualmachines of clusters diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc index 447565f..f734314 100644 --- a/livestatus/src/TableColumns.cc +++ b/livestatus/src/TableColumns.cc @@ -62,7 +62,7 @@ void TableColumns::answerQuery(Query *query) const char *TableColumns::getValue(Column *column, int colcol) { - static const char *typenames[6] = { "int", "float", "string", "list", "time", "dict" }; + static const char *typenames[8] = { "int", "float", "string", "list", "time", "dict", "blob", "null" }; switch (colcol) {

8 years, 8 months

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 54d65d716a667b0c4716fdd2abe4133527c8bd10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54d65d716a667b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 4 12:51:09 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 34aee50..f1349af 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2743 +2753

8 years, 8 months

#1300 FIX ovs_bonding: Fixed discovery exception in case of not active bond

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3fc60dbe42b33e33622021f4b4c6fc770813bb4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fc60dbe42b33e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 4 11:44:39 2015 +0100 #1300 FIX ovs_bonding: Fixed discovery exception in case of not active bond --- .werks/1300 | 10 ++++++++++ ChangeLog | 1 + checks/ovs_bonding | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/1300 b/.werks/1300 new file mode 100644 index 0000000..1d3aa16 --- /dev/null +++ b/.werks/1300 @@ -0,0 +1,10 @@ +Title: ovs_bonding: Fixed discovery exception in case of not active bond +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446633826 + + diff --git a/ChangeLog b/ChangeLog index acb20d5..77c20eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 2445 FIX: ibm_svc_disks: fixed crash in case special agent reports too much data columns per line * 2734 FIX: cmctc.temp: fix exception of type UnicodeDecodeError * 2446 FIX: Active checks check_mail, check_mail_loop: did not work with POP3 protocol... + * 1300 FIX: ovs_bonding: Fixed discovery exception in case of not active bond Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ovs_bonding b/checks/ovs_bonding index 440cfaa..8f2e762 100644 --- a/checks/ovs_bonding +++ b/checks/ovs_bonding @@ -62,6 +62,8 @@ def parse_ovs_bonding(info): parsed = {} for bond, status in bonds.items(): all_down = True + if not status['active']: + continue for st in status["interfaces"].values(): if st["status"] == "up": all_down = False

8 years, 8 months

update #2440: esx_vsphere_clusters inventory plugin: fixed duplicate output

by Andreas Boesl

Module: check_mk Branch: master Commit: 95756fdd273e88e9e8230bf8099fe489d9d315b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95756fdd273e88… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 4 11:23:16 2015 +0100 update #2440: esx_vsphere_clusters inventory plugin: fixed duplicate output --- inventory/esx_vsphere_clusters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/esx_vsphere_clusters b/inventory/esx_vsphere_clusters index be7b2d1..e5df08d 100644 --- a/inventory/esx_vsphere_clusters +++ b/inventory/esx_vsphere_clusters @@ -47,7 +47,7 @@ def inv_esx_vsphere_clusters(info): data = { "name": dc_name, "clusters": [] } for cluster, values in clusters.items(): data["clusters"].append(dict([("name", cluster)] + values.items())) - node.append(data) + node.append(data) inv_info['esx_vsphere_clusters'] = { "inv_function" : inv_esx_vsphere_clusters,

8 years, 8 months

fixed permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 2da52cd12e87ffdf4873fd3d50eb28b7d2cc2a21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2da52cd12e87ff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 4 11:18:12 2015 +0100 fixed permissions --- 0 files changed diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere old mode 100644 new mode 100755

8 years, 8 months

update #2440: cluster information is only available through vcenters

by Andreas Boesl

Module: check_mk Branch: master Commit: 23d84bfdea011212cf469ab1151b7469003da819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d84bfdea0112… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 4 11:15:22 2015 +0100 update #2440: cluster information is only available through vcenters --- agents/special/agent_vsphere | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere old mode 100755 new mode 100644 index 3eea6f4..204817f --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -316,7 +316,7 @@ telegram_list = { <ns1:pathSet>name</ns1:pathSet> </ns1:propSet> <ns1:objectSet> - <ns1:obj type="Folder">group-d1</ns1:obj> + <ns1:obj type="Folder">%(rootFolder)s</ns1:obj> <ns1:skip>false</ns1:skip> <ns1:selectSet xsi:type="ns1:TraversalSpec"> <ns1:name>visitFolders</ns1:name> @@ -1520,22 +1520,26 @@ if not error: output("<<<<>>>>") - reply_code, reply_msg, reply_headers, response = query_server(telegram_list["datacenters"]) - datacenter = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>.*', response)[0] - reply_code, reply_msg, reply_headers, response = query_server(telegram_list["clustersofdatacenter"], - payload_params = {"datacenter": datacenter} ) - clusters = get_pattern('<objects><obj type="ClusterComputeResource">(.*?)</obj>.*?string">(.*?)</val></propSet></objects>', response) - - output("<<<esx_vsphere_clusters:sep(9)>>>") - for cluster in clusters: - reply_code, reply_msg, reply_headers, response = query_server(telegram_list["esxhostsofcluster"], - payload_params = {"clustername": cluster[0]} ) - cluster_vms = [] - hosts = get_pattern('<objects><obj type="HostSystem">.*?string">(.*?)</val></propSet></objects>', response) - for host in hosts: - cluster_vms.extend(vm_esx_host.get(host, [])) - output("%s\thostsystems\t%s\t%s" % (datacenter, cluster[1], "\t".join(hosts))) - output("%s\tvms\t%s\t%s" % (datacenter, cluster[1], "\t".join(map(convert_hostname, cluster_vms)))) + + + + if not opt_direct: + reply_code, reply_msg, reply_headers, response = query_server(telegram_list["datacenters"]) + datacenter = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>.*', response)[0] + reply_code, reply_msg, reply_headers, response = query_server(telegram_list["clustersofdatacenter"], + payload_params = {"datacenter": datacenter} ) + clusters = get_pattern('<objects><obj type="ClusterComputeResource">(.*?)</obj>.*?string">(.*?)</val></propSet></objects>', response) + + output("<<<esx_vsphere_clusters:sep(9)>>>") + for cluster in clusters: + reply_code, reply_msg, reply_headers, response = query_server(telegram_list["esxhostsofcluster"], + payload_params = {"clustername": cluster[0]} ) + cluster_vms = [] + hosts = get_pattern('<objects><obj type="HostSystem">.*?string">(.*?)</val></propSet></objects>', response) + for host in hosts: + cluster_vms.extend(vm_esx_host.get(host, [])) + output("%s\thostsystems\t%s\t%s" % (datacenter, cluster[1], "\t".join(hosts))) + output("%s\tvms\t%s\t%s" % (datacenter, cluster[1], "\t".join(map(convert_hostname, cluster_vms)))) output("<<<esx_vsphere_objects:sep(9)>>>")

8 years, 8 months

fixed and simplified handle management in wmi-helper and slightly improved error reporting

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8b903b7a1cfa3aa707e5f61a081f46905ddde1e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b903b7a1cfa3a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Nov 4 09:24:17 2015 +0100 fixed and simplified handle management in wmi-helper and slightly improved error reporting --- agents/windows/Makefile | 4 +-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 831488 -> 5359530 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 831488 -> 5359530 bytes agents/windows/check_mk_agent.cc | 9 ++++-- agents/windows/check_mk_agent.exe | Bin 750592 -> 4220996 bytes agents/windows/check_mk_agent.msi | Bin 1840128 -> 9904128 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 750592 -> 4220996 bytes agents/windows/install_agent-64.exe | Bin 383970 -> 1278363 bytes agents/windows/install_agent.exe | Bin 375168 -> 1161435 bytes agents/windows/wmiHelper.cc | 33 ++++++++++------------ agents/windows/wmiHelper.h | 8 ++---- 12 files changed, 27 insertions(+), 29 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index b1e8af7..7fce0f7 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,9 +27,9 @@ SHELL = /bin/bash VERSION = 1.2.7i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +#COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO # for debug builds -# COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index d27f552..51e227a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -624 +644 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 2127098..4370941 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.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index c632fcb..7f45f08 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.cc b/agents/windows/check_mk_agent.cc index a30c8d9..7b7b70e 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1642,9 +1642,10 @@ void save_logwatch_offsets(const std::string &logwatch_statefile) { FILE *file = fopen(logwatch_statefile.c_str(), "w"); if (!file) { - crash_log("Cannot open %s for writing.\n", logwatch_statefile.c_str()); + crash_log("Cannot open %s for writing: %s (%d).\n", logwatch_statefile.c_str(), strerror(errno), errno); // not stopping the agent from crashing. This way the user at least - // notices something went wrong + // notices something went wrong. + // FIXME: unless there aren't any textfiles configured to be monitored } for (logwatch_textfiles_t::const_iterator it_tf = g_config->logwatchTextfiles().begin(); it_tf != g_config->logwatchTextfiles().end(); ++it_tf) { @@ -1654,7 +1655,9 @@ void save_logwatch_offsets(const std::string &logwatch_statefile) tf->path, tf->file_id, tf->file_size, tf->offset); } } - fclose(file); + if (file != NULL) { + fclose(file); + } } void save_eventlog_offsets(const std::string &eventlog_statefile) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 8a04fce..76d62bf 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 4535103..7b5043c 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.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index c2ae79c..b58cef8 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 c88dc76..b5e0211 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 bf1b664..59cb8fa 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index f63067f..6dfe9e6 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -87,19 +87,23 @@ Variant::~Variant() } +void releaseInterface(IUnknown *ptr) +{ + if (ptr != NULL) { + ptr->Release(); + } +} + + ObjectWrapper::ObjectWrapper(IWbemClassObject *object) - : _owner(true) - , _current(object) + : _current(object, releaseInterface) { } ObjectWrapper::ObjectWrapper(const ObjectWrapper &reference) - : _owner(true) - , _current(reference._current) + : _current(reference._current) { - // take away ownership from the copied object - const_cast<ObjectWrapper&>(reference)._owner = false; } @@ -130,9 +134,6 @@ int ObjectWrapper::typeId(const wchar_t *key) const ObjectWrapper::~ObjectWrapper() { - if ((_current != NULL) && _owner) { - _current->Release(); - } } @@ -150,7 +151,7 @@ VARIANT ObjectWrapper::getVarByKey(const wchar_t *key) const Result::Result() : ObjectWrapper(NULL) - , _enumerator(NULL) + , _enumerator(NULL, releaseInterface) { } @@ -165,7 +166,7 @@ Result::Result(const Result &reference) Result::Result(IEnumWbemClassObject *enumerator) : ObjectWrapper(NULL) - , _enumerator(enumerator) + , _enumerator(enumerator, releaseInterface) { next(); } @@ -173,7 +174,6 @@ Result::Result(IEnumWbemClassObject *enumerator) Result::~Result() { - _enumerator->Release(); } @@ -192,7 +192,7 @@ Result &Result::operator=(const Result &reference) bool Result::valid() const { - return _current != NULL; + return _current.get() != NULL; } @@ -249,10 +249,7 @@ bool Result::next() return false; } - if (_current != NULL) { - _current->Release(); - } - _current = obj; + _current.reset(obj, releaseInterface); return true; } @@ -449,7 +446,7 @@ ObjectWrapper Helper::call(ObjectWrapper &result, LPCWSTR method) BSTR methodName = SysAllocString(method); res = _services->ExecMethod(className, methodName, 0, - NULL, result._current, &outParams, NULL); + NULL, result._current.get(), &outParams, NULL); SysFreeString(methodName); diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 08b1346..4baf86a 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -31,7 +31,7 @@ #include <windows.h> #include <wbemidl.h> #include <vector> - +#include <memory> std::string to_utf8(const wchar_t *string); @@ -80,11 +80,9 @@ class ObjectWrapper { friend class Helper; - bool _owner; - protected: - IWbemClassObject *_current; + std::shared_ptr<IWbemClassObject> _current; public: @@ -129,7 +127,7 @@ template <typename T> T ObjectWrapper::get(const wchar_t *key) const class Result : public ObjectWrapper { - IEnumWbemClassObject *_enumerator; + std::shared_ptr<IEnumWbemClassObject> _enumerator; public:

8 years, 8 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015