Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: cecb06862c1dfff8491de9aeee27368d7a237299 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cecb06862c1dff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 4 11:35:58 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: checkman update: uptime

by Andreas Boesl

Module: check_mk Branch: master Commit: 66c288e45620becd87d0704eb08b545c3df877e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c288e45620be… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 4 11:03:56 2013 +0200 checkman update: uptime --- checkman/uptime | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checkman/uptime b/checkman/uptime index 87fccc2..2f8d266 100644 --- a/checkman/uptime +++ b/checkman/uptime @@ -5,9 +5,10 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check is always OK and simply outputs the uptime of the target - systems (when the last boot was and how much time has elapsed since). - It is always OK. + This check outputs the uptime of the target systems + (when the last boot was and how much time has elapsed since). + This check can go WARN or CRIT when the uptime is below or above certain + configurable levels. perfdata: The uptime in seconds.

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 56d530edf4b1a3d50b11bfba27219169ac188b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56d530edf4b1a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 4 11:40:07 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: new manpage: jolokia metrics uptime

by Andreas Boesl

Module: check_mk Branch: master Commit: 5905f91ab9062f9e7dd5fe64d101d57c5dab284a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5905f91ab9062f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 4 11:15:14 2013 +0200 new manpage: jolokia metrics uptime --- checkman/jolokia_metrics.uptime | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/checkman/jolokia_metrics.uptime b/checkman/jolokia_metrics.uptime new file mode 100644 index 0000000..d6ba1ba --- /dev/null +++ b/checkman/jolokia_metrics.uptime @@ -0,0 +1,29 @@ +title: Uptime of JVM +agents: linux +catalog: app/java +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check outputs the uptime of the java virtual machine. + This check can go WARN or CRIT when the uptime is below or above certain + configurable levels. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + +perfdata: + The uptime in seconds. + +inventory: + One check is created for each application running inside an Jolokia + instance sent by the agent. + +[parameters] +parameters (dict): A dictionary with the following optional keys: + + {"min"}: Pair of integers of warn and crit: the minimum required uptime + uptime in seconds. + + {"max"}: Pair of integers of warn and crit: the maximum allowed uptime + uptime in seconds.

11 years, 2 months

Check_MK Git: check_mk: adjusting more titles for better sorting in catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 545f98a070de775af61f7d83072ba3cb4cc9f9d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=545f98a070de77… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 4 11:36:43 2013 +0200 adjusting more titles for better sorting in catalog --- checkman/canon_pages | 2 +- checkman/printer_alerts | 2 +- checkman/printer_pages | 2 +- checkman/printer_supply | 2 +- checkman/printer_supply_ricoh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checkman/canon_pages b/checkman/canon_pages index 1866a46..a904e63 100644 --- a/checkman/canon_pages +++ b/checkman/canon_pages @@ -1,4 +1,4 @@ -title: Printed/scanned pages in canon printers +title: Canon Printer: Printed/scanned pages agents: snmp catalog: hw/printer author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/printer_alerts b/checkman/printer_alerts index 00bbe7b..cc840f2 100644 --- a/checkman/printer_alerts +++ b/checkman/printer_alerts @@ -1,4 +1,4 @@ -title: Alerts reported by printers +title: Generic Printer: Alerts reported agents: snmp catalog: hw/printer author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/printer_pages b/checkman/printer_pages index 8e54d32..887987d 100644 --- a/checkman/printer_pages +++ b/checkman/printer_pages @@ -1,4 +1,4 @@ -title: Number of printed pages on printers using PRINTER-MIB +title: Generic Printer: Number of printed pages agents: snmp catalog: hw/printer author: Peter Lauk <lauk(a)stuttgart-airport.com> diff --git a/checkman/printer_supply b/checkman/printer_supply index 2658445..bfd5717 100644 --- a/checkman/printer_supply +++ b/checkman/printer_supply @@ -1,4 +1,4 @@ -title: Remaining filling level on printer supplys using PRINTER-MIB +title: Generic Printer: Remaining filling level agents: snmp catalog: hw/printer author: Peter Lauk <lauk(a)stuttgart-airport.com> diff --git a/checkman/printer_supply_ricoh b/checkman/printer_supply_ricoh index 6b432b2..bcfc111 100644 --- a/checkman/printer_supply_ricoh +++ b/checkman/printer_supply_ricoh @@ -1,4 +1,4 @@ -title: Remaining filling level on printer supplys for ricoh printers +title: Ricoh Printers: Remaining filling level agents: snmp catalog: hw/printer author: Bastian Kuhn <bk(a)mathias-kettner.de>

11 years, 2 months

