Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 70ed8646b24b822c4e7691d16897f0d2de0f2938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ed8646b24b82… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 15:54:58 2014 +0100 Edited werk 254 --- .werks/254 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.werks/254 b/.werks/254 index 2005bc2..eb42275 100644 --- a/.werks/254 +++ b/.werks/254 @@ -7,9 +7,14 @@ Version: 1.2.5i1 Date: 1389277479 Targetversion: future -This feature allows to configure how spaces of VMs in esx hostsystem should be treated. -Hostnames in the monitoring core generally are not allowed to have space. -The new option -S (configurable via a WATO rule) can now set how to handle these spaces:<br> -Option: -S cut -> The virtual machines name is cut after the first space<br> -Option: -S underline -> All spaces of this virtual machine are replaced with underline +This feature allows to configure how spaces of VMs of ESX should be treated. +Hostnames in the monitoring core generally are not allowed to contain spaces. +The new option <tt>-S</tt> (configurable via the WATO rule <i>Check state +of VMWare ESX via vSphere</i>) can now set how to handle these spaces: + +<table> +<tr><th>Option</th><th>Behaviour</th></tr> +<tr><td class=tt>-S cut</td><td>The virtual machines name is cut after the first space</td></tr> +<tr><td class=tt>-S underline</td><td>All spaces of this virtual machine are replaced with underline</td></tr> +</table>

10 years, 8 months

Check_MK Git: check_mk: User Custom Attributes can now be exported to the core

by Bastian Kuhn

Module: check_mk Branch: master Commit: 03dfe52ab98076557622fefaacc78bdc62aab939 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03dfe52ab98076… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jan 9 15:54:52 2014 +0100 User Custom Attributes can now be exported to the core The Wato User Management has a feature to create Custom Attributes for users. This Attributes can now be used as custom macros for the monitoring core. The "Edit User Attribute" Dialog now has the option: "Add as Custom Macro". --- .werks/114 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 3 +++ web/htdocs/userdb.py | 19 ++++++++++++++----- web/htdocs/wato.py | 17 ++++++++++++----- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.werks/114 b/.werks/114 new file mode 100644 index 0000000..1b3ae28 --- /dev/null +++ b/.werks/114 @@ -0,0 +1,10 @@ +Title: User Custom Attributes can now be exported to the core +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1389279133 +Class: feature + +The Wato User Management has a feature to create Custom Attributes for users. +This Attributes can now be used as custom macros for the monitoring core. The +"Edit User Attribute" Dialog now has the option: "Add as Custom Macro". diff --git a/ChangeLog b/ChangeLog index e0ae4a9..2ef3822 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * 0112 Explicit mapping of clustered services can now be done with WATO... * 0437 Convert WATO rule for debug_log into simple Checkbox... * 0428 Changed user profiles (e.g. pw changes) are now replicated in distributed setups... + * 0114 User Custom Attributes can now be exported to the core... * 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/modules/check_mk.py b/modules/check_mk.py index 0e1ca16..f740f61 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2516,6 +2516,9 @@ def create_nagios_config_contacts(outfile): outfile.write(" %s_notification_options\t%s\n" % (what, ",".join(list(no)))) outfile.write(" %s_notification_period\t%s\n" % (what, contact.get("notification_period", "24X7"))) outfile.write(" %s_notification_commands\t%s\n" % (what, contact.get("%s_notification_commands" % what, "check-mk-notify"))) + # Add custom macros + for macro in [ m for m in contact.keys() if m.startswith('_') ]: + outfile.write(" %s\t%s\n" % ( macro, contact[macro] )) outfile.write(" contactgroups\t\t\t%s\n" % ", ".join(cgrs)) outfile.write("}\n\n") diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index e584e43..9cba39d 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -166,12 +166,13 @@ multisite_dir = defaults.default_config_dir + "/multisite.d/wato/" # | | # +----------------------------------------------------------------------+ -def declare_user_attribute(name, vs, user_editable = True, permission = None, show_in_table = False, topic = None): +def declare_user_attribute(name, vs, user_editable = True, permission = None, show_in_table = False, topic = None, add_custom_macro = False): user_attributes[name] = { - 'valuespec': vs, - 'user_editable': user_editable, - 'show_in_table': show_in_table, - 'topic': topic and topic or 'personal', + 'valuespec' : vs, + 'user_editable' : user_editable, + 'show_in_table' : show_in_table, + 'topic' : topic and topic or 'personal', + 'add_custom_macro' : add_custom_macro, } # Permission needed for editing this attribute if permission: @@ -354,6 +355,13 @@ def split_dict(d, keylist, positive): def save_users(profiles): custom_values = user_attributes.keys() + + # Add custom macros + core_custom_macros = [ k for k,o in user_attributes.items() if o.get('add_custom_macro') ] + for user in profiles.keys(): + for macro in core_custom_macros: + if profiles[user].get(macro): + profiles[user]['_'+macro] = profiles[user][macro] # Keys not to put into contact definitions for Check_MK non_contact_keys = [ @@ -614,6 +622,7 @@ def declare_custom_user_attrs(): user_editable = attr['user_editable'], show_in_table = attr.get('show_in_table', False), topic = attr.get('topic', 'personal'), + add_custom_macro = attr.get('add_custom_macro', False ) ) #. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 33fa821..b4bf921 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14135,6 +14135,7 @@ def mode_edit_custom_attr(phase, what): help = html.var_utf8('help').strip() user_editable = html.get_checkbox('user_editable') show_in_table = html.get_checkbox('show_in_table') + add_custom_macro = html.get_checkbox('add_custom_macro') if new: name = html.var("name", '').strip() @@ -14161,11 +14162,12 @@ def mode_edit_custom_attr(phase, what): else: log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Changed title of %s attribute %s") % (what, name)) attr.update({ - 'title' : title, - 'topic' : topic, - 'help' : help, - 'user_editable' : user_editable, - 'show_in_table' : show_in_table, + 'title' : title, + 'topic' : topic, + 'help' : help, + 'user_editable' : user_editable, + 'show_in_table' : show_in_table, + 'add_custom_macro' : add_custom_macro, }) save_custom_attrs(all_attrs) @@ -14217,6 +14219,11 @@ def mode_edit_custom_attr(phase, what): 'you can also make it visible in the overview tables.')) html.checkbox('show_in_table', attr.get('show_in_table', False)) + forms.section(_('Add as Custom Macro')) + html.help(_('The attribute can be added to the contact definiton in order ' + 'to use it for notifications.')) + html.checkbox('add_custom_macro', attr.get('add_custom_macro', False)) + forms.end() html.button("save", _("Save")) html.hidden_fields()

10 years, 8 months

Check_MK Git: check_mk: agent_vsphere: Make handling of spaces in hostnames of ESX configurable

by Andreas Boesl

Module: check_mk Branch: master Commit: a71a8565a5bb651946850ad9fd5abcce24bf6da6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a71a8565a5bb65… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 9 15:29:02 2014 +0100 agent_vsphere: Make handling of spaces in hostnames of ESX configurable This feature allows to configure how spaces of VMs in esx hostsystem should be treated. Hostnames in the monitoring core generally are not allowed to have space. The new option -S (configurable via a WATO rule) can now set how to handle these spaces:<br> Option: -S cut -> The virtual machines name is cut after the first space<br> Option: -S underline -> All spaces of this virtual machine are replaced with underline --- .werks/254 | 15 +++++++++++++++ ChangeLog | 1 + 2 files changed, 16 insertions(+) diff --git a/.werks/254 b/.werks/254 new file mode 100644 index 0000000..2005bc2 --- /dev/null +++ b/.werks/254 @@ -0,0 +1,15 @@ +Title: agent_vsphere: Make handling of spaces in hostnames of ESX configurable +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1389277479 +Targetversion: future + +This feature allows to configure how spaces of VMs in esx hostsystem should be treated. +Hostnames in the monitoring core generally are not allowed to have space. +The new option -S (configurable via a WATO rule) can now set how to handle these spaces:<br> +Option: -S cut -> The virtual machines name is cut after the first space<br> +Option: -S underline -> All spaces of this virtual machine are replaced with underline + diff --git a/ChangeLog b/ChangeLog index 93200fd..8449fae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 0320 hitachi_hnas_fpga: new check for Hitachi HNAS storage systems * 0321 brocade_mlx: enhancing checks (BR-MLX modules, more OK states)... * 0323 emcvnx_hwstatus, emcvnx_hba, emcvnx_disks: new checks for EMC VNX storage systems + * 0254 agent_vsphere: Make handling of spaces in hostnames of ESX configurable... * 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...

10 years, 8 months

Check_MK Git: check_mk: agent_vpshere.pysphere: Make handling of spaces in hostnames of ESX configurable

by Andreas Boesl

Module: check_mk Branch: master Commit: 014d13040604a50df409862879f617c13adce010 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=014d13040604a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 9 15:22:40 2014 +0100 agent_vpshere.pysphere: Make handling of spaces in hostnames of ESX configurable --- agents/special/agent_vsphere.pysphere | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index f5487dd..ece7318 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -81,12 +81,16 @@ OPTIONS: -c, --dump-counters Simply dumping out all available counters and their values. This mode is meant for debugging and diagnostic purposes. + -S, --spaces HOW How to handle spaces in hostnames. "cut": cut everyting + after the first space, "underscore": replace with + underscores. Default is "underscore". + """) -short_options = 'hi:u:s:Dat:H:cp' +short_options = 'hi:u:s:Dat:H:cpS:' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', - 'dump-counters', 'profile', 'pysphere', + 'dump-counters', 'profile', 'pysphere', 'spaces=' ] try: @@ -102,6 +106,7 @@ opt_dump_counters = False opt_timeout = 60 opt_hostname = None opt_skip_placeholder_vm = False +opt_spaces = "cut" g_profile = None g_profile_path = "vsphere_profile.out" @@ -136,6 +141,11 @@ for o,a in opts: opt_hostname = a elif o in [ '-c', '--dump-counters' ]: opt_dump_counters = True + elif o in [ '-S', '--spaces']: + if a not in [ "cut", "underscore" ]: + usage() + sys.exit(1) + opt_spaces = a elif o in [ '-h', '--help' ]: usage() sys.exit(0) @@ -233,6 +243,12 @@ print "AgentOs: %s " % host.get_server_type() # Prepare list of all hosts systems all_hosts = host.get_hosts() +def convert_hostname(h): + if opt_spaces == "cut": + return h.split()[0] + else: + return h.replace(" ", "_") + def output_profile(): g_profile.dump_stats(g_profile_path) show_profile = os.path.join(os.path.dirname(g_profile_path), 'show_profile.py') @@ -585,7 +601,10 @@ def output_mors(what, properties, direct=False): # Convert property value using specified conversion function data[p.Name] = properties[p.Name](p.Val) - obj_name = data["name"].split()[0] # get rid of comment + if obj_type == MORTypes.VirtualMachine: + obj_name = convert_hostname(data["name"]) + else: + obj_name = data["name"] # Output multiplexed Check_MK Agent output (new in version 1.2.3i1) if direct:

10 years, 8 months

Check_MK Git: check_mk: Removed lots of trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 159fd6cb7c2ddc4f29c7f2db4cfc5d2e6af374f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=159fd6cb7c2ddc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 15:22:32 2014 +0100 Removed lots of trailing spaces --- checkman/emcvnx_disks | 8 ++++---- checkman/emcvnx_hwstatus | 6 +++--- checkman/hitachi_hnas_fpga | 2 +- checkman/hitachi_hnas_quorumdevice | 2 +- checkman/hitachi_hnas_temp | 4 ++-- checkman/hitachi_hnas_vnode | 6 +++--- checkman/kemp_loadmaster_ha | 2 +- checkman/kemp_loadmaster_realserver | 2 +- checkman/kemp_loadmaster_services | 2 +- checkman/moxa_iologik_register | 2 +- checkman/raritan_pdu_inlet | 2 +- checkman/stulz_humidity | 2 +- checkman/stulz_temp | 2 +- checks/blade_blades | 2 +- checks/cisco_fantray | 2 +- checks/emcvnx_disks | 2 +- checks/emcvnx_hba | 2 +- checks/hitachi_hnas_fan | 2 +- checks/hitachi_hnas_fpga | 2 +- checks/hitachi_hnas_pnode | 4 ++-- checks/hitachi_hnas_psu | 2 +- checks/hitachi_hnas_temp | 2 +- checks/hitachi_hnas_vnode | 4 ++-- checks/kemp_loadmaster_realserver | 2 +- checks/stulz_powerstate | 2 +- modules/check_mk_base.py | 2 +- web/htdocs/check_mk.css | 2 +- web/htdocs/wato.py | 4 ++-- web/plugins/wato/check_mk_configuration.py | 2 +- 29 files changed, 40 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=159fd6cb7c…

10 years, 8 months

Check_MK Git: check_mk: emc_isilon: fixed syntax error in check manpage

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e634d1b6be3e681f22b89e5d6d581cdc487da7df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e634d1b6be3e68… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 9 15:19:26 2014 +0100 emc_isilon: fixed syntax error in check manpage --- checkman/emc_isilon.names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/emc_isilon.names b/checkman/emc_isilon.names index 5774a62..fe3b7c7 100644 --- a/checkman/emc_isilon.names +++ b/checkman/emc_isilon.names @@ -2,7 +2,7 @@ title: EMC Isilon: Report Cluster and Node Name agents: snmp catalog: hw/storagehw/emc license: GPL -silon Infodistribution: check_mk +distribution: check_mk description: Reports the Cluster and Node Name of EMC Isilon Storage System. This Check always returns {OK}.

10 years, 8 months

Check_MK Git: check_mk: emcvnx_disks, emcvnx_hba, emcvnx_hwstatus: fixed manpage catalog entry

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1725d3b54f519ffb08152e27e9d08a1bf387a708 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1725d3b54f519f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 9 15:08:50 2014 +0100 emcvnx_disks, emcvnx_hba, emcvnx_hwstatus: fixed manpage catalog entry --- checkman/emcvnx_disks | 2 +- checkman/emcvnx_hba | 2 +- checkman/emcvnx_hwstatus | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/emcvnx_disks b/checkman/emcvnx_disks index aad234c..c6a234f 100644 --- a/checkman/emcvnx_disks +++ b/checkman/emcvnx_disks @@ -1,6 +1,6 @@ title: EMC VNX Storage: Status and I/O of Disks agents: emc -catalog: hw/storage +catalog: hw/storagehw/emc license: GPL distribution: check_mk description: diff --git a/checkman/emcvnx_hba b/checkman/emcvnx_hba index 5214506..087940f 100644 --- a/checkman/emcvnx_hba +++ b/checkman/emcvnx_hba @@ -1,6 +1,6 @@ title: EMC VNX Storage: iSCSI traffic on HBAs agents: emc -catalog: hw/storage +catalog: hw/storagehw/emc license: GPL distribution: check_mk description: diff --git a/checkman/emcvnx_hwstatus b/checkman/emcvnx_hwstatus index 3e03359..e8d0516 100644 --- a/checkman/emcvnx_hwstatus +++ b/checkman/emcvnx_hwstatus @@ -1,6 +1,6 @@ title: EMC VNX Storage: Hardware Status agents: emc -catalog: hw/storage +catalog: hw/storagehw/emc license: GPL distribution: check_mk description:

10 years, 8 months

Check_MK Git: check_mk: emcvnx_disks, emcvnx_hba: added perfometers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a7fd45df220adcf4a671201b7c3ec9c446cec43e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7fd45df220adc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 9 14:54:42 2014 +0100 emcvnx_disks, emcvnx_hba: added perfometers --- web/plugins/perfometer/check_mk.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 2a6a094..a638528 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -489,6 +489,7 @@ perfometers["check_mk-winperf_phydisk"] = perfometer_check_mk_diskstat perfometers["check_mk-hpux_lunstats"] = perfometer_check_mk_diskstat perfometers["check_mk-mysql.innodb_io"] = perfometer_check_mk_diskstat perfometers["check_mk-esx_vsphere_counters.diskio"] = perfometer_check_mk_diskstat +perfometers["check_mk-emcvnx_disks"] = perfometer_check_mk_diskstat def perfometer_in_out_mb_per_sec(row, check_command, perf_data): read_mbit = float(perf_data[0][1]) / 131072 @@ -500,6 +501,19 @@ def perfometer_in_out_mb_per_sec(row, check_command, perf_data): read_mbit, "#30d050", write_mbit, "#0060c0", 100, 10) perfometers["check_mk-openvpn_clients"] = perfometer_in_out_mb_per_sec +def perfometer_check_mk_hba(row, check_command, perf_data): + if len(perf_data) < 2: + return "", "" + + read_blocks = int(perf_data[0][1]) + write_blocks = int(perf_data[1][1]) + + text = "%d/s %d/s" % (read_blocks, write_blocks) + + return text, perfometer_logarithmic_dual( + read_blocks, "#30d050", write_blocks, "#0060c0", 100000, 2) +perfometers["check_mk-emcvnx_hba"] = perfometer_check_mk_hba + def perfometer_check_mk_printer_supply(row, check_command, perf_data): left = savefloat(perf_data[0][1])

10 years, 8 months

Check_MK Git: check_mk: emcvnx_hwstatus, emcvnx_hba, emcvnx_disks: new checks for EMC VNX storage systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 3f1738eee5d3a562fb7e9e7be897f5e02956c4c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f1738eee5d3a5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jan 9 13:38:54 2014 +0100 emcvnx_hwstatus, emcvnx_hba, emcvnx_disks: new checks for EMC VNX storage systems ---

10 years, 8 months

Check_MK Git: check_mk: lun usage is no longer requested by customer

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1e229c1e6cd9c366d6006175064e6de3ce6919a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e229c1e6cd9c3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Jul 31 15:07:16 2013 +0200 lun usage is no longer requested by customer --- checkman/emc_storage.lun_usage | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/checkman/emc_storage.lun_usage b/checkman/emc_storage.lun_usage deleted file mode 100644 index 215a55f..0000000 --- a/checkman/emc_storage.lun_usage +++ /dev/null @@ -1,30 +0,0 @@ -title: EMC Storage: Usage of LUNs -agents: emc -catalog: hw/storage -license: GPL -distribution: check_mk -description: - Reports the usage of LUNs on EMC storage systems. - - You can set levels for minimum free space to result in {WARN} and {CRIT} - state. The levels can be given in absolute megabytes or percent of the - total space available in the LUN. - - Hint for implementation: Look for "LUN Capacity(Megabytes):" line in - section "LOGICAL UNIT NUMBER <my ID>" under "All logical Units Information" - But: Where can we get actual used space in the LUN from? To be defined! - -item: - The ID of the LUN as returned by the special agent. - E. g. "18" - - Hint for implementation: Look for "LOGICAL UNIT NUMBER" - lines in section "All logical Units Information" - -perfdata: - One value: The used capacity in bytes, together with it's warn and crit - levels as well as the maximum (also in bytes) - -inventory: - Automatically configures one check for every LUN listed - in the agent output.

10 years, 8 months

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014