Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64410 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 217ebad614b45de551660b1de9da30bb9b8a6ddf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217ebad614b45d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 17:43:27 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function

by Lars Michelsen

Module: check_mk Branch: master Commit: a709ed59d006fbcb84e62051ae47080a1bd441be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a709ed59d006fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 13:32:32 2013 +0100 Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function --- ChangeLog | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9548df..b0f9ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ * Init-Script: Detecting and reporting already running processes * WATO: Added hook to make the mkeventd reload in distributed WATO setups during "activate changes" process + * Added hook mkeventd-activate-changes to add custom actions to the mkeventd + "activate changes" GUI function 1.2.1i5: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 8c13832..6f59953 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1086,6 +1086,13 @@ def mkeventd_reload(): pass # ignore not existing logfile log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) +# This hook is executed when one applies the pending configuration changes +# related to the mkeventd via WATO on the local system. The hook is called +# without parameters. +def call_hook_mkeventd_activate_changes(): + if hooks.registered('mkeventd-activate-changes'): + hooks.call("mkeventd-activate-changes") + def mode_mkeventd_changes(phase): if phase == "title": return _("Event Console - Pending Changes") @@ -1100,6 +1107,7 @@ def mode_mkeventd_changes(phase): elif phase == "action": if html.check_transaction(): mkeventd_reload() + call_hook_mkeventd_activate_changes() return "mkeventd_rules", _("Changes successfully activated.") else:

11 years, 7 months

Check_MK Git: check_mk: fixed checkmans of pdu_gude*

by Andreas Boesl

Module: check_mk Branch: master Commit: f8893a2246d572a4901daf4dfba1628cc24ccfc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8893a2246d572… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 17:18:52 2013 +0100 fixed checkmans of pdu_gude* --- checkman/pdu_gude_8301 | 12 +++++++++++- checkman/pdu_gude_8310 | 9 ++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/checkman/pdu_gude_8301 b/checkman/pdu_gude_8301 index 81aa45d..c8bd7bf 100644 --- a/checkman/pdu_gude_8301 +++ b/checkman/pdu_gude_8301 @@ -15,8 +15,18 @@ perfdata: inventory: One service per Phase +examples: + pdu_gude_default_levels = { + "V" : ( 220, 210 ), + "A" : ( 15, 16 ), + "W" : ( 3500, 3600 ), + } + [parameters] -Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict +parameters(dict): Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict [configuration] pdu_gude_default_levels (dict): Default warning and critical level for each value + + + diff --git a/checkman/pdu_gude_8310 b/checkman/pdu_gude_8310 index 81aa45d..4885e99 100644 --- a/checkman/pdu_gude_8310 +++ b/checkman/pdu_gude_8310 @@ -15,8 +15,15 @@ perfdata: inventory: One service per Phase +examples: + pdu_gude_default_levels = { + "V" : ( 220, 210 ), + "A" : ( 15, 16 ), + "W" : ( 3500, 3600 ), + } + [parameters] -Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict +parameters(dict): Warning and Critical levels as tuple for Items kWh, W, A, V, VA in dict [configuration] pdu_gude_default_levels (dict): Default warning and critical level for each value

11 years, 7 months

Check_MK Git: check_mk: bugfix: ovs_bonding and disabled interfaces

by Andreas Boesl

Module: check_mk Branch: master Commit: ad25295e655b002f3129639d7fb6ebfd138c0a5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad25295e655b00… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 16:48:39 2013 +0100 bugfix: ovs_bonding and disabled interfaces --- checks/ovs_bonding | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/ovs_bonding b/checks/ovs_bonding index 1902f59..e54c4cc 100644 --- a/checks/ovs_bonding +++ b/checks/ovs_bonding @@ -43,7 +43,7 @@ def parse_ovs_bonding(info): for line in info: if line[0][0] == '[': bond = line[0][1:-1] - bonds[bond] = {} + bonds[bond] = {"active" : None} elif len(line) == 2: left = line[0] right = line[1].strip()

11 years, 7 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: ff13b3b95c4ee8dc233f735340a1a4e6b459e7f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff13b3b95c4ee8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 20:52:44 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Add: oracle_tablespaces with magic number and

by Andreas Boesl

Module: check_mk Branch: master Commit: 1f6ba3f43eb47b20be40886026c94f6c3fdeb186 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f6ba3f43eb47b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 20:52:21 2013 +0100 Add: oracle_tablespaces with magic number and WATO configuration --- ChangeLog | 2 + checks/oracle_tablespaces | 98 ++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 56 +++++++++++++++++++ 3 files changed, 141 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 977dc9b..468ae96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * if: Inventory settings can now be set host based * FIX: lnx_bonding/ovs_bonding: correct definition of bonding.include * Add: if check now able to handle interface groups (if_groups) + * Add: oracle_tablespace now with flexible warn/crit levels(magic number) Multisite: * Added comment painter to notification related views @@ -51,6 +52,7 @@ * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) * FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups + * Added oracle_tablespaces configuration to the application checkgroup Event Console: * Added UNIX socket for sending events to the EC diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 87f2a67..273fa0f 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -47,10 +47,20 @@ # 11. status of the table space # 12. free space in the datafile + +# This definition needs to be removed at a later stage +# A previous version of this check didn't write the parameter +# name into the autochecks file, but the parameter itself # default levels for *free* space. float: percent, # integer: MB. oracle_tablespaces_default_levels = (10.0, 5.0) +factory_settings["oracle_tablespaces_default_levels"] = { + "levels" : (10.0, 5.0), + "magic_normsize" : 1000, + "levels_low" : (0.0, 0.0) +} + # Whether to check auto extend settings oracle_tablespaces_check_autoext = True @@ -75,10 +85,62 @@ def inventory_oracle_tablespaces(info): ae = t in autoextensible else: ae = None # means: ignore, only display setting - inventory.append( ("%s.%s" % t, - "(%s, oracle_tablespaces_default_levels[0], oracle_tablespaces_default_levels[1])" % ae)) + + parameters = { "autoextend" : ae } + inventory.append(("%s.%s" % t, parameters)) return inventory + +def get_tablespace_levels_in_bytes(size_bytes, params): + # If the magic factor is used, take table size and magic factor + # into account in order to move levels + magic = params.get("magic") + warn, crit = params.get("levels") + + if magic: + # convert warn/crit to percentage + if type(warn) != float: + warn = savefloat(warn * 1024 * 1024 / float(size_bytes)) * 100 + if type(crit) != float: + crit = savefloat(crit * 1024 * 1024 / float(size_bytes)) * 100 + + normsize = params["magic_normsize"] + hbytes_size = size_bytes / (float(normsize) * 1024 * 1024) + felt_size = hbytes_size ** magic + scale = felt_size / hbytes_size + warn_scaled = 100 - (( 100 - warn ) * scale) + crit_scaled = 100 - (( 100 - crit ) * scale) + + # Make sure, levels do never get too low due to magic factor + lowest_warning_level, lowest_critical_level = params["levels_low"] + if warn_scaled < lowest_warning_level: + warn_scaled = lowest_warning_level + if crit_scaled < lowest_critical_level: + crit_scaled = lowest_critical_level + warn_bytes = savefloat(size_bytes * warn_scaled / 100) + crit_bytes = savefloat(size_bytes * crit_scaled / 100) + else: + # warn/crit level are float => percentages of max size, otherwise MB + if type(warn) == float: + warn_bytes = warn / 100.0 * size_bytes + else: + warn_bytes = warn * 1024 * 1024 + + if type(crit) == float: + crit_bytes = crit / 100.0 * size_bytes + else: + crit_bytes = crit * 1024 * 1024 + + warn_scaled = savefloat(warn_bytes / size_bytes * 100) + crit_scaled = savefloat(crit_bytes / size_bytes * 100) + + + levels = {} + levels["levels_bytes"] = (warn_bytes, crit_bytes) + levels["levels_text"] = "(levels at %.1f/%.1f%%)" % (warn_scaled, crit_scaled) + return levels + + def check_oracle_tablespaces(item, params, info): sid, tbsname = item.split('.') ts_status = None @@ -91,7 +153,12 @@ def check_oracle_tablespaces(item, params, info): num_increments = 0 increment_size = 0 free_space = 0 + + # Conversion of old autochecks params + if type(params) == tuple: + params = { "autoextend" : params[0], "levels" : params[1:] } + autoext = params.get("autoextend") uses_default_increment = False for line in info: @@ -132,6 +199,8 @@ def check_oracle_tablespaces(item, params, info): if ts_status == None: return (3, "UNKNOWN - Tablespace not found") + + infotext = " - %s, size %s, used %s" % \ (ts_status, @@ -144,7 +213,6 @@ def check_oracle_tablespaces(item, params, info): (num_increments, get_bytes_human_readable(increment_size)) status = 0 - autoext, warn, crit = params # Check increment size, should not be set to default (1) if oracle_tablespaces_check_default_increment: @@ -165,16 +233,9 @@ def check_oracle_tablespaces(item, params, info): else: infotext += ", no autoextend" - # warn/crit level are float => percentages of max size, otherwise MB - if type(warn) == float: - warn = warn / 100.0 * max_size - else: - warn *= 1024 * 1024 - if type(crit) == float: - crit = crit / 100.0 * max_size - else: - crit *= 1024 * 1024 + level_info = get_tablespace_levels_in_bytes(max_size, params) + warn, crit = level_info.get("levels_bytes") # Check free space, but only if status is not READONLY if ts_status != "READONLY": @@ -196,6 +257,13 @@ def check_oracle_tablespaces(item, params, info): return (status, nagios_state_names[status] + infotext, perfdata) -check_info['oracle_tablespaces'] = (check_oracle_tablespaces, "ORA %s Tablespace", 1, inventory_oracle_tablespaces ) +check_info['oracle_tablespaces'] = { + "service_description" : "ORA %s Tablespace", + "check_function" : check_oracle_tablespaces, + "inventory_function" : inventory_oracle_tablespaces, + "has_perfdata" : True, + "group" : "oracle_tablespaces", + "default_levels_variable" : "oracle_tablespaces_default_levels", + "includes" : [ "oracle.include" ] +} check_config_variables.append("oracle_tablespaces_check_default_increment") -check_includes['oracle_tablespaces'] = [ "oracle.include" ] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 380c156..9fc22f4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1413,6 +1413,62 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, + "oracle_tablespaces", + _("Oracle Tablespaces"), + Dictionary( + elements = [ + ( "levels", + Alternative( + title = _("Total Memory Levels"), + elements = [ + Tuple( + title = _("Percentage levels of free maximum space"), + elements = [ + Percentage(title = _("Warning at"), label = _("free")), + Percentage(title = _("Critical at"), label = _("free")), + ] + ), + Tuple( + title = _("Absolute free space"), + elements = [ + Integer(title = _("Warning lower than"), unit = _("MB")), + Integer(title = _("Critical lower than"), unit = _("MB")), + ] + ) + ])), + ( "magic", + Float( + title = _("Magic factor (automatic level adaptation for large tablespaces)"), + minvalue = 0.1, + maxvalue = 1.0)), + ( "magic_normsize", + Integer( + title = _("Reference size for magic factor"), + minvalue = 1, + default_value = 1000, + label = _("MB"))), + ( "levels_low", + Tuple( + title = _("Minimum levels if using magic factor"), + help = _("The tablespace levels will never fall below these values, when using " + "the magic factor and the tablespace is very small."), + elements = [ + Percentage(title = _("Warning at"), label = _("usage"), allow_int = True), + Percentage(title = _("Critical at"), label = _("usage"), allow_int = True)])), + ( "autoextend", + Checkbox( + title = _("Autoextend"), + label = _("Autoextension is expected"), + help = _(""))), + ]), + TextAscii( + title = _("Service descriptions"), + allow_empty = False), + None)) + + +checkgroups.append(( + subgroup_applications, "oracle_logswitches", _("Oracle Logswitches"), Tuple(

