Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64140 discussions

Check_MK Git: check_mk: Livestatus: Negation of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 413cfa4ff2b22d3a3d83a869b5b56303cdb348d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413cfa4ff2b22d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 14:06:38 2011 +0200 Livestatus: Negation of filters --- ChangeLog | 38 ++++++++--------- livestatus/src/AndingFilter.cc | 12 +++++ livestatus/src/AndingFilter.h | 2 + livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/NegatingFilter.h | 42 +++++++++++++++++++ livestatus/src/Query.cc | 64 +++++++++++++++++++++++++++++ livestatus/src/Query.h | 7 ++- 7 files changed, 143 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=413cfa4ff2…

13 years, 1 month

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d34fa5926cf24e719c3829b1460f55e626f95fea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d34fa5926cf24e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 14:07:06 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: Livestatus: Negation of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 098258312d5838efce9a32530757f27f357b625d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=098258312d5838… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 14:06:38 2011 +0200 Livestatus: Negation of filters --- ChangeLog | 38 ++++++++--------- livestatus/src/AndingFilter.cc | 12 +++++ livestatus/src/AndingFilter.h | 2 + livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/Query.cc | 64 +++++++++++++++++++++++++++++ livestatus/src/Query.h | 7 ++- 6 files changed, 101 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=098258312d…

13 years, 1 month

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a4873bde9793b511872d5b651c3c857af407bb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a4873bde9793b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 13:52:14 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: WATO: extra_buttons supports external URLs now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74f35c7b0d970e3534d4cb036270c7a1d149e887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74f35c7b0d970e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 11:53:20 2011 +0200 WATO: extra_buttons supports external URLs now --- web/htdocs/wato.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ed2786..32002f0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -150,9 +150,12 @@ def page_handler(): # Show contexts buttons html.begin_context_buttons() modefunc("buttons") - for inmode, buttontext, targetmode in extra_buttons: + for inmode, buttontext, target in extra_buttons: if inmode == current_mode: - html.context_button(buttontext, make_link([("mode", targetmode)])) + if '/' == target[0] or target.startswith('../') or '://' in target: + html.context_button(buttontext, target) + else: + html.context_button(buttontext, make_link([("mode", target)])) html.end_context_buttons() # Show outcome of action

13 years, 1 month

Check_MK Git: check_mk: FIX: "view_name" variable missing error message

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4e979fb333a9c11a23478e9c4fa5461fcba5184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4e979fb333a9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 17 13:51:35 2011 +0200 FIX: "view_name" variable missing error message Occured when opening view.py while using the "BI Aggregation Groups" and "Hosts" snapins in sidebar --- ChangeLog | 2 ++ web/plugins/sidebar/bi.py | 1 - web/plugins/sidebar/shipped.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 189746b..8d3afdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,8 @@ unit) in summary mode * FIX: ipmi: Improved output formating in summary mode * FIX: BI - fixed wrong variable in running_on aggregation function + * FIX: "view_name" variable missing error message when opening view.py + while using the "BI Aggregation Groups" and "Hosts" snapins in sidebar * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard. diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index ba29249..08cef4b 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -36,7 +36,6 @@ except NameError: from sets import Set as set def render_bi_groups(): - bi.html = html bi.compile_forest(html.req.user) html.write("<ul>") for group, trees in bi.g_user_cache["forest"].items(): diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a7086b1..300ae22 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -223,7 +223,6 @@ def render_hosts(mode): else: num_columns = 2 - views.html = html views.load_views() target = views.get_context_link(html.req.user, view) html.write("<table class=allhosts>\n")

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c05761feaa5e9ee8ca9a762229e6152e2f4b1804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c05761feaa5e9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 12:10:53 2011 +0200 Updated bug entries --- .bugs/115 | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.bugs/115 b/.bugs/115 index 89bedd0..d098ad6 100644 --- a/.bugs/115 +++ b/.bugs/115 @@ -1,10 +1,11 @@ Title: livestatus: No timeperiod information available for 24X7 Component: livestatus +State: done +Class: bug +Date: 2011-01-30 13:15:35 Benefit: 1 -State: open Cost: 1 -Date: 2011-01-30 13:15:35 -Class: bug +Fun: 0 Beim Neustart von Nagios tauchen teils Fehlermeldungen im Logfile auf: @@ -33,3 +34,10 @@ Im laufenden Betrieb dann nicht mehr. [1296122400] TIMEPERIOD TRANSITION: none;-1;0 [1296122400] TIMEPERIOD TRANSITION: us-holidays;-1;0 [1296122400] TIMEPERIOD TRANSITION: workhours;-1;1 + +2011-08-17 12:10:51: changed state open -> done +Fixed. It was du to a timed event broker message that +came before the start of the eventloop. No timeperiod +definitions had been loaded at that point of time. The +timeperiod cache then was empty but anyway marked the +current minute as being uptodate.

13 years, 1 month

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2776261571c0c9f8e5a6e18402d22f7fa542528 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2776261571c0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 17 12:10:57 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c96fb34773b35f805463a719e9da42e657d171e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c96fb34773b35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 16 17:21:08 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: WATO: Removed dirty code and changed parameters to all host containing dict

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9c33e88cea1d36cf967e72a5d97ba4808533eda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9c33e88cea1d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 16 17:21:00 2011 +0200 WATO: Removed dirty code and changed parameters to all host containing dict --- .bugs/192 | 16 ++++++++++++ web/htdocs/wato.py | 42 +++++++------------------------ web/plugins/wato/builtin_attributes.py | 6 ---- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/.bugs/192 b/.bugs/192 new file mode 100644 index 0000000..fb48813 --- /dev/null +++ b/.bugs/192 @@ -0,0 +1,16 @@ +Title: Dashlets mit Reload bleiben bei Apache Fehler hängen +Component: multisite +Benefit: 3 +State: open +Cost: 3 +Date: 2011-08-16 17:13:46 +Class: bug + +Der Apache Fehler bleibt stehen. Der Reload passiert nicht mehr: + +---- + + +OMD: Site Not Started +You need to start this site in order to access the web interface. +---- diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f6c2961..3ed2786 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -780,7 +780,6 @@ def mode_edithost(phase, new): go_to_services = html.var("services") if html.check_transaction(): g_hosts[hostname] = host - mark_as_dirty(g_hosts[hostname]) if new: message = _("Created new host %s.") % hostname log_pending(hostname, "create-host", message) @@ -1212,7 +1211,6 @@ def mode_bulk_edit(phase): hostnames = get_hostnames_from_checkboxes() for hostname in hostnames: host = g_hosts[hostname] - mark_as_dirty(host) host.update(changed_attributes) log_pending(hostname, "bulk-edit", _("Changed attributes of host %s in bulk mode") % hostname) write_the_configuration_file() @@ -1254,7 +1252,6 @@ def mode_bulk_cleanup(phase): hostnames = get_hostnames_from_checkboxes() for hostname in hostnames: host = g_hosts[hostname] - mark_as_dirty(host) num_cleaned = 0 for attrname in to_clean: num_cleaned += 1 @@ -1380,7 +1377,6 @@ def mode_changelog(phase): try: check_mk_automation("restart") call_hook_activate_changes() - undirt_hosts() except Exception, e: raise MKUserError(None, str(e)) log_commit_pending() # flush logfile with pending actions @@ -1538,31 +1534,6 @@ def render_audit_log(log, what, with_filename = False): # | Functions needed at various places | # +----------------------------------------------------------------------+ -def get_dirty_hosts(): - dirty_hosts = {} - load_folder_config() - for hostname, attributes in collect_hosts(g_root_folder).iteritems(): - if attributes.get('dirty', 'no') == 'yes': - dirty_hosts[hostname] = attributes - return dirty_hosts - -def mark_as_dirty(host): - host['dirty'] = 'yes' - -def undirt_hosts(): - # Seems very dirty with all the global things here. Clean this up! - global g_hosts, g_folder, g_file - old_file = g_file - old_folder = g_folder - for hostname, attributes in get_dirty_hosts().iteritems(): - g_file = g_files[attributes['file']] - g_folder = find_folder(attributes['file'][:-1]) - read_the_configuration_file() - del g_hosts[hostname]['dirty'] - write_the_configuration_file() - g_file = old_file - g_folder = old_folder - def check_mk_automation(command, args=[], indata=""): # Gather the command to use for executing --automation calls to check_mk # - First try to use the check_mk_automation option from the defaults @@ -2291,7 +2262,6 @@ def move_hosts_to(hostnames, target_filename): continue target_hosts[hostname] = g_hosts[hostname] - mark_as_dirty(target_hosts[hostname]) target_file["num_hosts"] += 1 g_file["num_hosts"] -= 1 del g_hosts[hostname] @@ -3178,6 +3148,9 @@ def collect_hosts(the_thing): host["file"] = the_thing[".path"] return effective_hosts +def hook_registered(name): + """ Returns True if at least one function is registered for the given hook """ + return hooks.get(name, []) != [] def call_hooks(name, *args): n = 0 @@ -3219,10 +3192,15 @@ def call_hook_activate_changes(): This hook is executed when one applies the pending configuration changes from wato. + But it is only excecuted when there is at least one function + registered for this host. + The registered hooks are called with a dictionary as parameter which - has the dirty hostnames as keys and the attributes of the hosts as values. + holds all available with the hostnames as keys and the attributes of + the hosts as values. """ - call_hooks("activate-changes", get_dirty_hosts()) + if hook_registered('activate-changes'): + call_hooks("activate-changes", collect_hosts(g_root_folder)) # +----------------------------------------------------------------------+ # | ____ _ _ | diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 5235b11..1e14102 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -33,9 +33,3 @@ declare_host_attribute(IPAddressAttribute("ipaddress", _("IP Address"), "hostname lookup. Enter a hostname to use dynamic resoluting " "during the actual monitoring."), mandatory=True, dnslookup=True), show_in_table=True, show_in_folder=True) - - -declare_host_attribute(EnumAttribute("dirty", _("Dirty"), - _("Modified since last "Active Changes"?"), - "No", [ ('no', _('No')), ('yes', _('Yes'))]), - show_in_table = False, show_in_folder = False, show_in_form = False)

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits