Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Updated bug entries #0943

by Andreas Boesl

Module: check_mk Branch: master Commit: bcaa7c194df4a3571ed32fc18a8458557bd564b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcaa7c194df4a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 29 17:36:06 2013 +0100 Updated bug entries #0943 --- .bugs/943 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/943 b/.bugs/943 new file mode 100644 index 0000000..f3a2223 --- /dev/null +++ b/.bugs/943 @@ -0,0 +1,17 @@ +Title: agent_vsphere (new) not compatible with esx 4.1 +Component: checks +State: open +Date: 2013-10-29 17:31:13 +Targetversion: future +Class: bug + +Tracefile shows these instances +<soapenv:Fault><faultcode>ServerFaultCode</faultcode><faultstring></faultstring><detail><InvalidPropertyFault xmlns="urn:vim25" xsi:type="InvalidProperty"><name>summary.maintenanceMode</name></InvalidPropertyFault></detail></soapenv:Fault> + +<soapenv:Fault><faultcode>ServerFaultCode</faultcode><faultstring></faultstring><detail><InvalidPropertyFault xmlns="urn:vim25" xsi:type="InvalidProperty"><name>config.hardware.numCoresPerSocket</name></InvalidPropertyFault></detail></soapenv:Fault> + +Solution: +Need to create the soap requests more dynamically... + +Workaround: +Old agent agent_vsphere.pysphere

10 years, 11 months

Check_MK Git: check_mk: disabled input parameters for now,

by Götz Golla

better check manpage Message-ID: <526fdf63.6xBkOYoe2rkpNv7/%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 4d02b6a57688dcc9bdd2341cf8895b396fc993e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d02b6a57688dc… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 29 17:14:10 2013 +0100 disabled input parameters for now, better check manpage --- checkman/check_sql | 9 +++++++-- doc/treasures/active_checks/check_sql | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/checkman/check_sql b/checkman/check_sql index e157607..b691f02 100644 --- a/checkman/check_sql +++ b/checkman/check_sql @@ -8,8 +8,9 @@ description: statement to that server, and checks for the following result: The query must return three columns, a number, a text, and optional - performance data in the third column. - If upper and lower levels are given, the number is being checked + performance data in the third column. The columns are comma-separated. + Performance data must be in the standard format of nagios performance data. + If upper and lower levels are given, the number is checked against these levels and the according state is being computed. Otherwise the number ist treated as a Nagios state (0,1,2,3). State, text and the performance data are being returned. @@ -20,6 +21,10 @@ description: LD_LIBRARY_PATH needs to be modified to point to the libclntsh.so of that package. + The oracle check supports procedure calls. It must return excactly one output + variable. The value of the variable must be in the same format as the return + value of the sql statement described above. + This check can be configured by WATO. See the {usage} page of the check for details about the invocation on the command line. diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 0079c44..8ea0e23 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -195,8 +195,8 @@ try: sys.stderr.write("SQL Statement: %s\n" % opt_sql) if opt_procedure: outvar = cursor.var(cx_Oracle.STRING) - opt_input.append("outvar") - cursor.callproc(opt_sql, opt_input) + #opt_input.append("outvar") + cursor.callproc(opt_sql, (outvar,)) result = outvar.getvalue() else: cursor.execute(opt_sql) @@ -228,7 +228,7 @@ try: sys.exit(3) #row = result[0] - row = result.split(" ") + row = result.split(",") number = float(row[0]) text = str(row[1])

10 years, 11 months

Check_MK Git: check_mk: Updated drafts of rule based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d3ff79dc8f8631191da5d6e70b2047329cfbf52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d3ff79dc8f863… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 29 16:07:41 2013 +0100 Updated drafts of rule based notifications --- doc/drafts/README.bulk_notifications | 105 ++++++++++++ doc/drafts/README.rule_based_notifications | 255 ++++++++++++++-------------- 2 files changed, 233 insertions(+), 127 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3d3ff79dc8…

10 years, 11 months

Check_MK Git: check_mk: FIX: handling of case of no input parameters and format of output variable

by Götz Golla