11 years, 7 months

Check_MK Git: check_mk: FIX: Preventing autocomplete in password fields of "edit profile" dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 599543c336688d3f73dba20ba20a3fcefdb83946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=599543c336688d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 15:37:28 2013 +0100 FIX: Preventing autocomplete in password fields of "edit profile" dialog --- .bugs/885 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/885 b/.bugs/885 index aa1ce44..4cd4848 100644 --- a/.bugs/885 +++ b/.bugs/885 @@ -1,10 +1,13 @@ Title: Password field in personal settings must not be prefilled by browser Component: multisite -State: open +Class: bug +State: done Date: 2013-01-21 15:55:44 Targetversion: 1.2.2 -Class: bug If the browser enters a possible previous password then after saving (because of changes to the notifications) the user password gets changed and the user logged out - forever. + +2013-02-05 15:36:48: changed state open -> done +Just implemented. Added "autocomplete=off" attribute to input fields. diff --git a/ChangeLog b/ChangeLog index 8ec9788..9aae64a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * Added comment painter to notification related views * Added compatibility code to use hashlib.md5() instead of md5.md5(), which is deprecated in python > 2.5 to prevent warning messages in apache error log + * FIX: Preventing autocomplete in password fields of "edit profile" dialog BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f8dd222..18b9a43 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10956,10 +10956,10 @@ def page_user_profile(): if config.may('general.change_password') and not is_locked('password'): forms.section(_("Password")) - html.password_input('password') + html.password_input('password', autocomplete = "off") forms.section(_("Password confirmation")) - html.password_input('password2') + html.password_input('password2', autocomplete = "off") if config.may('general.edit_profile'): select_language(config.get_language(''))

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 044ac0714ecc06edcc932534a00d1390de7ba826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=044ac0714ecc06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 17:12:19 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0915

by Lars Michelsen

Module: check_mk Branch: master Commit: 00e756a7d42757377d13e2e11689c6b1022dc847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00e756a7d42757… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 16:18:21 2013 +0100 Updated bug entries #0915 --- .bugs/915 | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/915 b/.bugs/915 new file mode 100644 index 0000000..4011a40 --- /dev/null +++ b/.bugs/915 @@ -0,0 +1,20 @@ +Title: More comfortable handling of "Performance Counters" monitoring +Component: checks +State: open +Date: 2013-02-05 16:14:01 +Targetversion: 1.2.3 +Class: feature + +At the moment the ids of performancecounters must be scanned and configured +manually (http://mathias-kettner.de/checkmk_windows.html#H1:Performance%20Counters,%2…) + +This is not very comfortable and also no auto detection. It would be nice to have +a functionality where we can deliver a default config or one user could create +his own config like: + +[winperf] + counters = $MSExchangeTransport Queues$:msx_queues + +Then, on agent startup the variable would be used to scan for the id automatically. +The localization problem has to be fixed when implementing this. Maybe there is +something like LANG=c ...?

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups

by Lars Michelsen

Module: check_mk Branch: master Commit: d39532389d176708d24a33a24918d92eb3422785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39532389d1767… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 16:46:50 2013 +0100 FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aae64a..575afc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) * FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups + * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 18b9a43..52e5954 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -125,30 +125,6 @@ snapshot_dir = var_dir + "snapshots/" sync_snapshot_file = defaults.tmp_dir + "/sync_snapshot.tar.gz" repstatus_file = var_dir + "replication_status.mk" -# Directories and files to synchronize during replication -replication_paths = [ - ( "dir", "check_mk", root_dir ), - ( "dir", "multisite", multisite_dir ), - ( "file", "htpasswd", defaults.htpasswd_file ), - ( "file", "auth.secret", '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) ), - ( "file", "auth.serials", '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) ), - # Also replicate the user-settings of Multisite? While the replication - # as such works pretty well, the count of pending changes will not - # know. - ( "dir", "usersettings", defaults.var_dir + "/web" ), -] - - -# Directories and files for backup & restore -backup_paths = replication_paths + [ - ( "file", "sites", sites_mk) - # autochecks are a site-local ressource. This does only make - # sense for single-site installations. How should we handle - # this? - # ( "dir", "autochecks", defaults.autochecksdir ), - -] - ALL_HOSTS = [ '@all' ] ALL_SERVICES = [ "" ] @@ -11886,6 +11862,30 @@ def load_plugins(): g_rulespec_group = {} g_rulespec_groups = [] + # Directories and files to synchronize during replication + global replication_paths, backup_paths + replication_paths = [ + ( "dir", "check_mk", root_dir ), + ( "dir", "multisite", multisite_dir ), + ( "file", "htpasswd", defaults.htpasswd_file ), + ( "file", "auth.secret", '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) ), + ( "file", "auth.serials", '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) ), + # Also replicate the user-settings of Multisite? While the replication + # as such works pretty well, the count of pending changes will not + # know. + ( "dir", "usersettings", defaults.var_dir + "/web" ), + ] + + # Directories and files for backup & restore + backup_paths = replication_paths + [ + ( "file", "sites", sites_mk) + # autochecks are a site-local ressource. This does only make + # sense for single-site installations. How should we handle + # this? + # ( "dir", "autochecks", defaults.autochecksdir ), + ] + + # Declare WATO-specific permissions config.declare_permission_section("wato", _("WATO - Check_MK's Web Administration Tool"))

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits