Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: enterasis_cpu_util: minor code reformatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 091e506897ea043bfab361fbc1c679807d8ec6af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=091e506897ea04… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 30 14:56:52 2015 +0200 enterasis_cpu_util: minor code reformatting --- checks/enterasys_cpu_util | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index f0d9967..172fdbd 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -30,12 +30,11 @@ def inventory_enterasys_cpu_util(info): # [:-2] to remove the oid end return [ ( x[0][:-2], "enterasys_cpu_default_levels" ) for x in info ] -def check_enterasys_cpu_util( item, params, info): +def check_enterasys_cpu_util(item, params, info): for core, util in info: if item == core[:-2]: - usage = saveint(util) / 10.0 + usage = int(util) / 10.0 return check_cpu_util(usage, params) - return 3, "Core not found in agent Outut" check_info["enterasys_cpu_util"] = {

9 years, 2 months

Check_MK Git: check_mk: fixed exception in inventory history

by Andreas Boesl

Module: check_mk Branch: master Commit: 47ef5d10027ff9e5bb758e84b81f9d2889833f2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ef5d10027ff9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 30 12:53:09 2015 +0200 fixed exception in inventory history --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 7027a30..4583ae0 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1013,7 +1013,7 @@ multisite_builtin_views["inv_hosts_ports"] = { # '----------------------------------------------------------------------' def inv_history_table(columns, add_headers, only_sites, limit, filters): - return inv_multisite_table("invhist", columns, add_headers, only_sites, limit, filters) + return inv_multisite_table("invhist", None, columns, add_headers, only_sites, limit, filters) def create_hist_rows(hostname, columns): hist_tree = None

9 years, 2 months

Check_MK Git: check_mk: inventory of switch ports: fixed speed > 10Gb, add alias

by Mathias Kettner

Module: check_mk Branch: master Commit: 3587b5f4ba006cf74b741d7370fa8f6133e3dc6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3587b5f4ba006c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 29 17:13:22 2015 +0200 inventory of switch ports: fixed speed > 10Gb, add alias --- inventory/if | 31 +++++++++++++++++++------------ web/plugins/views/inventory.py | 5 +++-- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/inventory/if b/inventory/if index 8cb77a2..3c68cf9 100644 --- a/inventory/if +++ b/inventory/if @@ -36,8 +36,8 @@ def inv_if(info, params): available_ethernet_ports = 0 node = inv_tree("networking.interfaces:") - for if_index, if_descr, if_type, if_speed, if_oper_status, if_admin_status, \ - if_phys_address, if_last_change in info: + for if_index, if_descr, if_alias, if_type, if_speed, if_high_speed, \ + if_oper_status, if_admin_status, if_phys_address, if_last_change in info: if if_type in ( "231", "232" ): continue # Useless entries for "TenGigabitEthernet2/1/21--Uncontrolled" @@ -58,11 +58,16 @@ def inv_if(info, params): seconds = float(parts[3]) last_change = seconds + 60*minutes + 3600*hours + 86400*days + if if_high_speed: + speed = int(if_high_speed) * 1000 * 1000 + else: + speed = int(if_speed) node.append({ "index" : int(if_index), "description" : if_descr, - "speed" : int(if_speed), + "alias" : if_alias, + "speed" : speed, "phys_address" : render_mac_address(if_phys_address), "oper_status" : int(if_oper_status), "admin_status" : int(if_admin_status), # 1(up) or 2(down) @@ -86,15 +91,17 @@ def inv_if(info, params): inv_info['inv_if'] = { "inv_function" : inv_if, - 'snmp_info': ( ".1.3.6.1.2.1.2.2.1", [ - 1, # ifIndex - 2, # ifDescr - 3, # ifType - 5, # ifSpeed - 8, # ifOperStatus - 7, # ifAdminStatus - 6, # ifPhysAddress - 9, # ifLastChange + 'snmp_info': ( ".1.3.6.1.2.1", [ + "2.2.1.1", # ifIndex + "2.2.1.2", # ifDescr + "31.1.1.1.18", # ifAlias + "2.2.1.3", # ifType + "2.2.1.5", # ifSpeed + "31.1.1.1.15", # ifHighSpeed .. 1000 means 1Gbit + "2.2.1.8", # ifOperStatus + "2.2.1.7", # ifAdminStatus + "2.2.1.6", # ifPhysAddress + "2.2.1.9", # ifLastChange ]), 'snmp_scan_function': lambda oid: int(oid(".1.3.6.1.2.1.2.1.0")) >= 2, } diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 17b2742..7027a30 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -456,7 +456,7 @@ def inv_paint_if_oper_status(oper_status): else: css_class = "if_state_other" - return "if_state " + css_class, interface_oper_states.get(oper_status, str(oper_status)) + return "if_state " + css_class, interface_oper_states.get(oper_status, str(oper_status)).replace(" ", " ") # admin status can only be 1 or 2, matches oper status :-) @@ -584,9 +584,10 @@ inventory_displayhints.update({ ".networking.total_ethernet_ports" : { "title" : _("Ports"), "paint" : "count", }, ".networking.available_ethernet_ports" : { "title" : _("Ports available"), "paint" : "count", }, ".networking.interfaces:" : { "title" : _("Interfaces"), "render" : render_inv_dicttable, - "keyorder" : [ "index", "description", "oper_status", "admin_status", "available", "speed" ], "view" : "invinterface_of_host", }, + "keyorder" : [ "index", "description", "alias", "oper_status", "admin_status", "available", "speed" ], "view" : "invinterface_of_host", }, ".networking.interfaces:*.index" : { "title" : _("Index"), "paint" : "number", "filter" : visuals.FilterInvtableIDRange }, ".networking.interfaces:*.description" : { "title" : _("Description") }, + ".networking.interfaces:*.alias" : { "title" : _("Alias") }, ".networking.interfaces:*.phys_address" : { "title" : _("Physical Address (MAC)") }, ".networking.interfaces:*.oper_status" : { "title" : _("Operational Status"), "short" : _("Status"), "paint" : "if_oper_status", "filter" : visuals.FilterInvtableOperStatus }, ".networking.interfaces:*.admin_status" : { "title" : _("Administrative Status"), "short" : _("Admin"), "paint" : "if_admin_status", "filter" : visuals.FilterInvtableAdminStatus },

9 years, 2 months

Check_MK Git: check_mk: rebuild windows agents

by Andreas Boesl

Module: check_mk Branch: master Commit: f70bee4bdef8f1071ee020c7260314d6afb2c39b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f70bee4bdef8f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 16:46:40 2015 +0200 rebuild windows agents --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 300032 -> 300032 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 300032 -> 300032 bytes agents/windows/check_mk_agent.msi | Bin 730112 -> 730112 bytes agents/windows/install_agent-64.exe | Bin 177835 -> 177884 bytes agents/windows/install_agent.exe | Bin 158921 -> 158917 bytes 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index dee261d..b4f334f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -140 +141 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 62f7e37..a90a787 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 82bc295..72328cc 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.msi b/agents/windows/check_mk_agent.msi index bdde1ea..b789847 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 80efe14..de21efe 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 b83ae28..8e55954 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 2 months

Check_MK Git: check_mk: #2075 FIX check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e8afefa771407d82080394c9f9379e5381f595a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e8afefa771407… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 16:45:12 2015 +0200 #2075 FIX check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters The windows agent was unable to display eventlog entries when the character count of such an entry exceeded 2048. In this case the agent only reported a subset of the information, namely the strings which are filled into the placeholders of the larger message. --- .werks/2075 | 11 +++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/2075 b/.werks/2075 new file mode 100644 index 0000000..58835ba --- /dev/null +++ b/.werks/2075 @@ -0,0 +1,11 @@ +Title: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430318451 + +The windows agent was unable to display eventlog entries when the character count of such an entry exceeded 2048. +In this case the agent only reported a subset of the information, namely the strings which are filled into the placeholders of the larger message. diff --git a/ChangeLog b/ChangeLog index 8e94594..3845898 100644 --- a/ChangeLog +++ b/ChangeLog @@ -349,6 +349,7 @@ * 2247 FIX: ibm_svc_mdiskgrp: Made check working with different firmware versions outputs * 2071 FIX: windows agent: fileinfo check now correctly reports empty directories... * 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output... + * 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries > 2048 characters... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3f6305d..d63704a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1052,7 +1052,7 @@ void grow_eventlog_buffer(int newsize) bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, char type_char, const char *logname, const char *source_name, WCHAR **strings) { - char msgbuffer[2048]; + char msgbuffer[8192]; char dll_realpath[128]; HINSTANCE dll; @@ -1082,7 +1082,7 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch else dll = NULL; - WCHAR wmsgbuffer[2048]; + WCHAR wmsgbuffer[8192]; DWORD dwFlags = FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_SYSTEM; if (dll) dwFlags |= FORMAT_MESSAGE_FROM_HMODULE; @@ -1098,7 +1098,7 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch 0, // accept any language wmsgbuffer, // msgbuffer, - 2048, + 8192, (char **)strings ); crash_log("Formatting Message - DONE");

9 years, 2 months

Check_MK Git: check_mk: New helper function for rendering icon buttons

by Mathias Kettner

Module: check_mk Branch: master Commit: f68ce9783d0ebc7f993cac224622c4c1cf1a5984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f68ce9783d0ebc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 29 15:54:32 2015 +0200 New helper function for rendering icon buttons --- web/htdocs/htmllib.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d59e481..5510ec4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -412,6 +412,14 @@ class html: 'onmouseout=\"hilite_icon(this, 0)\">' '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon)) + def render_icon_button(self, *args, **kwargs): + self.plug() + self.icon_button(*args, **kwargs) + code = self.drain() + self.unplug() + return code + + def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">')

9 years, 2 months

Check_MK Git: check_mk: fixed wording

by Andreas Boesl

Module: check_mk Branch: master Commit: 0a62c4d4385712a91d1b3b1edb71b26e94e383ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a62c4d4385712… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 14:52:33 2015 +0200 fixed wording --- agents/windows/check_mk_agent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3d6a090..3f6305d 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5009,8 +5009,8 @@ void do_unpack_plugins(char *plugin_filename) { fclose(file); if (had_error) { - printf("There was an error on unpacking the Check_MK-Agent package: File integrety is broken\n." - "The file might have been installed partially."); + printf("There was an error on unpacking the Check_MK-Agent package: File integrity is broken\n." + "The file might have been installed partially!"); exit(1); }

9 years, 2 months

Check_MK Git: check_mk: pagetypes: deleting and sidebar integration

by Mathias Kettner

Module: check_mk Branch: master Commit: 2925a7cb85107672180a440be1120c104d3778fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2925a7cb851076… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 28 08:49:12 2015 +0200 pagetypes: deleting and sidebar integration --- web/htdocs/config.py | 10 +- web/htdocs/js/checkmk.js | 14 ++- web/htdocs/pagetypes.py | 199 +++++++++++++++++++++++++--------------- web/htdocs/sidebar.py | 2 +- web/htdocs/visuals.py | 3 + web/plugins/sidebar/shipped.py | 9 +- web/plugins/views/builtin.py | 4 +- 7 files changed, 155 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2925a7cb85…

9 years, 2 months

Check_MK Git: check_mk: First draft of new page concept

by Mathias Kettner

Module: check_mk Branch: master Commit: deca66f91fdb34bc69e696f9273d9c5b7c8d5c80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deca66f91fdb34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 21 10:27:10 2015 +0200 First draft of new page concept --- web/htdocs/pagetypes.py | 122 ++++++++++++++++++++++++++++++++++++++++ web/plugins/pages/pagetypes.py | 31 ++++++++++ 2 files changed, 153 insertions(+) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py new file mode 100644 index 0000000..89d4efe --- /dev/null +++ b/web/htdocs/pagetypes.py @@ -0,0 +1,122 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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- +# ails. 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. + +class PageType: + def __init__(self, d): + self._ = d + + # Functions that subclasses *must* define + # def type_name(): + # return "foobar" + + # Object methods + def topic(self): + return self._["topic"] + + def title(self): + return self._["title"] + + def description(self): + return self._.get("description", "") + + def is_hidden(self): + return self._.get("hidden", False) + + + # Class variables and methods + def builtin_pages(): + return {} + + + __pages = {} + + # Lädt alle Dinge vom aktuellen User-Homeverzeichnis und + # mergt diese mit den übergebenen eingebauten + @classmethod + def load(): + __pages.clear() + + # First load builtins from argument. Set username to '' + for name, page in builtin_pages().items(): + page["owner"] = '' # might have been forgotten on copy action + page["public"] = True + page["name"] = name + __pages[('', name)] = page + + # Now scan users subdirs for files "user_$type_name.mk" + subdirs = os.listdir(config.config_dir) + for user in subdirs: + try: + path = "%s/%s/user_%ss.mk" % (config.config_dir, user, type_name()) + if not os.path.exists(path): + continue + + user_pages = eval(file(path).read()) + for name, page in user_pages.items(): + page["owner"] = user + page["name"] = name + __pages[(user, name)] = page + + except SyntaxError, e: + raise MKGeneralException(_("Cannot load %s from %s: %s") % (what, path, e)) + + # Declare custom permissions + for page in __pages.values(): + declare_permission(page) + + + def declare_permission(page): + permname = "%s.%s" % (type_name(), page["name"]) + if page["public"] and not config.permission_exists(permname): + config.declare_permission(permname, page["title"], + page["description"], ['admin','user','guest']) + +page_types = {} + +def declare_page_type(page_type): + page_types[page_type.type_name()] = page_type + +def load_user_pages(): + for page_type in page_types.values(): + page_type.load() + +# ----------------------------------------------------------------------------------- + + +class GraphCollection(PageType): + def __init__(self, d): + PageType.__init__(self, d) + + @classmethod + def type_name(): + return "graph_collection" + +declare_page_type(GraphCollection) + +def page_foo(): + load_user_pages() + html.write("HALLO") + diff --git a/web/plugins/pages/pagetypes.py b/web/plugins/pages/pagetypes.py new file mode 100644 index 0000000..8a5c711 --- /dev/null +++ b/web/plugins/pages/pagetypes.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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- +# ails. 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. + +import pagetypes + +pagehandlers.update({ + "foo" : pagetypes.page_foo, +})

9 years, 2 months

Check_MK Git: check_mk: First step for new implementation of visuals

by Mathias Kettner

Module: check_mk Branch: master Commit: 2589a36270b5e53581b0cbfb3324f49c830eeef9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2589a36270b5e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 27 18:28:56 2015 +0200 First step for new implementation of visuals --- web/htdocs/default_permissions.py | 1 + web/htdocs/html_mod_python.py | 9 +- web/htdocs/htmllib.py | 9 +- web/htdocs/index.py | 35 +- web/htdocs/js/checkmk.js | 23 ++ web/htdocs/metrics.py | 209 ++++++++---- web/htdocs/pages.css | 2 +- web/htdocs/pagetypes.py | 642 ++++++++++++++++++++++++++++++++++--- web/htdocs/visuals.py | 11 +- web/plugins/pages/pagetypes.py | 31 -- 10 files changed, 801 insertions(+), 171 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2589a36270…

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015