Module: check_mk Branch: master Commit: b373a3dfa47111739d860da246d4f90d250706cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b373a3dfa47111… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 29 16:05:55 2013 +0100 FIX: handling of case of no input parameters and format of output variable --- checks/check_sql | 6 +++--- doc/treasures/active_checks/check_sql | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/checks/check_sql b/checks/check_sql index 0ea56c9..b20932e 100644 --- a/checks/check_sql +++ b/checks/check_sql @@ -39,9 +39,9 @@ def check_sql_arguments(params): args += " --port %s" % params["port"] if "procedure" in params: - if params["procedure"]["useprocs"] == True: - args += " --procedure" - if params["procedure"]["input"]: + if "procedure" in params and "useprocs" in params["procedure"]: + args += " --procedure" + if "input" in params["procedure"]: args += " --inputvars %s" \ % quote_shell_string(params["procedure"]["input"]) diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 021419f..0079c44 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -55,7 +55,7 @@ OPTIONS: -w RANGE, --warning RANGE lower and upper level for the warning state, separated by a colon -c RANGE, --critical RANGE lower and upper level for the critical state, separated by a colon -o, --procedure treat the main argument as a procedure instead of an SQL-Statement - -i CSV, --inputvalues CSV values of input variables if required by the procedure; csv-list + -i CSV, --inputvars CSV values of input variables if required by the procedure; csv-list --debug Debug mode: let Python exceptions come through -v, --verbose Verbose mode: print SQL statement and levels @@ -73,7 +73,7 @@ def saverfloat(f): short_options = 'hou:i:p:d:n:H:P:w:c:v' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', - 'port=', 'debug', 'verbose', 'procedures', 'inputvars=' + 'port=', 'debug', 'verbose', 'procedure', 'inputvars=' ] try: @@ -92,7 +92,7 @@ opt_password = None opt_hostname = "127.0.0.1" opt_port = None opt_sql = None -opt_input = None +opt_input = [] opt_procedure = False warn = [ None, None ] crit = [ None, None ] @@ -121,7 +121,7 @@ try: crit = map(saverfloat,a.split(":",2)) elif o in [ '-o', '--procedure' ]: opt_procedure = True - elif o in [ '-I', '--inputvalues' ]: + elif o in [ '-i', '--inputvars' ]: opt_input = a.split(",") elif o in [ '-h', '--help' ]: usage() @@ -220,16 +220,18 @@ if opt_verbose: # processing of result # try: - if len(result) > 1: - print "UNKNOWN - SQL statement/procedure returned more than one line" - sys.exit(3) - elif len(result) == 0: + #if len(result) > 1: + # print "UNKNOWN - SQL statement/procedure returned more than one line" + # sys.exit(3) + if len(result) == 0: print "UNKNOWN - SQL statement/procedure returned no data" sys.exit(3) - row = result[0] + #row = result[0] + row = result.split(" ") number = float(row[0]) text = str(row[1]) + try: perf = row[2] except IndexError:

10 years, 11 months

Check_MK Git: check_mk: Minor layout changes on diagnose page

by Lars Michelsen

Module: check_mk Branch: master Commit: ed4d20c917c92dfca93bfb34d453e5902f2530ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4d20c917c92d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 29 15:08:10 2013 +0100 Minor layout changes on diagnose page --- web/htdocs/images/icon_diagnose.png | Bin 3885 -> 3963 bytes web/htdocs/wato.css | 20 ++++++++++++++++++++ web/htdocs/wato.py | 16 +++++++++------- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/web/htdocs/images/icon_diagnose.png b/web/htdocs/images/icon_diagnose.png index 848275d..8517c1d 100644 Binary files a/web/htdocs/images/icon_diagnose.png and b/web/htdocs/images/icon_diagnose.png differ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 022b289..53fc07c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -1126,6 +1126,18 @@ table.multisite_conn_method td input { | |___/ | +---------------------------------------------------------------------*/ +.wato .diag_host div.success { + margin-top: 0; +} + +.wato .diag_host td > h3 { + margin-top: 0; +} + +.wato .diag_host table.nform { + width: 212px; +} + .wato .diag_host .test { margin-bottom:15px; } @@ -1142,6 +1154,14 @@ table.multisite_conn_method td input { resize:both; } +.wato .diag_host table.test td { + padding: 0; +} + +.wato .diag_host table.test td.icons { + padding: 2px; +} + .wato .diag_host td.icons div { position: relative; width: 22px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 25acbaa..027f761 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2265,8 +2265,8 @@ def mode_diag_host(phase): ('ping', _('Ping')), ('agent', _('Agent')), ('snmpv1', _('SNMPv1')), - ('snmpv2', _('SNMPv2')), - ('snmpv2_nobulk', _('SNMPv2 (without Bulkwalk)')) + ('snmpv2', _('SNMPv2c')), + ('snmpv2_nobulk', _('SNMPv2c (without Bulkwalk)')) ] host = g_folder[".hosts"].get(hostname) @@ -2324,9 +2324,8 @@ def mode_diag_host(phase): html.write('<div class="diag_host">') html.write('<table><tr><td>') html.begin_form('diag_host', method = "POST") - forms.header(_('Host Diagnostic')) + forms.header(_('Host Properties')) - #value = current_settings.get(var, valuespec.default_value()) forms.section(legend = False) vs_host.render_input("vs_host", host) html.help(vs_host.help()) @@ -2335,24 +2334,23 @@ def mode_diag_host(phase): html.write('<div style="margin-bottom:10px">') html.button("_save", _("Save")) - html.button("_try", _("Test")) html.write('</div>') forms.header(_('Options')) - #value = current_settings.get(var, valuespec.default_value()) value = {} forms.section(legend = False) vs_rules.render_input("vs_rules", value) html.help(vs_rules.help()) forms.end() + html.button("_try", _("Test")) + html.hidden_fields() html.end_form() html.write('</td><td style="padding-left:10px;">') - html.write('<h2>' + _('Diagnostics') + '</h2>') if not html.var('_try'): html.message(_('You can diagnose the connection to a specific host using this dialog. ' 'You can either test wether your current configuration is still working ' @@ -2409,6 +2407,10 @@ def mode_inventory(phase, firsttime): make_link([("mode", "folder")]), "back") html.context_button(_("Host properties"), make_link([("mode", "edithost"), ("host", hostname)]), "host") + if ".nodes" not in host: + # only display for non cluster hosts + html.context_button(_("Diagnose"), + make_link([("mode", "diag_host"), ("host", hostname)]), "diagnose") html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")])) elif phase == "action":

10 years, 11 months

Check_MK Git: check_mk: LDAP: Fixed wording in new options

by Lars Michelsen

Module: check_mk Branch: master Commit: 42d8ff5395373a60da9ef1a1e0ec3f33c59f530d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d8ff5395373a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 29 14:46:26 2013 +0100 LDAP: Fixed wording in new options --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8bc5ba8..e8cc72c 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -490,8 +490,8 @@ register_configvar(group, choices = [ ('page', 'During regular page processing'), ('wato_users', 'When opening the users configuration page'), - ('wato_pre_activate_changes', 'Hook: Before activating the changed configuration'), - ('wato_snapshot_pushed', 'Hook: On a remote site, when it receives a new snapshot'), + ('wato_pre_activate_changes', 'Before activating the changed configuration'), + ('wato_snapshot_pushed', 'On a remote site, when it receives a new configuration'), ], allow_empty = True, ),

10 years, 11 months

Check_MK Git: check_mk: Minor wording change

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b13680f922cac05e405dba322c5948b72010b93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b13680f922cac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 29 14:41:03 2013 +0100 Minor wording change --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ed31841..e87c0d1 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -490,8 +490,8 @@ register_configvar(group, choices = [ ('page', 'During regular page processing'), ('wato_users', 'When opening the users configuration page'), - ('wato_pre_activate_changes', 'Hook: Before activating the changed configuration'), - ('wato_snapshot_pushed', 'Hook: On a remote site, when it receives a new snapshot'), + ('wato_pre_activate_changes', 'Before activating the changed configuration'), + ('wato_snapshot_pushed', 'On a remote site, when it receives a new snapshot'), ], allow_empty = True, ),

10 years, 11 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 262e20fa27dcace841c76d2e1e880848c59ab80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262e20fa27dcac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 29 14:38:38 2013 +0100 Minor code cleanup --- modules/check_mk.py | 17 +++++++++++++++++ modules/notify.py | 22 ++-------------------- web/plugins/wato/check_mk_configuration.py | 4 ++-- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6c48f6b..b31222e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5015,6 +5015,23 @@ def ip_to_dnsname(ip): except: return None +def config_timestamp(): + mtime = 0 + for dirpath, dirnames, filenames in os.walk(check_mk_configdir): + for f in filenames: + mtime = max(mtime, os.stat(dirpath + "/" + f).st_mtime) + mtime = max(mtime, os.stat(default_config_dir + "/main.mk").st_mtime) + try: + mtime = max(mtime, os.stat(default_config_dir + "/final.mk").st_mtime) + except: + pass + try: + mtime = max(mtime, os.stat(default_config_dir + "/local.mk").st_mtime) + except: + pass + return mtime + + # Reset some global variable to their original value. This # is needed in keepalive mode. diff --git a/modules/notify.py b/modules/notify.py index 5bc52c2..54c1775 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -327,26 +327,9 @@ def notify_data_available(): readable, writeable, exceptionable = select.select([0], [], [], None) return not not readable -def notify_config_timestamp(): - mtime = 0 - for dirpath, dirnames, filenames in os.walk(check_mk_configdir): - for f in filenames: - mtime = max(mtime, os.stat(dirpath + "/" + f).st_mtime) - mtime = max(mtime, os.stat(default_config_dir + "/main.mk").st_mtime) - try: - mtime = max(mtime, os.stat(default_config_dir + "/final.mk").st_mtime) - except: - pass - try: - mtime = max(mtime, os.stat(default_config_dir + "/local.mk").st_mtime) - except: - pass - return mtime - - def notify_keepalive(): - config_timestamp = notify_config_timestamp() + last_config_timestamp = config_timestamp() # Send signal that we are ready to receive the next notification, but # not after a config-reload-restart (see below) @@ -369,8 +352,7 @@ def notify_keepalive(): # CMK_NOTIFY_RESTART=1 if notify_data_available(): - current_config_timestamp = notify_config_timestamp() - if current_config_timestamp > config_timestamp: + if last_config_timestamp != config_timestamp(): notify_log("Configuration has changed. Restarting myself.") os.putenv("CMK_NOTIFY_RESTART", "1") os.execvp("cmk", sys.argv) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d1ea01e..aed889a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1388,8 +1388,8 @@ register_rule(group, title = _("Enable/disable passive checks for services"), help = _("This setting allows you to disable the processing of passiv check results for a " "service."), - choices = [ ("1", _("Enable processing of passiv check results")), - ("0", _("Disable processing of passiv check results")) ], + choices = [ ("1", _("Enable processing of passive check results")), + ("0", _("Disable processing of passive check results")) ], ), itemtype = "service")

10 years, 11 months

Check_MK Git: check_mk: LDAP: The sync hooks during activate changes can now be enabled/disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 52b73dfb5510fa8cf877870429fdd960607ba71f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b73dfb5510fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 29 14:18:19 2013 +0100 LDAP: The sync hooks during activate changes can now be enabled/disabled --- ChangeLog | 2 ++ web/plugins/config/builtin.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 +++++--- web/plugins/wato/userdb.py | 11 +++++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12cbcde..b32ba8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,8 @@ * New option for full SNMP scan in bulk inventory * bulk operations now also available when checkboxes are off * LDAP: Added test to validate the configured role sync groups + * LDAP: The sync hooks during activate changes can now be enabled/disabled + by configuration (Global Settings) * Disabled replication type "peer" in site editor. * Added "permanently ignore" button to inventory services dialog which links directly to the disabled services view diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index a51fab3..6d23c08 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -210,7 +210,7 @@ staleness_threshold = 1.5 # user_connectors = ['htpasswd'] -userdb_automatic_sync = [ 'wato_users', 'page' ] +userdb_automatic_sync = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ] ldap_connection = {} ldap_userspec = {} ldap_groupspec = {} diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d1ea01e..8bc5ba8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -486,10 +486,12 @@ register_configvar(group, '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' ], + default_value = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ], choices = [ - ('wato_users', 'When opening the users configuration page'), - ('page', 'During regular page processing'), + ('page', 'During regular page processing'), + ('wato_users', 'When opening the users configuration page'), + ('wato_pre_activate_changes', 'Hook: Before activating the changed configuration'), + ('wato_snapshot_pushed', 'Hook: On a remote site, when it receives a new snapshot'), ], allow_empty = True, ), diff --git a/web/plugins/wato/userdb.py b/web/plugins/wato/userdb.py index 9f1dddd..0d5663e 100644 --- a/web/plugins/wato/userdb.py +++ b/web/plugins/wato/userdb.py @@ -26,5 +26,12 @@ import userdb -api.register_hook('pre-activate-changes', lambda hosts: userdb.hook_sync()) -api.register_hook('snapshot-pushed', userdb.hook_sync) +def sync_pre_activate_changes(_unused): + if 'wato_pre_activate_changes' in config.userdb_automatic_sync: + userdb.hook_sync() +api.register_hook('pre-activate-changes', sync_pre_activate_changes) + +def sync_snapshot_pushed(): + if 'wato_snapshot_pushed' in config.userdb_automatic_sync: + userdb.hook_sync() +api.register_hook('snapshot-pushed', sync_snapshot_pushed)

10 years, 11 months

Check_MK Git: check_mk: Minor Styling-Change in Diagnostics pages

by Mathias Kettner

Module: check_mk Branch: master Commit: 10560d8f7fee0af3f544732871314d2ff25cecaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10560d8f7fee0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 29 11:55:27 2013 +0100 Minor Styling-Change in Diagnostics pages --- web/htdocs/wato.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 8593a07..022b289 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -1135,7 +1135,7 @@ table.multisite_conn_method td input { width: 700px; font-family: monospace, sans-serif; overflow-y: scroll; - padding: 12px; + padding: 12px 5px; vertical-align: top; background-color: #fff; /* below resize option is css3 */

10 years, 11 months

← Newer
1
2
3
4
5
6
7
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013