Check_MK Git: check_mk: adjusting more titles for better sorting in catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 02a335335b1f62e0a588865a6c448d1fea67f79e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02a335335b1f62… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 4 11:25:16 2013 +0200 adjusting more titles for better sorting in catalog --- checkman/lgp_pdu_info | 2 +- checkman/ups_bat_temp | 2 +- checkman/ups_capacity | 2 +- checkman/ups_in_freq | 4 ++-- checkman/ups_in_voltage | 2 +- checkman/ups_out_load | 2 +- checkman/ups_out_voltage | 2 +- checkman/ups_power | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checkman/lgp_pdu_info b/checkman/lgp_pdu_info index bbc22f1..b4ed6ce 100644 --- a/checkman/lgp_pdu_info +++ b/checkman/lgp_pdu_info @@ -1,4 +1,4 @@ -title: Power Distribution information from Liebert MPH/MPX devices +title: Liebert MPH/MPX devices: Power Distribution information agents: snmp catalog: hw/power author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/ups_bat_temp b/checkman/ups_bat_temp index d32ca72..18599e5 100644 --- a/checkman/ups_bat_temp +++ b/checkman/ups_bat_temp @@ -1,4 +1,4 @@ -title: Temperature sensor on a UPS Device +title: Generic UPS Device: Temperature sensor agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checkman/ups_capacity b/checkman/ups_capacity index c0641df..ff495c9 100644 --- a/checkman/ups_capacity +++ b/checkman/ups_capacity @@ -1,4 +1,4 @@ -title: Remaining battery capacity of UPS using generic MIB +title: Generic UPS Device: Remaining battery capacity agents: snmp catalog: hw/power author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/ups_in_freq b/checkman/ups_in_freq index ec616de..12cb529 100644 --- a/checkman/ups_in_freq +++ b/checkman/ups_in_freq @@ -1,4 +1,4 @@ -title: In frequenz of ups devices +title: Generic UPS Device: In frequency agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> @@ -11,7 +11,7 @@ item: ID of the phase perfdata: - The current frequenz + The current frequency inventory: One service per phase will be created diff --git a/checkman/ups_in_voltage b/checkman/ups_in_voltage index b158826..8957648 100644 --- a/checkman/ups_in_voltage +++ b/checkman/ups_in_voltage @@ -1,4 +1,4 @@ -title: In voltage of devices +title: Generic UPS Device: In voltage agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checkman/ups_out_load b/checkman/ups_out_load index 5118d61..a0120a2 100644 --- a/checkman/ups_out_load +++ b/checkman/ups_out_load @@ -1,4 +1,4 @@ -title: OUT load of ups devices +title: Generic UPS Device: OUT load agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checkman/ups_out_voltage b/checkman/ups_out_voltage index da9d39f..d969038 100644 --- a/checkman/ups_out_voltage +++ b/checkman/ups_out_voltage @@ -1,4 +1,4 @@ -title: Out voltage of ups devices +title: Generic UPS Device: Out voltage agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checkman/ups_power b/checkman/ups_power index 8506839..4fb01f4 100644 --- a/checkman/ups_power +++ b/checkman/ups_power @@ -1,4 +1,4 @@ -title: Output power of UPS using generic MIB +title: Generic UPS Device: Output power agents: snmp catalog: hw/power author: Mathias Kettner <mk(a)mathias-kettner.de>

11 years, 2 months

Check_MK Git: check_mk: adjusting more titles for better sorting in catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 83ce74ca34b822cd02c85078084c259d32884261 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83ce74ca34b822… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 4 11:06:26 2013 +0200 adjusting more titles for better sorting in catalog --- checkman/apc_symmetra | 4 ++-- checkman/apc_symmetra_ext_temp | 4 ++-- checkman/apc_symmetra_power | 2 +- checkman/masterguard_out_voltage | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index 915f867..5195b82 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -1,11 +1,11 @@ -title: Status of APC Symmetra USV +title: APC Symmetra UPS: Status of battery and output agents: snmp catalog: hw/power author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check monitors eight aspects of an APC Symmetra USV: {(1)} the battery status, + This check monitors eight aspects of an APC Symmetra UPS: {(1)} the battery status, {(2)} the output status, {(3)} the battery capacity, {(4)} the battery temperature, {(5)} the battery current, {(6)} the output voltage and {(7)} the output current, {(8)} the remaing run time. The output current and diff --git a/checkman/apc_symmetra_ext_temp b/checkman/apc_symmetra_ext_temp index 991a918..fdac04b 100644 --- a/checkman/apc_symmetra_ext_temp +++ b/checkman/apc_symmetra_ext_temp @@ -1,4 +1,4 @@ -title: APC Symmetra external temperature sensors +title: APC Symmetra UPS: external temperature sensors agents: snmp catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> @@ -6,7 +6,7 @@ license: GPL distribution: check_mk description: This check polls the state of temperature sensors - attached to a APC Symmetra APC. + attached to a APC Symmetra UPS. item: The index of the sensor, e.g. {"1"}. diff --git a/checkman/apc_symmetra_power b/checkman/apc_symmetra_power index 0c1bb1c..42c3d64 100644 --- a/checkman/apc_symmetra_power +++ b/checkman/apc_symmetra_power @@ -1,4 +1,4 @@ -title: Output power of APC Symmetra USV +title: APC Symmetra UPS: Output power agents: snmp catalog: hw/power author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/masterguard_out_voltage b/checkman/masterguard_out_voltage index 86a48af..06ff10a 100644 --- a/checkman/masterguard_out_voltage +++ b/checkman/masterguard_out_voltage @@ -1,4 +1,4 @@ -title: Out voltage of masterguard ups devices +title: Masterguard UPS Devices: Out voltage agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de>

11 years, 2 months

Check_MK Git: check_mk: adjusting titles for better sorting in catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 6fa35b5c1e5cac4bcac86a429f14038ad829871d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fa35b5c1e5cac… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 4 08:50:56 2013 +0200 adjusting titles for better sorting in catalog --- checkman/apc_rackpdu_power | 2 +- checkman/lgp_info | 2 +- checkman/pdu_gude_8301 | 2 +- checkman/pdu_gude_8310 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/apc_rackpdu_power b/checkman/apc_rackpdu_power index b6941fa..f101249 100644 --- a/checkman/apc_rackpdu_power +++ b/checkman/apc_rackpdu_power @@ -1,4 +1,4 @@ -title: APC PDU units +title: APC PDU units: Power and Voltage agents: snmp catalog: hw/power license: GPL diff --git a/checkman/lgp_info b/checkman/lgp_info index 293e624..49a08cd 100644 --- a/checkman/lgp_info +++ b/checkman/lgp_info @@ -1,4 +1,4 @@ -title: Collect general information about Liebert MPH/MPX devices +title: Liebert MPH/MPX devices: general information agents: snmp catalog: hw/power author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/pdu_gude_8301 b/checkman/pdu_gude_8301 index 0755187..5e5811b 100644 --- a/checkman/pdu_gude_8301 +++ b/checkman/pdu_gude_8301 @@ -1,4 +1,4 @@ -title: Gude PDU units +title: Gude PDU units (8301): Power and Voltage agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checkman/pdu_gude_8310 b/checkman/pdu_gude_8310 index 6aeaf3b..bcdeaf0 100644 --- a/checkman/pdu_gude_8310 +++ b/checkman/pdu_gude_8310 @@ -1,4 +1,4 @@ -title: Gude PDU units +title: Gude PDU units (8310): Power and Voltage agents: snmp catalog: hw/power author: Bastian Kuhn <bk(a)mathias-kettner.de>

11 years, 2 months

Check_MK Git: check_mk: Fixed error in new tables when search disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: b770fed117281438b6966f71568144a09e916aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b770fed1172814… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 16:49:28 2013 +0200 Fixed error in new tables when search disabled --- web/htdocs/table.py | 37 ++++++++++++++-------------- web/htdocs/wato.py | 10 ++++---- web/plugins/wato/builtin_modules.py | 4 +-- web/plugins/wato/check_mk_configuration.py | 6 ++--- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index edea650..24c88cf 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -119,6 +119,7 @@ def end(): return table_id = table['id'] + rows = table["rows"] # Controls wether or not actions are available for a table actions_enabled = table["searchable"] @@ -134,24 +135,22 @@ def end(): user_opts[table_id]['actions_visible'] = actions_visible - rows = table["rows"] - - if html.var('_%s_reset' % table_id): - html.del_var('_%s_search' % table_id) - if 'search' in table_opts: - del table_opts['search'] # persist - - search_term = html.var('_%s_search' % table_id, table_opts.get('search')) - if search_term: - html.set_var('_%s_search' % table_id, search_term) - table_opts['search'] = search_term # persist - filtered_rows = [] - for row, css in rows: - for cell_content, css_classes in row: - if search_term in cell_content: - filtered_rows.append((row, css)) - break # skip other cells when matched - rows = filtered_rows + if html.var('_%s_reset' % table_id): + html.del_var('_%s_search' % table_id) + if 'search' in table_opts: + del table_opts['search'] # persist + + search_term = html.var('_%s_search' % table_id, table_opts.get('search')) + if search_term: + html.set_var('_%s_search' % table_id, search_term) + table_opts['search'] = search_term # persist + filtered_rows = [] + for row, css in rows: + for cell_content, css_classes in row: + if search_term in cell_content: + filtered_rows.append((row, css)) + break # skip other cells when matched + rows = filtered_rows num_rows_unlimited = len(rows) num_cols = len(table["headers"]) @@ -221,7 +220,7 @@ def end(): html.write("</td>\n") html.write("</tr>\n") - if search_term and not rows: + if actions_enabled and search_term and not rows: html.write('<tr class="data odd0 no_match"><td colspan=%d>%s</td></tr>' % (num_cols, _('Found no matching rows. Please try another search term.'))) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bc7b512..61a232f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5794,7 +5794,7 @@ def mode_groups(phase, what): for cg in cgs: members.setdefault(cg, []).append((userid, user.get('alias', userid))) - table.begin(what + "groups", what_name.title()) + table.begin(what + "groups") for name, alias in sorted: table.row() @@ -5993,7 +5993,7 @@ def mode_timeperiods(phase): return None - table.begin("timeperiods", _("Time Periods"), empty_text = _("There are no timeperiods defined yet.")) + table.begin("timeperiods", empty_text = _("There are no timeperiods defined yet.")) names = timeperiods.keys() names.sort() for name in names: @@ -7909,7 +7909,7 @@ def load_notification_table(): def mode_users(phase): if phase == "title": - return _("Users & Contacts") + return _("Users") elif phase == "buttons": global_buttons() @@ -8551,7 +8551,7 @@ def mode_roles(phase): log_pending(False, None, "edit-roles", _("Created new role '%s'" % newid)) return - table.begin("roles", _("Roles")) + table.begin("roles") # Show table of builtin and user defined roles entries = roles.items() @@ -13572,7 +13572,7 @@ def load_plugins(): config.declare_permission("wato.users", _("User management"), - _("This permission is needed for the modules Users & Contacts, Roles and Contact Groups"), + _("This permission is needed for the modules Users, Roles and Contact Groups"), [ "admin", ]) config.declare_permission("wato.snapshots", diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 528aca0..ef5b0cf 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -49,8 +49,8 @@ modules = [ ( "service_groups", _("Service Groups"), "servicegroups", "groups", _("Organize services in groups for a better overview in the status display.") ), - ( "users", _("Users & Contacts"), "users", "users", - _("Manage users of Multisite and contacts of the monitoring system.") ), + ( "users", _("Users"), "users", "users", + _("Manage users of the monitoring system.") ), ( "roles", _("Roles & Permissions"), "roles", "users", _("User roles are configurable sets of permissions." ) ), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7b24322..967ba46 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -378,7 +378,7 @@ register_configvar(group, "table_row_limit", Integer(title = _("Limit the number of rows shown in tables"), help = _("Several pages which use tables to show data in rows, like the " - "\"Users & Contacts\" configuration page, can be configured to show " + "\"Users\" configuration page, can be configured to show " "only a limited number of rows when accessing the pages."), minvalue = 1, default_value = 100, @@ -418,13 +418,13 @@ register_configvar(group, ListChoice( title = _('Automatic User Synchronization'), help = _('By default the users are synchronized automatically in several situations. ' - 'The sync is started when opening the "Users & Contacts" page in configuration and ' + 'The sync is started when opening the "Users" page in configuration and ' 'during each page rendering. Each connector can then specify if it wants to perform ' 'any actions. For example the LDAP connector will start the sync once the cached user ' 'information are too old.'), default_value = [ 'wato_users', 'page' ], choices = [ - ('wato_users', 'When opening WATO Users & Contacts'), + ('wato_users', 'When opening the users configuration page'), ('page', 'During regular page processing'), ], allow_empty = True,

11 years, 2 months

Check_MK Git: check_mk: Reworked table search function / table actions

by Lars Michelsen

Module: check_mk Branch: master Commit: bddfff44cd636842af58269575ee91d5c42e9b65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bddfff44cd6368… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 16:43:19 2013 +0200 Reworked table search function / table actions --- web/htdocs/images/button_table_actions_off_hi.png | Bin 0 -> 433 bytes web/htdocs/images/button_table_actions_off_lo.png | Bin 0 -> 433 bytes web/htdocs/images/button_table_actions_on_hi.png | Bin 0 -> 451 bytes web/htdocs/images/button_table_actions_on_lo.png | Bin 0 -> 451 bytes web/htdocs/pages.css | 29 ++++++- web/htdocs/table.py | 95 +++++++++++++++------ web/htdocs/wato.py | 27 +++--- web/plugins/views/availability.py | 5 +- 8 files changed, 115 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bddfff44cd…

11 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013