Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: FIX: fix event icon in case of using TCP access to EC

by Mathias Kettner

Module: check_mk Branch: master Commit: 1dd5a1e70717c4fcd1a67efd3cac1866a2df77ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd5a1e70717c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 16:07:09 2012 +0100 FIX: fix event icon in case of using TCP access to EC --- ChangeLog | 1 + mkeventd/web/plugins/icons/mkeventd.py | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a46188..1bcdf66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ Event Console: * FIX: fix exception in rules that use facility local7 + * FIX: fix event icon in case of using TCP access to EC * Replication slave can now copy rules from master into local configuration via a new button in WATO. * Speedup access to event history by earlier filtering and prefiltering with grep diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py index fff175f..9487d6b 100644 --- a/mkeventd/web/plugins/icons/mkeventd.py +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -45,18 +45,18 @@ def paint_mkeventd(what, row, tags, custom_vars): app = None # Extract parameters from check_command: - args = command.split('!')[1].split(' ', 1) + args = command.split('!')[1].split() if not args: return - if len(args) >= 1: - # Handle -a and -H options. Sorry for the hack. We currently - # have no better idea - if args[0] == '-H': - args = args[2:] # skip two arguments - if args[0] == '-a': - args = args[1:] + # Handle -a and -H options. Sorry for the hack. We currently + # have no better idea + if len(args) >= 2 and args[0] == '-H': + args = args[2:] # skip two arguments + if len(args) >= 1 and args[0] == '-a': + args = args[1:] + if len(args) >= 1: if args[0] == '$HOSTNAME$': host = row['host_name'] elif args[0] == '$HOSTADDRESS$': @@ -64,6 +64,11 @@ def paint_mkeventd(what, row, tags, custom_vars): else: host = args[0] + # If we have no host then the command line from the check_command seems + # to be garbled. Better show nothing in this case. + if not host: + return + # It is possible to have a central event console, this is the default case. # Another possible architecture is to have an event console in each site in # a distributed environment. For the later case the base url need to be

12 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: fcfc889936f0849cebadb69803d42117f0e2b279 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcfc889936f084… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 14:15:49 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: WATO: remove comment from auth.serials

by Mathias Kettner

Module: check_mk Branch: master Commit: feec475895123a4ae34841a57d8b6f53c7b2e053 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=feec475895123a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 14:15:47 2012 +0100 WATO: remove comment from auth.serials --- web/htdocs/wato.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a15f9bc..aa75e48 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8499,7 +8499,6 @@ def save_users(profiles): # Write out the users serials serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) out = create_user_file(serials_file, "w") - out.write('# Writtem by WATO\n') for user_id, user in profiles.items(): out.write('%s:%d\n' % (user_id, user.get('serial', 0))) out.close()

12 years

Check_MK Git: check_mk: EC: Speedup access to event history

by Mathias Kettner

Module: check_mk Branch: master Commit: ae12dfe103deb27bf652ae10ff028ffdc299ecd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae12dfe103deb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 13:12:50 2012 +0100 EC: Speedup access to event history --- ChangeLog | 1 + mkeventd/bin/mkeventd | 87 +++++++++++++++++++++++++------- mkeventd/web/plugins/views/mkeventd.py | 73 +++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae12dfe103…

12 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f9c0099c9624d35bc03ae28f0870c40c1772259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f9c0099c9624d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 13:12:53 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: EC slave can copy rules from master via button

by Mathias Kettner

Module: check_mk Branch: master Commit: 06a979af3b27683fcad801375dd1f370a536cc3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a979af3b2768… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 10:05:10 2012 +0100 EC slave can copy rules from master via button --- ChangeLog | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 968b550..16e6faa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ Event Console: * FIX: fix exception in rules that use facility local7 + * Replication slave can now copy rules from master into local configuration + via a new button in WATO. 1.2.1i3: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index b083d1a..58c0401 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -771,6 +771,20 @@ def mode_mkeventd_rules(phase): else: return + elif html.has_var("_copy_rules"): + c = wato_confirm(_("Confirm copying rules"), + _("Do you really want to copy all event rules from the master and " + "replace your local configuration with them?")) + if c: + copy_rules_from_master() + log_mkeventd("copy-rules-from-master", _("Copied the event rules from the master " + "into the local configuration")) + return None, _("Copied rules from master") + elif c == False: + return "" + else: + return + if html.check_transaction(): if html.has_var("_move"): @@ -785,10 +799,14 @@ def mode_mkeventd_rules(phase): rep_mode = mkeventd.replication_mode() if rep_mode in [ "sync", "takeover" ]: + copy_url = make_action_link([("mode", "mkeventd_rules"), ("_copy_rules", "1")]) html.show_warning(_("WARNING: This Event Console is currently running as a replication " "slave. The rules edited here will not be used. Instead a copy of the rules of the " "master are being used in the case of a takeover. The same holds for the event " - "actions in the global settings.")) + "actions in the global settings.<br><br>If you want you can copy the ruleset of " + "the master into your local slave configuration: ") + \ + '<a class=button href="%s">' % copy_url + + _("Copy Rules From Master") + '</a>') if len(rules) == 0: html.write(_("You have not created any rules yet.")) @@ -917,6 +935,14 @@ def mode_mkeventd_rules(phase): html.write('</table>') +def copy_rules_from_master(): + answer = mkeventd.query("REPLICATE 0") + if "rules" not in answer: + raise MKGeneralException(_("Cannot get rules from local event daemon.")) + rules = answer["rules"] + save_mkeventd_rules(rules) + + def mode_mkeventd_edit_rule(phase): rules = load_mkeventd_rules() # Links from status view refer to rule via the rule id

12 years

Check_MK Git: check_mk: Multisite: Use pprint when writing global settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 5620402177d6022c6627608c882a8cfb20a63f3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5620402177d602… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 09:41:29 2012 +0100 Multisite: Use pprint when writing global settings --- ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0fd8cb..968b550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * Now showing correct representation of SI unit kilo ( k ) * if perfometer now differs between byte and bit output * FIX: warn / crit levels in if-check when using "bit" as unit + * Use pprint when writing global settings (makes files more readable) WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ee7115..a15f9bc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5367,7 +5367,7 @@ def render_main_menu(some_modules, columns = 2): html.write("</div>") #. -# .-Global-Vars----------------------------------------------------------. +# .-Global-Settings------------------------------------------------------. # | ____ _ _ _ __ __ | # | / ___| | ___ | |__ __ _| | \ \ / /_ _ _ __ ___ | # | | | _| |/ _ \| '_ \ / _` | | \ \ / / _` | '__/ __| | @@ -5646,7 +5646,7 @@ def save_configuration_vars(vars, filename): out = create_user_file(filename, 'w') out.write("# Written by WATO\n# encoding: utf-8\n\n") for varname, value in vars.items(): - out.write("%s = %r\n" % (varname, value)) + out.write("%s = %s\n" % (varname, pprint.pformat(value))) #. # .-Groups---------------------------------------------------------------.

12 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 882e0e954f95d21a5732fbe60d061f9814f14e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=882e0e954f95d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 09:37:31 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: EC: FIX: fix exception in rules that use facility local7

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c866b83ccd119f072f62d38e318039f67a66431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c866b83ccd119… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 30 09:37:27 2012 +0100 EC: FIX: fix exception in rules that use facility local7 --- ChangeLog | 5 ++++- mkeventd/.f12 | 2 +- mkeventd/web/htdocs/mkeventd.py | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a57320..e3ea948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,4 @@ 1.2.1i4: - * FIX: postgres_sessions: handle case of no active/no idle sessions Core: * Better exception handling when executing "Check_MK"-Check. Printing python exception to status output and traceback to long output now. @@ -16,6 +15,7 @@ * FIX: correct backslash representation of windows logwatch files * Add: New Check for Rittal CMC PSM-M devices * Smart plugin: Only use relevant numbers of serial + * FIX: postgres_sessions: handle case of no active/no idle sessions Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your @@ -35,6 +35,9 @@ * FIX: Fixed generated manual check definitions for checks without items like ntp_time and tcp_conn_stats + Event Console: + * FIX: fix exception in rules that use facility local7 + 1.2.1i3: Core: * added HOST/SERVICEPROBLEMID to notification macros diff --git a/mkeventd/.f12 b/mkeventd/.f12 index 18c6237..79af0b0 100644 --- a/mkeventd/.f12 +++ b/mkeventd/.f12 @@ -1,4 +1,4 @@ -SITE=${SITE:-ev} +SITE=${SITE:-$(omd sites --bare | sort | head -n 1)} OMD_ROOT=/omd/sites/${SITE} for dir in web checks pnp-templates diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 7842757..45aa354 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -38,6 +38,10 @@ syslog_facilities = [ (9, "cron"), (10, "authpriv"), (11, "ftp"), + (12, "(12: unused)"), + (13, "(13: unused)"), + (14, "(14: unused)"), + (15, "(15: unused)"), (16, "local0"), (17, "local1"), (18, "local2"),

12 years

Check_MK Git: check_mk: FIX: fix users settings of omdadmin user

by Mathias Kettner

Module: check_mk Branch: master Commit: 78fc4db36e70637725ba05c3c76b035131529f74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78fc4db36e7063… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 29 10:26:21 2012 +0100 FIX: fix users settings of omdadmin user --- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/install_agent.exe | Bin 130737 -> 129205 bytes web/htdocs/wato.py | 2 ++ 3 files changed, 2 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a3df30e..164b5dd 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 733e1bc..724e341 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ae9291f..15b3b35 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8404,6 +8404,8 @@ def load_users(): "locked" : False, } result[id] = new_user + # Make sure that the user has an alias + result[id].setdefault("alias", id) # Other unknown entries will silently be dropped. Sorry... # Now read the serials, only process for existing users

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012