Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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: d21c1b3fabc4880997e0810ab77c28b3cd625384 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d21c1b3fabc488… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:36:01 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: New config variable distributed_wato_site

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10a01921e4010e1eedbdde2aa10bd24d21095249 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a01921e4010e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 15 10:35:58 2011 +0100 New config variable distributed_wato_site This variable is intended for internal use by WATO --- modules/check_mk.py | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 4d8c9d5..cd8b14e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -296,6 +296,7 @@ summary_host_notification_periods = [] summary_service_notification_periods = [] ipaddresses = {} # mapping from hostname to ipaddress only_hosts = None +distributed_wato_site = None # used by distributed WATO extra_host_conf = {} extra_summary_host_conf = {} extra_service_conf = {} @@ -1075,18 +1076,29 @@ def output_conf_header(outfile): """) def all_active_hosts(): - if only_hosts == None: - return strip_tags(all_hosts) - else: - return [ hostname for hostname in strip_tags(all_hosts) \ - if in_binary_hostlist(hostname, only_hosts) ] + return filter_active_hosts(all_hosts) def all_active_clusters(): - if only_hosts == None: - return strip_tags(clusters.keys()) - else: - return [ hostname for hostname in strip_tags(clusters.keys()) \ + return filter_active_hosts(clusters.keys()) + +def filter_active_hosts(hostlist): + if only_hosts == None and distributed_wato_site == None: + return strip_tags(hostlist) + elif only_hosts == None: + site_tag = "site:" + distributed_wato_site + return [ hostname for hostname in strip_tags(hostlist) + if site_tag in tags_of_host(hostname) ] + elif distributed_wato_site == None: + return [ hostname for hostname in strip_tags(hostlist) if in_binary_hostlist(hostname, only_hosts) ] + else: + site_tag = "site:" + distributed_wato_site + return [ hostname for hostname in strip_tags(hostlist) + if in_binary_hostlist(hostname, only_hosts) + and site_tag in tags_of_host(hostname) ] + + + def hostgroups_of(hostname): return host_extra_conf(hostname, host_groups)

12 years, 9 months

Check_MK Git: check_mk: Fix: Javascript error in Wato

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9870338eb0c56fad612d3a81f232fdf31f9109b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9870338eb0c56f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 15 10:02:33 2011 +0100 Fix: Javascript error in Wato --- web/htdocs/js/wato.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index de7e593..a450e74 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -135,7 +135,7 @@ function wato_fix_visibility() { delete hide_topics[index]; } } - for each (var item in volatile_topics){ + for (var item in volatile_topics){ var oTr = document.getElementById("topic_" + item); if(oTr) { if(hide_topics.indexOf(item) > -1 )

12 years, 9 months

Check_MK Git: check_mk: WATO: Fixed not displayed host-tag changes during bulk cleanup

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84f5276f349e356526a3aa975350a77a67d71df5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f5276f349e35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 10:31:22 2011 +0100 WATO: Fixed not displayed host-tag changes during bulk cleanup --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a5bda50..4ec0338 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2268,6 +2268,7 @@ def mode_bulk_cleanup(phase): num_cleaned, hostname)) mark_affected_sites_dirty(g_folder, hostname) save_hosts(g_folder) + reload_hosts() # indirect host tag changes return "folder" return

12 years, 9 months

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: 7de9cd65e6dafb521d81a4c017e565e8bb6d0a1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7de9cd65e6dafb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 14 18:44:48 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: lnx_if: add missing old config variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8165b114bf4114851e8d532d9402de06ca0f889f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8165b114bf4114… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:28:32 2011 +0100 lnx_if: add missing old config variable --- checks/if.include | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/checks/if.include b/checks/if.include index 87605f2..17a6209 100644 --- a/checks/if.include +++ b/checks/if.include @@ -37,6 +37,10 @@ factory_settings["if_default_levels"] = { "errors" : (0.01, 0.1), } +# Obsolete variable, but needed as contained in autochecks of +# older checks. We need to keep this up for a few years... +if_default_error_levels = if_default_levels["errors"] + if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices def if64_disabled(hostname):

12 years, 9 months

Check_MK Git: check_mk: lnx_if: add further missing old config variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a05eb87703c732754278a246c7b723e45b2ee10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a05eb87703c73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:30:33 2011 +0100 lnx_if: add further missing old config variable --- checks/if.include | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/if.include b/checks/if.include index 17a6209..794f3c9 100644 --- a/checks/if.include +++ b/checks/if.include @@ -39,7 +39,9 @@ factory_settings["if_default_levels"] = { # Obsolete variable, but needed as contained in autochecks of # older checks. We need to keep this up for a few years... -if_default_error_levels = if_default_levels["errors"] +if_default_error_levels = factory_settings["if_default_levels"]["errors"] +if_default_traffic_levels = None +if_default_average = None if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices

12 years, 9 months

Check_MK Git: check_mk: Further fix of the fix to lnx_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c088ed1cea1adf0494952a801283935753bda979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c088ed1cea1adf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:34:39 2011 +0100 Further fix of the fix to lnx_if --- checks/if.include | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/if.include b/checks/if.include index 794f3c9..230530a 100644 --- a/checks/if.include +++ b/checks/if.include @@ -40,7 +40,7 @@ factory_settings["if_default_levels"] = { # Obsolete variable, but needed as contained in autochecks of # older checks. We need to keep this up for a few years... if_default_error_levels = factory_settings["if_default_levels"]["errors"] -if_default_traffic_levels = None +if_default_traffic_levels = None, None if_default_average = None if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices

12 years, 9 months

Check_MK Git: check_mk: heartbeat_crm: apply patches from Václav Ovsík

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 696d82677d2b74570091e0d8ba26f8d4f58915f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696d82677d2b74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:47:46 2011 +0100 heartbeat_crm: apply patches from Václav Ovsík --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 4 ++-- checks/heartbeat_crm | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ceda8f6..2db796d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,8 @@ * logwatch: allow to classify messages based on their count (see man page of logwatch for details) * fileinfo: new check for monitoring age and size of files + * heartbeat_crm: apply patches from Václav Ovsík, so that the check + should work on Debian now. 1.1.12p5: Multisite: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9e0b9bc..bcdf02e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -330,9 +330,9 @@ fi if which cl_status > /dev/null 2>&1; then # Different handling for heartbeat clusters with and without CRM # for the resource state - if [ -S /var/run/heartbeat/crm/cib_ro ]; then + if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then echo '<<<heartbeat_crm>>>' - crm_mon -1 -r | grep -v ^$ | sed 's/^\s/_/g' + crm_mon -1 -r | grep -v ^$ | sed '/^\sResource Group:/,$ s/^\s//; s/^\s/_/g' else echo '<<<heartbeat_rscstatus>>>' cl_status rscstatus diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 2f7b8f4..0c5444b 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -64,7 +64,7 @@ def heartbeat_crm_parse_general(info, dc = '', numNodes = -1, numResources = -1) lastUpdated = ' '.join(line[2:]) elif dc == '' and ' '.join(line[0:2]) == 'Current DC:' and heartbeat_crm_naildown: dc = line[2] - elif numNodes == -1 and ' '.join(line[1:3]) == 'Nodes configured.': + elif numNodes == -1 and ' '.join(line[1:3])[:-1] == 'Nodes configured': numNodes = int(line[0]) elif numResources == -1 and ' '.join(line[1:3]) == 'Resources configured.': numResources = int(line[0])

12 years, 9 months

Check_MK Git: check_mk: Removed debug output from lnx_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1be2dcd180c084077eac2cfbcc993d2df64a2a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1be2dcd180c084… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:25:35 2011 +0100 Removed debug output from lnx_if --- checks/lnx_if | 2 -- modules/check_mk_base.py | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index 642a376..b75b062 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -69,7 +69,6 @@ def if_lnx_convert_to_if64(info): if_table = [] for nic, attr in nic_info.items(): - import pprint ; pprint.pprint(attr) counters = attr.get("counters", [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) ifIndex = attr["index"] @@ -138,7 +137,6 @@ def if_lnx_convert_to_if64(info): return if_table def inventory_lnx_if(info): - import pprint ; pprint.pprint(info) if linux_nic_check == "legacy": return [] return inventory_if_common(if_lnx_convert_to_if64(info)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 01d6cca..3d1feac 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -729,6 +729,7 @@ def check_unimplemented(checkname, params, info): # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios def do_all_checks_on_host(hostname, ipaddress): + import time ; time.sleep(5) global g_aggregated_service_results g_aggregated_service_results = {} global g_hostname

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits