Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ee3e5dc85d5644db79c59c0c007aecac2bed750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ee3e5dc85d564… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 19 12:22:30 2014 +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 52f5553..dc763b6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -758 +768

10 years, 3 months

Check_MK Git: check_mk: Updated Werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 00e8dde7a089e1e5b143672c68ebe040b05c4de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00e8dde7a089e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 19 10:15:03 2014 +0100 Updated Werk --- .werks/748 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.werks/748 b/.werks/748 index e880521..a59219e 100644 --- a/.werks/748 +++ b/.werks/748 @@ -13,3 +13,6 @@ and and that is published for other users. Please note that regardless of a view's permission the owner of the view can always see it. If you do not like this you can remove the permission for creating custom views. + +The default for new views is still that all roles have the permission for +this view.

10 years, 3 months

Check_MK Git: check_mk: Also custom views now have permissions

by Mathias Kettner

Module: check_mk Branch: master Commit: ed742dc2e8710ee65f6bc45cc6fbba735f045f04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed742dc2e8710e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 19 10:14:00 2014 +0100 Also custom views now have permissions In that past only builtin views had permissions that you could disable in a role and that way remove those views for certain users. Now this also works for custom views - i.e. views that a user has created with a new unique name and and that is published for other users. Please note that regardless of a view's permission the owner of the view can always see it. If you do not like this you can remove the permission for creating custom views. --- .werks/748 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/config.py | 22 +++++++++++++++++++--- web/htdocs/views.py | 42 +++++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 4 ++++ 5 files changed, 70 insertions(+), 14 deletions(-) diff --git a/.werks/748 b/.werks/748 new file mode 100644 index 0000000..e880521 --- /dev/null +++ b/.werks/748 @@ -0,0 +1,15 @@ +Title: Also custom views now have permissions +Level: 2 +Component: multisite +Version: 1.2.5i1 +Date: 1395220282 +Class: feature + +In that past only builtin views had permissions that you could disable in a +role and that way remove those views for certain users. Now this also works +for custom views - i.e. views that a user has created with a new unique name +and and that is published for other users. + +Please note that regardless of a view's permission the owner of the view can +always see it. If you do not like this you can remove the permission for +creating custom views. diff --git a/ChangeLog b/ChangeLog index 1d0cf29..f9e9ae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -227,6 +227,7 @@ * 0123 New time range filter for Downtimes and Comments... * 0683 New column painter for the last time a service was OK... * 0561 quicksearch: now able to search with multiple filters... + * 0748 Also custom views now have permissions... * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... * 0307 FIX: Increased performance of multisite GUI with a large userbase... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 8ff45dd..f748d98 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -72,9 +72,10 @@ except: # Global table of available permissions. Plugins may add their own # permissions by calling declare_permission() -permissions_by_name = {} -permissions_by_order = [] -permission_sections = {} +permissions_by_name = {} +permissions_by_order = [] +permission_sections = {} +permission_declaration_functions = [] # Constants for BI ALL_HOSTS = '(.*)' @@ -184,6 +185,21 @@ def declare_permission_section(name, title, prio = 0, do_sort = False): # be listed first, e.g. in the edit dialogs permission_sections[name] = (prio, title, do_sort) +# Some module have a non-fixed list of permissions. For example for +# each user defined view there is also a permission. This list is +# not known at the time of the loading of the module - though. For +# that purpose module can register functions. These functions should +# just call declare_permission(). They are being called in the correct +# situations. +def declare_dynamic_permissions(func): + permission_declaration_functions.append(func) + +# This function needs to be called by all code that needs access +# to possible dynamic permissions +def load_dynamic_permissions(): + for func in permission_declaration_functions: + func() + # Compute permissions for HTTP user and set in # global variables. Also store user. def login(u): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 053798f..95d9f34 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -72,20 +72,21 @@ def load_plugins(): loaded_with_language = current_language # Declare permissions for builtin views - config.declare_permission_section("view", _("Builtin views"), do_sort = True) + config.declare_permission_section("view", _("Multisite Views"), do_sort = True) for name, view in multisite_builtin_views.items(): config.declare_permission("view.%s" % name, view["title"], view["description"], config.builtin_role_ids) + # Make sure that custom views also have permissions + config.declare_dynamic_permissions(declare_custom_view_permissions) + # Add painter names to painter objects (e.g. for JSON web service) for n, p in multisite_painters.items(): p["name"] = n - - ################################################################################## # Layouts ################################################################################## @@ -237,6 +238,7 @@ class Filter: # Load all views - users or builtins def load_views(): + declare_custom_view_permissions() html.multisite_views = {} # first load builtins. Set username to '' @@ -273,7 +275,6 @@ def load_views(): if view['datasource'] not in multisite_datasources: continue - # Maybe resolve inherited attributes builtin_view = html.multisite_views.get(('', name)) if builtin_view: @@ -293,6 +294,26 @@ def load_views(): html.available_views = available_views() +# Load all users views just in order to declare permissions of custom views +def declare_custom_view_permissions(): + # Now scan users subdirs for files "views.mk" + subdirs = os.listdir(config.config_dir) + for user in subdirs: + try: + dirpath = config.config_dir + "/" + user + if os.path.isdir(dirpath): + path = dirpath + "/views.mk" + if not os.path.exists(path): + continue + views = eval(file(path).read()) + for name, view in views.items(): + if view["public"] and not config.permission_exists("view." + name): + config.declare_permission("view." + name, view["title"], + view["description"], ['admin','user','guest']) + except: + if opt_debug: + raise + # Get the list of views which are available to the user # (which could be retrieved with get_view) def available_views(): @@ -308,12 +329,12 @@ def available_views(): # 2. views of special users allowed to globally override builtin views for (u, n), view in html.multisite_views.items(): if n not in views and view["public"] and config.user_may(u, "general.force_views"): - # Honor original permissions for the current user - permname = "view.%s" % n - if config.permission_exists(permname) \ - and not config.may(permname): - continue - views[n] = view + # Honor original permissions for the current user + permname = "view.%s" % n + if config.permission_exists(permname) \ + and not config.may(permname): + continue + views[n] = view # 3. Builtin views, if allowed. for (u, n), view in html.multisite_views.items(): @@ -2764,7 +2785,6 @@ def ajax_inv_render_tree(): node = inventory.get(tree, invpath) if not node: html.show_error(_("Invalid path %s in inventory tree") % invpath) - html.debug(tree) else: render_inv_subtree_container(hostname, invpath, node) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4de2be2..ca18501 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11213,6 +11213,10 @@ def mode_edit_role(phase): html.context_button(_("All Roles"), make_link([("mode", "roles")]), "back") return + # Make sure that all dynamic permissions are available (e.g. those for custom + # views) + config.load_dynamic_permissions() + roles = userdb.load_roles() role = roles[id]

10 years, 3 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a1896ecced72f18a304bd527111b0635f50fd48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a1896ecced72f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 19 10:09:56 2014 +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 895152c..52f5553 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -748 +758

10 years, 3 months

Check_MK Git: check_mk: Sort permissions of views, dashboards,

by Mathias Kettner

commands and snapins alphabetically Message-ID: <5328794c.mIG36oJfbTKWeaNe%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: a330e69ca0328abc9373296c839b9dc957c2c2be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a330e69ca0328a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 17:50:11 2014 +0100 Sort permissions of views, dashboards, commands and snapins alphabetically --- .werks/717 | 8 ++++++++ ChangeLog | 1 + web/htdocs/config.py | 4 ++-- web/htdocs/dashboard.py | 2 +- web/htdocs/sidebar.py | 2 +- web/htdocs/views.py | 4 ++-- web/htdocs/wato.py | 16 ++++++++++++---- 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.werks/717 b/.werks/717 new file mode 100644 index 0000000..5700a31 --- /dev/null +++ b/.werks/717 @@ -0,0 +1,8 @@ +Title: Sort permissions of views, dashboards, commands and snapins alphabetically +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1395161390 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fb51ebc..d8e0ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -277,6 +277,7 @@ * 0687 New summary pages with all settings of a host or service... * 0275 WATO "Notify Users" feature: Improved confirmation info... * 0134 New option to use expect string in response heads for check_http in wato... + * 0717 Sort permissions of views, dashboards, commands and snapins alphabetically * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 713e132..8ff45dd 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -179,10 +179,10 @@ def declare_permission(name, title, description, defaults): permissions_by_name[name] = perm -def declare_permission_section(name, title, prio = 0): +def declare_permission_section(name, title, prio = 0, do_sort = False): # Prio can be a number which is used for sorting. Higher numbers will # be listed first, e.g. in the edit dialogs - permission_sections[name] = (prio, title) + permission_sections[name] = (prio, title, do_sort) # Compute permissions for HTTP user and set in # global variables. Also store user. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 34e1c77..e58aed6 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -77,7 +77,7 @@ def load_plugins(): dashboards = builtin_dashboards # Declare permissions for all dashboards - config.declare_permission_section("dashboard", _("Dashboards")) + config.declare_permission_section("dashboard", _("Dashboards"), do_sort = True) for name, dashboard in dashboards.items(): config.declare_permission("dashboard.%s" % name, dashboard["title"], diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 7915376..dcb3104 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -55,7 +55,7 @@ def load_plugins(): loaded_with_language = current_language # Declare permissions: each snapin creates one permission - config.declare_permission_section("sidesnap", _("Sidebar snapins")) + config.declare_permission_section("sidesnap", _("Sidebar snapins"), do_sort = True) for name, snapin in sidebar_snapins.items(): config.declare_permission("sidesnap.%s" % name, snapin["title"], diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1440bd1..053798f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -62,7 +62,7 @@ def load_plugins(): global view_hooks ; view_hooks = {} global inventory_displayhints ; inventory_displayhints = {} - config.declare_permission_section("action", _("Commands on host and services")) + config.declare_permission_section("action", _("Commands on host and services"), do_sort = True) load_web_plugins("views", globals()) @@ -72,7 +72,7 @@ def load_plugins(): loaded_with_language = current_language # Declare permissions for builtin views - config.declare_permission_section("view", _("Builtin views")) + config.declare_permission_section("view", _("Builtin views"), do_sort = True) for name, view in multisite_builtin_views.items(): config.declare_permission("view.%s" % name, view["title"], diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bc9cf2f..4de2be2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11301,12 +11301,16 @@ def mode_edit_role(phase): "permissions that are on default will reflect the new base role.")) # Loop all permission sections, but sorted plz - for section, (prio, section_title) in sorted(config.permission_sections.iteritems(), + for section, (prio, section_title, do_sort) in sorted(config.permission_sections.iteritems(), key = lambda x: x[1][0], reverse = True): forms.header(section_title, False) # Loop all permissions - for perm in config.permissions_by_order: + permlist = config.permissions_by_order[:] + if do_sort: + permlist.sort(cmp = lambda a,b: cmp(a["title"], b["title"])) + + for perm in permlist: pname = perm["name"] this_section = pname.split(".")[0] if section != this_section: @@ -11390,7 +11394,7 @@ def mode_role_matrix(phase): # Loop all permission sections, but sorted plz odd = "even" - for section, (prio, section_title) in sorted(config.permission_sections.iteritems(), + for section, (prio, section_title, do_sort) in sorted(config.permission_sections.iteritems(), key = lambda x: x[1][0], reverse = True): html.write('<tr>') @@ -11398,7 +11402,11 @@ def mode_role_matrix(phase): html.write('</tr>') # Loop all permissions - for perm in config.permissions_by_order: + permlist = config.permissions_by_order[:] + if do_sort: + permlist.sort(cmp = lambda a,b: cmp(a["title"], b["title"])) + + for perm in permlist: pname = perm["name"] this_section = pname.split(".")[0] if section != this_section:

10 years, 3 months

Check_MK Git: check_mk: dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers

by Götz Golla

Module: check_mk Branch: master Commit: db91e60235f2762054c7e8e992594e7180bd819e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db91e60235f276… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 18 17:32:05 2014 +0100 dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers --- .werks/594 | 8 ++++ ChangeLog | 1 + checkman/dell_poweredge_netdev | 31 +++++++++++++ checks/dell_poweredge_netdev | 98 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+) diff --git a/.werks/594 b/.werks/594 new file mode 100644 index 0000000..28d1216 --- /dev/null +++ b/.werks/594 @@ -0,0 +1,8 @@ +Title: dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395160279 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fb51ebc..fea0e57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 0143 ups_socomec_in_voltage, ups_socomec_out_voltage: Socomec UPS Devices, Input and Output Voltages... * 0732 df: now able to monitor inodes... * 0716 Add Linux caching agent also to normal agent RPM... + * 0594 dell_poweredge_netdev: new check to monitor the status of network devices on Dells Poweredge Servers * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/dell_poweredge_netdev b/checkman/dell_poweredge_netdev new file mode 100644 index 0000000..46ef447 --- /dev/null +++ b/checkman/dell_poweredge_netdev @@ -0,0 +1,31 @@ +title: Dell PowerEdge Server: State of Network Devices +agents: snmp +catalog: hw/server/dell +license: GPL +distribution: check_mk +description: + This check monitors the state of the network devices of Dell PowerEdge Servers. + The state is extracted from the device via SNMP from the parameters + {networkDeviceStatus} and {networkDeviceConnectionStatus}. + + The state of the check is {OK} when the device returns a state of {OK}. + The state of the cehck is {WARN} when the device returns a state of {other}, + {unknown} or {nonCritical}. The state of the check is {CRIT} otherwise. + + The state also returns {OK} when the connections status is {CONNECTED}. + It returns {CRIT} otherwise und {WARN} if the connection status is {UNKNOWN} + + No limits are set in the check. + + In addition to the state the following information is retrieved and displayed in + the check output: name of the product, current MAC address + , + description of the device and manufacturer, + +item: + The name of the fqdd variable for the device + +inventory: + All network devices of the device are detected + + diff --git a/checks/dell_poweredge_netdev b/checks/dell_poweredge_netdev new file mode 100644 index 0000000..a8f874a --- /dev/null +++ b/checks/dell_poweredge_netdev @@ -0,0 +1,98 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +dell_poweredge_netdev_info = ( ".1.3.6.1.4.1.674.10892.5.4.1100.90.1", [ + #"1", # networkDeviceChassisIndex + #"2", # networkDeviceIndex + "3", # networkDeviceStatus 0 + "4", # networkDeviceConnectionStatus 1 + "6", # networkDeviceProductName 2 + "15", # networkDeviceCurrentMACAddress 3 + #"16", # networkDevicePermanentMACAddress + #"17", # networkDevicePCIBisNumber + #"18", # networkDevicePCIDeviceNumber + #"19", # networkDevicePCIFunctionNumber + #"23", # networkDeviceTOECapabilityFlag + #"27", # networkDeviceSCSICapabilityFlag + #"28", # networkDeviceSCSIEnabled + #"29", # networkDeviceCapabilities + "30", # networkDeviceFQDD 4 + ]) + +dell_poweredge_netdev_scan = lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5" + +def inventory_dell_poweredge_netdev(info): + inventory = [] + for line in info: + if line[4] != "": + inventory.append( ( line[4], None ) ) + return inventory + +def check_dell_poweredge_netdev(item, _no_params, info): + di = dict() + for status, connection_status, di['Product'], cur_mac, fqdd in info: + if item == fqdd: + print connection_status + di['MAC'] = '-'.join( [ "%02X" % ord( c ) for c in cur_mac ] ).strip() + state_table = { + "1" : ( "other,", 1 ), + "2" : ( "unknown,", 1 ), + "3" : ( "", 0 ), + "4" : ( "nonCritical,", 1 ), + "5" : ( "Critical,", 2 ), + "6" : ( "NonRecoverable,", 2 ), + } + connection_table = { + "1" : ( "connected", 0 ), + "2" : ( "disconnected", 2 ), + "3" : ( "driverBad", 2 ), + "4" : ( "driverDisabled", 2 ), + "10" : ( "hardwareInitializing", 2 ), + "11" : ( "hardwareResetting", 2 ), + "12" : ( "hardwareClosing", 2 ), + "13" : ( "hardwareNotReady", 2 ), + } + dev_state_txt, dev_state = state_table.get(status, ( "unknown device status,", 2 )) + conn_state_txt, conn_state = connection_table.get(connection_status, ( "unknown connection status", 1 )) + state = max(dev_state, conn_state) + infotext = "%s %s" % (dev_state_txt, conn_state_txt) + for parameter, value in di.items(): + infotext += ", %s: %s" % ( parameter, value ) + infotext = re.sub("^, ","", infotext) + + return state, infotext + + return 3, "network device not found" + +check_info["dell_poweredge_netdev"] = { + "check_function" : check_dell_poweredge_netdev, + "inventory_function" : inventory_dell_poweredge_netdev, + "service_description" : "%s", + "has_perfdata" : False, + "snmp_info" : dell_poweredge_netdev_info, + "snmp_scan" : dell_poweredge_netdev_scan, +} +

10 years, 3 months

Check_MK Git: check_mk: Refurbished output of checks

by Götz Golla

Module: check_mk Branch: master Commit: cc773cc65793e50819b2da181347e0e7a1667f01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc773cc65793e5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 18 17:16:20 2014 +0100 Refurbished output of checks --- checks/dell_poweredge_mem | 4 ++-- checks/dell_poweredge_pci | 4 ++-- checks/dell_poweredge_status | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/checks/dell_poweredge_mem b/checks/dell_poweredge_mem index 50e9748..3acd7bc 100644 --- a/checks/dell_poweredge_mem +++ b/checks/dell_poweredge_mem @@ -54,9 +54,9 @@ def inventory_dell_poweredge_mem(info): def check_dell_poweredge_mem(item, _no_params, info): di = dict() - for status, location, di['Size'], di['Speed'], di['Manufacturer'], di['PartNumber'], \ - di['SerialNumber'] in info: + for status, location, size, di['Speed'], di['MFR'], di['P/N'], di['S/N'] in info: + di['Size'] = str(saveint(size)/1024/1024)+"GB" if item == location: state_table = { "1" : ( "other", 1 ), diff --git a/checks/dell_poweredge_pci b/checks/dell_poweredge_pci index fdc22cd..451ec19 100644 --- a/checks/dell_poweredge_pci +++ b/checks/dell_poweredge_pci @@ -48,7 +48,7 @@ def inventory_dell_poweredge_pci(info): def check_dell_poweredge_pci(item, _no_params, info): di = dict() - for status, di['BusWidth'], di['Manufacturer'], di['Description'], fqdd in info: + for status, di['BusWidth'], di['MFR'], di['Desc.'], fqdd in info: if item == fqdd: state_table = { @@ -72,7 +72,7 @@ def check_dell_poweredge_pci(item, _no_params, info): check_info["dell_poweredge_pci"] = { "check_function" : check_dell_poweredge_pci, "inventory_function" : inventory_dell_poweredge_pci, - "service_description" : "%s", + "service_description" : "PCI %s", "has_perfdata" : False, "snmp_info" : dell_poweredge_pci_info, "snmp_scan" : dell_poweredge_pci_scan, diff --git a/checks/dell_poweredge_status b/checks/dell_poweredge_status index b2f9a16..4724485 100644 --- a/checks/dell_poweredge_status +++ b/checks/dell_poweredge_status @@ -41,8 +41,7 @@ def inventory_dell_poweredge_status(info): def check_dell_poweredge_status(item, _no_params, info): di = dict() - di['racURL'], di['chassisSystemName'], di['SystemBladeSlotNumber'], \ - di['systemModelName'], status, di['chassisServiceTagName'] = info[0] + di['racURL'], di['Chassis'], di['Slot'], di['Model'], status, di['ServiceTag'] = info[0] state_table = { "1" : ( "other", 1 ), @@ -54,7 +53,7 @@ def check_dell_poweredge_status(item, _no_params, info): } state_txt, state = state_table.get(status, "2") infotext, state = state_table.get(status, "2") - for parameter, value in di.items(): + for parameter, value in di.items(): infotext += ", %s: %s" % ( parameter, value ) infotext = re.sub("^, ","", infotext)

10 years, 3 months

Check_MK Git: check_mk: INV: nicer parsing of dmidecode

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f6ad1be25e61c32c05a808da8e139a3b5d506df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f6ad1be25e61c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 17:14:32 2014 +0100 INV: nicer parsing of dmidecode --- inventory/dmidecode | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inventory/dmidecode b/inventory/dmidecode index 424b1d4..d29ded9 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -221,12 +221,14 @@ def inv_dmidecode_parse_mem_device(lines): device["size"] = dmidecode_parse_size(device["size"]) array["devices"].append(device) + def inv_dmidecode_parse_generic(node, lines, keyinfo): if type(node) == str: node = inv_tree(node) for line in lines: if line[0] in keyinfo: - node[keyinfo[line[0]]] = line[1] + if line[1] != "Not Specified": + node[keyinfo[line[0]]] = line[1] def dmidecode_parse_size(v): # into Bytes (int)

10 years, 3 months

Check_MK Git: check_mk: INV: fixed some dmidecode parsing problems

by Mathias Kettner

Module: check_mk Branch: master Commit: 70dc1dfa0f8058ef45f28d6b401319768a25d304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70dc1dfa0f8058… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 17:03:32 2014 +0100 INV: fixed some dmidecode parsing problems --- inventory/dmidecode | 27 ++++++++++++++++++--------- inventory/lnx_cpuinfo | 12 ++++++++---- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/inventory/dmidecode b/inventory/dmidecode index 827ba1d..424b1d4 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -128,17 +128,23 @@ def inv_dmidecode_parse_chassis(lines): # Note: This node is also being filled by lnx_cpuinfo def inv_dmidecode_parse_processor(lines): - node = inv_tree("hardware.cpu.") + cpu_info = {} for line in lines: if line[0] == "Manufacturer": - node["vendor"] = { + cpu_info["vendor"] = { "GenuineIntel" : "intel", "AuthenticAMD" : "amd", }.get(line[1], line[1]) elif line[0] == "Max Speed": # 2530 MHz - node["max_speed"] = dmidecode_parse_speed(line[1]) + cpu_info["max_speed"] = dmidecode_parse_speed(line[1]) elif line[0] == "Voltage": - node["voltage"] = dmidecode_parse_voltage(line[1]) + cpu_info["voltage"] = dmidecode_parse_voltage(line[1]) + elif line[0] == "Status": + if line[1] == "Unpopulated": + return + + # Only update our CPU information if the socket is populated + inv_tree("hardware.cpu.").update(cpu_info) # def inv_dmidecode_parse_mem_controller(lines): # # TODO: Can we have multiple memory controllers @@ -192,7 +198,6 @@ def inv_dmidecode_parse_mem_device(lines): node = inv_tree("hardware.memory.arrays:") array = node[-1] device = {} - array["devices"].append(device) inv_dmidecode_parse_generic(device, lines, { "Total Width" : "total_width", # 64 bits "Data Width" : "data_width", # 64 bits @@ -210,9 +215,11 @@ def inv_dmidecode_parse_mem_device(lines): "Size" : "size", # 2048 MB }) - # Convert speed and size into numbers - device["speed"] = dmidecode_parse_speed(device["speed"]) - device["size"] = dmidecode_parse_speed(device["size"]) + if device["size"] != "No Module Installed": + # Convert speed and size into numbers + device["speed"] = dmidecode_parse_speed(device["speed"]) + device["size"] = dmidecode_parse_size(device["size"]) + array["devices"].append(device) def inv_dmidecode_parse_generic(node, lines, keyinfo): if type(node) == str: @@ -227,7 +234,9 @@ def dmidecode_parse_size(v): # into Bytes (int) return None parts = v.split() - if parts[1].lower() == "gb": + if parts[1].lower() == "tb": + return int(parts[0]) * 1024 * 1024 * 1024 * 1024 + elif parts[1].lower() == "gb": return int(parts[0]) * 1024 * 1024 * 1024 elif parts[1].lower() == "mb": return int(parts[0]) * 1024 * 1024 diff --git a/inventory/lnx_cpuinfo b/inventory/lnx_cpuinfo index ab8a63b..4f6f904 100644 --- a/inventory/lnx_cpuinfo +++ b/inventory/lnx_cpuinfo @@ -57,6 +57,7 @@ # Note: This node is also being filled by dmidecode def inv_lnx_cpuinfo(info): node = inv_tree("hardware.cpu.") + num_cpus = 0 for varname, value in info: if varname == "cpu cores": node["cores_per_cpu"] = int(value) @@ -73,12 +74,15 @@ def inv_lnx_cpuinfo(info): node["cache_size"] = int(value.split()[0]) * 1024 # everything is normalized to bytes! elif varname == "model name": node["model"] = value - elif varname == "physical id": + elif varname == "processor": num_cpus = int(value) + 1 - node["cores"] = num_cpus * node["cores_per_cpu"] - node["threads"] = num_cpus * node["threads_per_cpu"] - node["cpus"] = num_cpus + if num_cpus: + node.setdefault("cores_per_cpu", 1) + node.setdefault("threads_per_cpu", 1) + node["cores"] = num_cpus * node["cores_per_cpu"] + node["threads"] = num_cpus * node["threads_per_cpu"] + node["cpus"] = num_cpus inv_info['lnx_cpuinfo'] = { "inv_function" : inv_lnx_cpuinfo,

10 years, 3 months

Check_MK Git: check_mk: Add Linux caching agent also to normal agent RPM

by Mathias Kettner

Module: check_mk Branch: master Commit: cb7e659258f5740bfdb9faa8dac71bba5b27f13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb7e659258f574… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 16:02:53 2014 +0100 Add Linux caching agent also to normal agent RPM In the RPM package for the Linux agent we now always ship the "Caching" agent <tt>/usr/bin/check_mk_caching_agent</tt>. In order to use it instead of the normal agent, simply edit <tt>/etc/xinetd.d/check_mk</tt>. --- .werks/716 | 10 ++++++++++ ChangeLog | 1 + check_mk.spec | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/716 b/.werks/716 new file mode 100644 index 0000000..81c801d --- /dev/null +++ b/.werks/716 @@ -0,0 +1,10 @@ +Title: Add Linux caching agent also to normal agent RPM +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1395153584 +Class: feature + +In the RPM package for the Linux agent we now always ship +the "Caching" agent <tt>/usr/bin/check_mk_caching_agent</tt>. In order +to use it instead of the normal agent, simply edit <tt>/etc/xinetd.d/check_mk</tt>. diff --git a/ChangeLog b/ChangeLog index 0037d89..fb51ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 0705 arcserve_backup: improved documentation (check manpage and comments in the agent plugin) * 0143 ups_socomec_in_voltage, ups_socomec_out_voltage: Socomec UPS Devices, Input and Output Voltages... * 0732 df: now able to monitor inodes... + * 0716 Add Linux caching agent also to normal agent RPM... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/check_mk.spec b/check_mk.spec index 667321a..3d7a93f 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -190,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT %files agent %config(noreplace) /etc/xinetd.d/check_mk /usr/bin/check_mk_agent +/usr/bin/check_mk_caching_agent /usr/bin/waitmax /usr/bin/mk-job /usr/share/doc/check_mk_agent @@ -202,6 +203,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/xinetd.d/check_mk /usr/bin/check_mk_agent /usr/bin/waitmax +/usr/bin/check_mk_caching_agent /usr/bin/mk-job /usr/share/doc/check_mk_agent %dir /usr/lib/check_mk_agent/local

10 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014