Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64396 discussions

Check_MK Git: check_mk: FIX: startup crash when no textfile is specified and pattern is added

by Andreas Boesl

Module: check_mk Branch: master Commit: 33d7591216aaa2e9e407ef820b560a05d6c75b58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33d7591216aaa2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 17 16:10:14 2013 +0100 FIX: startup crash when no textfile is specified and pattern is added --- ChangeLog | 3 +++ agents/windows/check_mk.example.ini | 24 ++++++++++++------------ agents/windows/check_mk_agent.cc | 6 ++++++ agents/windows/check_mk_agent.exe | Bin 110592 -> 111104 bytes agents/windows/install_agent.exe | Bin 125348 -> 130870 bytes 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e2cbf8..d54847b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ * FIX: megaraid_bbu - Handle missing charge information (ignoring them) * FIX: myssql_tablespaces - fix PNP graph (thanks to Christian Zock) * kernel.util: add "Average" information to PNP graph + * Windows Agent: Fix startup crash on adding a logfiles pattern, but no logfile specified + * Windows Agent: check_mk.example.ini: commented logfiles section + Multisite: * FIX: Fixed rendering of dashboard globes in opera diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index bfa9302..2929fc6 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -23,19 +23,19 @@ [logfiles] - # Define textfiles to be monitored, separated by | - textfile = C:\tmp logfiles\message_*.log|D:\log\sample.txt - # Set patterns for defined textfiles - ok = Successfully logged in* - crit = Error in* - warn = Unable to contact* - ignore = Backup * saved + # # Define textfiles to be monitored, separated by | + # textfile = C:\tmp logfiles\message_*.log|D:\log\sample.txt + # # Set patterns for defined textfiles + # ok = Successfully logged in* + # crit = Error in* + # warn = Unable to contact* + # ignore = Backup * saved - # Define additional textfiles with different patterns - textfile = C:\tmp\memo.udf - # Set patterns for defined textfile - warn = *overdue* - ok = *mail sent* + # # Define additional textfiles with different patterns + # textfile = C:\tmp\memo.udf + # # Set patterns for defined textfile + # warn = *overdue* + # ok = *mail sent* [logwatch] # Testing: output *all* messages from the eventlogs diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 85da879..4f2e132 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1450,6 +1450,12 @@ void print_logwatch_config() // Add a new state pattern to the current pattern container void add_condition_pattern(char state, char *value) { + if (g_current_globline_container == NULL) { + fprintf(stderr, "You need to set a textfile, before specifying a condition pattern\n"); + return; + } + + if (g_current_globline_container && g_current_globline_container->patterns->num_patterns + 1 >= MAX_LOGWATCH_CONDITIONS) { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index bd4f5ec..202aa7e 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e68f6ef..06922ac 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 8 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 297b32336cb6fa7bbe0075cb4bface891557b940 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=297b32336cb6fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 15:49:23 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 8 months

Check_MK Git: check_mk: Added notify plugin test script

by Lars Michelsen

Module: check_mk Branch: master Commit: 64ba4187216b59861051808b6c8245ccb95e2431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64ba4187216b59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 15:49:12 2013 +0100 Added notify plugin test script --- notifications/test_plugin | 84 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/notifications/test_plugin b/notifications/test_plugin new file mode 100644 index 0000000..153bb1a --- /dev/null +++ b/notifications/test_plugin @@ -0,0 +1,84 @@ +#!/usr/bin/python' + +test_vars = { + 'host': { + 'NOTIFY_CONTACTEMAIL': 'lm(a)mathias-kettner.de', + 'NOTIFY_CONTACTNAME': 'lm', + 'NOTIFY_CONTACTPAGER': '', + 'NOTIFY_DATE': '2013-01-17', + 'NOTIFY_HOSTADDRESS': '127.0.0.1', + 'NOTIFY_HOSTALIAS': 'localhost', + 'NOTIFY_HOSTCHECKCOMMAND': 'check-mk-ping', + 'NOTIFY_HOSTDOWNTIME': '0', + 'NOTIFY_HOSTNAME': 'localhost', + 'NOTIFY_HOSTNOTIFICATIONNUMBER': '1', + 'NOTIFY_HOSTOUTPUT': 'Manually set to Down by lm', + 'NOTIFY_HOSTPERFDATA': '', + 'NOTIFY_HOSTPROBLEMID': '136', + 'NOTIFY_HOSTSTATE': 'DOWN', + 'NOTIFY_HOSTTAGS': 'cmk-agent prod lan tcp wato /wato/', + 'NOTIFY_LASTHOSTSTATE': 'UP', + 'NOTIFY_LASTSERVICESTATE': '$LASTSERVICESTATE$', + 'NOTIFY_LOGDIR': '/omd/sites/event/var/check_mk/notify', + 'NOTIFY_LONGDATETIME': 'Thu Jan 17 15:28:13 CET 2013', + 'NOTIFY_LONGHOSTOUTPUT': '', + 'NOTIFY_LONGSERVICEOUTPUT': '$LONGSERVICEOUTPUT$', + 'NOTIFY_NOTIFICATIONTYPE': 'PROBLEM', + 'NOTIFY_PARAMETERS': '', + 'NOTIFY_SERVICECHECKCOMMAND': '$SERVICECHECKCOMMAND$', + 'NOTIFY_SERVICEDESC': '$SERVICEDESC$', + 'NOTIFY_SERVICENOTIFICATIONNUMBER': '$SERVICENOTIFICATIONNUMBER$', + 'NOTIFY_SERVICEOUTPUT': '$SERVICEOUTPUT$', + 'NOTIFY_SERVICEPERFDATA': '$SERVICEPERFDATA$', + 'NOTIFY_SERVICEPROBLEMID': '$SERVICEPROBLEMID$', + 'NOTIFY_SERVICESTATE': '$SERVICESTATE$', + 'NOTIFY_SHORTDATETIME': '2013-01-17 15:28:13', + }, + 'service': { + 'NOTIFY_CONTACTEMAIL': 'lm(a)mathias-kettner.de', + 'NOTIFY_CONTACTNAME': 'lm', + 'NOTIFY_CONTACTPAGER': '', + 'NOTIFY_DATE': '2013-01-17', + 'NOTIFY_HOSTADDRESS': '127.0.0.1', + 'NOTIFY_HOSTALIAS': 'localhost', + 'NOTIFY_HOSTCHECKCOMMAND': 'check-mk-ping', + 'NOTIFY_HOSTDOWNTIME': '0', + 'NOTIFY_HOSTNAME': 'localhost', + 'NOTIFY_HOSTNOTIFICATIONNUMBER': '0', + 'NOTIFY_HOSTOUTPUT': 'OK - 127.0.0.1: rta 0.028ms, lost 0%', + 'NOTIFY_HOSTPERFDATA': 'rta=0.028ms;200.000;500.000;0; pl=0%;40;80;; rtmax=0.052ms;;;; rtmin=0.021ms;;;;', + 'NOTIFY_HOSTPROBLEMID': '0', + 'NOTIFY_HOSTSTATE': 'UP', + 'NOTIFY_HOSTTAGS': 'cmk-agent prod lan tcp wato /wato/', + 'NOTIFY_LASTHOSTSTATE': 'UP', + 'NOTIFY_LASTSERVICESTATE': 'OK', + 'NOTIFY_LOGDIR': '/omd/sites/event/var/check_mk/notify', + 'NOTIFY_LONGDATETIME': 'Thu Jan 17 15:31:46 CET 2013', + 'NOTIFY_LONGHOSTOUTPUT': '', + 'NOTIFY_LONGSERVICEOUTPUT': '', + 'NOTIFY_NOTIFICATIONTYPE': 'PROBLEM', + 'NOTIFY_PARAMETERS': '', + 'NOTIFY_SERVICECHECKCOMMAND': 'check_mk-cpu.loads', + 'NOTIFY_SERVICEDESC': 'CPU load', + 'NOTIFY_SERVICENOTIFICATIONNUMBER': '1', + 'NOTIFY_SERVICEOUTPUT': 'CRIT - 15min load 1.29 at 2 CPUs (critical at 0.00)', + 'NOTIFY_SERVICEPERFDATA': 'load1=1.35;0;0;0;2 load5=1.33;0;0;0;2 load15=1.29;0;0;0;2', + 'NOTIFY_SERVICEPROBLEMID': '137', + 'NOTIFY_SERVICESTATE': 'CRITICAL', + 'NOTIFY_SHORTDATETIME': '2013-01-17 15:31:46', + }, +} + +import os, sys + +if len(sys.argv) < 3: + sys.stderr.write('USAGE:\n') + sys.stderr.write(' ./test_notify <plugin> <what>\n') + sys.stderr.write(' ./test_notify debug service\n') + sys.exit(1) + +plugin, what = sys.argv[1:] + +os.environ.update(test_vars[what]) +sys.exit(os.system('./%s' % plugin)) +

11 years, 8 months

Check_MK Git: check_mk: Fix: Distritubed monitoring setup:

by Andreas Boesl

Module: check_mk Branch: master Commit: d884fe0b5c2c1f78c1e3b52c732db2980c78b9fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d884fe0b5c2c1f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 17 15:27:48 2013 +0100 Fix: Distritubed monitoring setup: - site configuration changes no longer mark all sites as dirty - correct logfile cleanup on 'Activate changes' --- ChangeLog | 2 ++ web/htdocs/wato.py | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d8a0c5..f1b8e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * Storing row selections in user files, cleaned up row selection handling to single files. Cleaned up GET/POST mixups in confirm dialogs * Add: New user_options to limit seen nagios objects even the role is set to see all + * Fix: On site configaration changes, only relevant sites are marked as dirty + * Fix: Distributed setup: Correct cleanup of pending changes logfile after "Activate changes" 1.2.1i4: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cabef4c..ba6f916 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6653,16 +6653,22 @@ def mode_edit_site(phase): if not new and "secret" in old_site: new_site["secret"] = old_site["secret"] + save_sites(sites) + + # Own site needs SYNCRESTART in any case + update_replication_status(our_site_id(), { "need_restart" : True }) + if new: - log_pending(SYNCRESTART, None, "edit-sites", _("Created new connection to site %s" % id)) + update_replication_status(id, { "need_sync" : True, "need_restart" : True }) + log_pending(AFFECTED, None, "edit-sites", _("Created new connection to site %s" % id)) else: - log_pending(SYNCRESTART, None, "edit-sites", _("Modified site connection %s" % id)) + log_pending(AFFECTED, None, "edit-sites", _("Modified site connection %s" % id)) # Replication mode has switched on/off => handle replication state repstatus = load_replication_status() - if repl and id not in repstatus: # Repl switched on + if repl: # Repl is on update_replication_status(id, { "need_sync" : True, "need_restart" : True }) - elif (not repl) and id in repstatus: + elif id in repstatus: # Repl switched off update_replication_status(id, None) # Replication switched off if is_distributed() and global_replication_state() == "clean": log_commit_pending() @@ -7281,6 +7287,10 @@ def ajax_replication(): result = str(e) if result == True: answer = "OK:" + _("Success"); + # Make sure that the pending changes are clean as soon as the + # last site has successfully been updated. + if is_distributed() and global_replication_state() == "clean": + log_commit_pending() else: answer = "<div class=error>%s: %s</div>" % (_("Error"), hilite_errors(result))

11 years, 8 months

Check_MK Git: check_mk: Add: bi views now support debug of livestatus queries

by Andreas Boesl

Module: check_mk Branch: master Commit: 7fcaf623ff86dfcc1f4587b608b8ad062002a5ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fcaf623ff86df… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 17 15:32:17 2013 +0100 Add: bi views now support debug of livestatus queries --- ChangeLog | 3 +++ web/htdocs/bi.py | 21 +++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1b8e73..0b0b6d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,9 @@ * Fix: On site configaration changes, only relevant sites are marked as dirty * Fix: Distributed setup: Correct cleanup of pending changes logfile after "Activate changes" + Bi: + * Add: Bi views now support debug of livestatus queries + 1.2.1i4: Core: * Better exception handling when executing "Check_MK"-Check. Printing python diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c8b5c16..1d8295d 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1096,10 +1096,23 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc html.live.set_only_sites(only_sites) html.live.set_prepend_site(True) - data = html.live.query( - "GET hosts\n" + - "Columns: " + (" ".join(columns)) + "\n" + - filter_header) + + query = "GET hosts\n" + query += "Columns: " + (" ".join(columns)) + "\n" + query += filter_header + + + if config.debug_livestatus_queries \ + and html.output_format == "html" and 'W' in html.display_options: + html.write('<div class="livestatus message" onmouseover="this.style.display=\'none\';">' + '<tt>%s</tt></div>\n' % (query.replace('\n', '<br>\n'))) + + + html.live.set_only_sites(only_sites) + html.live.set_prepend_site(True) + + data = html.live.query(query) + html.live.set_prepend_site(False) html.live.set_only_sites(None)

11 years, 8 months

Check_MK Git: check_mk: resolved merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: 498307cedb75af217d716ae649746e8b63db31a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=498307cedb75af… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 17 15:33:58 2013 +0100 resolved merge conflict ---

11 years, 8 months

Check_MK Git: check_mk: FIX: PING services on clusters are treated like the host check of clusters

by Lars Michelsen

Module: check_mk Branch: master Commit: e842afe6103a8d4140d3ffe875ff1a2fa2b3664d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e842afe6103a8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 14:55:25 2013 +0100 FIX: PING services on clusters are treated like the host check of clusters --- .bugs/786 | 7 +++++-- ChangeLog | 1 + modules/check_mk.py | 9 +++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.bugs/786 b/.bugs/786 index 7f09683..9ddd303 100644 --- a/.bugs/786 +++ b/.bugs/786 @@ -1,9 +1,9 @@ Title: PING check for clusters without services UNKNOWN Component: core -State: open +Class: nastiness +State: done Date: 2012-07-26 16:29:56 Targetversion: 1.2.2 -Class: nastiness If you have a cluster without any services, then Check_MK will create a PING services. This will be UNKNOWN. Couldn't we doe @@ -16,3 +16,6 @@ should behave just like the host check: * Use the IP Adress of the cluster if available * PING all nodes with check_icmp otherwise + +2013-01-17 14:54:46: changed state open -> done +Using existing check-mk-ping-cluster command now for PING services on clusters. diff --git a/ChangeLog b/ChangeLog index f009631..86173bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * Improved handling of CTRL+C (SIGINT) to terminate long runnining tasks (e.g. inventory of SNMP hosts) + * FIX: PING services on clusters are treated like the host check of clusters Checks & Agents: * Linux Agent, diskstat: Now supporting /dev/emcpower* devices (Thanks to Claas Rockmann-Buchterkirche) diff --git a/modules/check_mk.py b/modules/check_mk.py index ad39048..bfe2d7b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1931,17 +1931,22 @@ define service { """ % (template, hostname, description, simulate_command(command), command_line and 1 or 0, extraconf)) + # Levels for host check + if is_cluster(hostname): + ping_command = 'check-mk-ping-cluster' + else: + ping_command = 'check-mk-ping' # No check_mk service, no legacy service -> create PING service if not have_at_least_one_service and not legchecks and not actchecks: outfile.write(""" define service { use\t\t\t\t%s - check_command\t\t\tcheck-mk-ping!%s + check_command\t\t\t%s!%s %s host_name\t\t\t%s } -""" % (pingonly_template, check_icmp_arguments(hostname), extra_service_conf_of(hostname, "PING"), hostname)) +""" % (pingonly_template, ping_command, check_icmp_arguments(hostname), extra_service_conf_of(hostname, "PING"), hostname)) def simulate_command(command): if simulation_mode:

11 years, 8 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 446fb5585122468e1d56ae993b5e8b55a8a5c096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=446fb558512246… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 15:19:56 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 8 months

Check_MK Git: check_mk: Added FOREACH_SERVICE capability to leaf nodes

by Lars Michelsen

Module: check_mk Branch: master Commit: dd604222bb9e1ac1429935b6a7645a4276e14536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd604222bb9e1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 15:19:50 2013 +0100 Added FOREACH_SERVICE capability to leaf nodes --- .bugs/785 | 16 ++++++++++++++-- ChangeLog | 3 +++ web/htdocs/bi.py | 6 +++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.bugs/785 b/.bugs/785 index 07683d9..8f28356 100644 --- a/.bugs/785 +++ b/.bugs/785 @@ -1,9 +1,9 @@ Title: FOREACH_SERVICE in a leaf node does not work for direct host/services Component: bi -State: open +Class: bug +State: done Date: 2012-07-26 16:05:16 Targetversion: 1.2.2 -Class: bug If you use FOREACH_SERVICE within an inner node then you cannot directly add leaf nodes. The following produces an error: @@ -14,3 +14,15 @@ aggregation_rules[...] = ( ( FOREACH_SERVICE, ALL_HOSTS, ".*", "$1$", HOST_STATE ), ] ) + +2013-01-17 15:19:06: changed state open -> done +1. added FOREACH_SERVICE for leaf nodes +2. the following works for me now: + +(FOREACH_SERVICE, "localhost", "fs_(.*)", "filesystem", [ "localhost", "$1$" ] ), +(FOREACH_SERVICE, "localhost", "fs_(.*)", "localhost", "fs_$1$"), +(FOREACH_SERVICE, "localhost", "fs_(.*)", "localhost", "fs_$1$" ), +(FOREACH_SERVICE, "localhost", "fs_(.*)", "localhost", HOST_STATE ), +(FOREACH_SERVICE, "(.*)", "fs_(.*)", "$1$", HOST_STATE ), + +Some of the rules are senseless but should work in general. diff --git a/ChangeLog b/ChangeLog index 86173bb..dc1685a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor * FIX: Rulesets are always cloned in the same folder + BI: + * Added FOREACH_SERVICE capability to leaf nodes + 1.2.1i4: Core: * Better exception handling when executing "Check_MK"-Check. Printing python diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c8b5c16..ad13490 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -736,7 +736,11 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): new_elements = new_new_elements elif type(node[-1]) != list: - if node[0] in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: + if node[0] in [ + config.FOREACH_HOST, + config.FOREACH_CHILD, + config.FOREACH_PARENT, + config.FOREACH_SERVICE ]: # Handle case that leaf elements also need to be iterable via FOREACH_HOST # 1: config.FOREACH_HOST # 2: (['waage'], '(.*)')

11 years, 8 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0420a607ea3748db70036c914d2a20ccec3772ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0420a607ea3748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 17 14:40:08 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits