Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 5bbc984bdc1c527191822635cb8b4fa0022ab504 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bbc984bdc1c52… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 14 09:44:20 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Minor cleanup in clustered_services implementation

by Mathias Kettner

Module: check_mk Branch: master Commit: 3622313a4f7f8f3e8a31c557b9c5a8cd6001fbf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3622313a4f7f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 17:32:34 2013 +0200 Minor cleanup in clustered_services implementation --- modules/check_mk.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1d034c3..727ef74 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -963,15 +963,9 @@ def get_check_table(hostname): # Now add checks a cluster might receive from its nodes if is_cluster(hostname): for node in nodes_of(hostname): - node_checks = g_singlehost_checks.get(node) or [] - for entry in node_checks: - if len(entry) == 4: - hostlist, checkname, item, params = entry - tags = [] - elif len(entry) == 5: - tags, hostlist, checkname, item, params = entry + node_checks = g_singlehost_checks.get(node, []) + for nodename, checkname, item, params in node_checks: descr = service_description(checkname, item) - # TODO: single / multihost - crasht auf jeden fall if hostname == host_of_clustered_service(node, descr): handle_entry(((hostname,) + entry[1:]))

11 years, 3 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: c64e134b582aaf808f6e4d035e80371571204bf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c64e134b582aaf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 16:12:16 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Added PNP template for host check via TCP

by Mathias Kettner

Module: check_mk Branch: master Commit: e223ab4f75243795ab64e4432d7a80896be80671 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e223ab4f752437… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 16:12:15 2013 +0200 Added PNP template for host check via TCP --- pnp-templates/check-mk-host-tcp.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pnp-templates/check-mk-host-tcp.php b/pnp-templates/check-mk-host-tcp.php new file mode 120000 index 0000000..cc710c7 --- /dev/null +++ b/pnp-templates/check-mk-host-tcp.php @@ -0,0 +1 @@ +check_mk_active-tcp.php \ No newline at end of file

11 years, 3 months

Check_MK Git: check_mk: set ignored/ clustered services without reinventorize

by Andreas Boesl

Module: check_mk Branch: master Commit: 12af605c008467cb4dc154284b5680cc3ad7f720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12af605c008467… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 13 16:04:48 2013 +0200 set ignored/clustered services without reinventorize --- ChangeLog | 3 +++ modules/automation.py | 42 +++++++++++++++++++++++++++++------------- modules/check_mk.py | 26 +++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61a1d66..73ab12a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths * mk_logwatch: fixed bug when rewriting logwatch messages + * check_mk: Re-inventory is no longer required when a service is ignored via rule + * check_mk: Now possible to assign services to clusters without the need to + reinventorize WATO: * Allow to configure check-/retry_interval in second precision diff --git a/modules/automation.py b/modules/automation.py index 344070c..7f390f8 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -348,23 +348,39 @@ def automation_try_inventory_node(hostname): def automation_set_autochecks(args): hostname = args[0] new_items = eval(sys.stdin.read()) - do_cleanup_autochecks() - existing = automation_parse_autochecks_file(hostname) - # write new autochecks file, but take paramstrings from existing ones - # for those checks which are kept - new_autochecks = [] - for ct, item, params, paramstring in existing: - if (ct, item) in new_items: + # A Cluster does not have an autochecks file + # All of its services are located in the nodes instead + # So we cycle through all nodes remove all clustered service + # and add the ones we've got from stdin + if is_cluster(hostname): + for node in nodes_of(hostname): + new_autochecks = [] + existing = automation_parse_autochecks_file(node) + for ct, item, params, paramstring in existing: + descr = service_description(ct, item) + if node == host_of_clustered_service(node, descr): + new_autochecks.append((ct, item, paramstring)) + for (ct, item), paramstring in new_items.items(): + new_autochecks.append((ct, item, paramstring)) + # write new autochecks file for that host + automation_write_autochecks_file(node, new_autochecks) + else: + existing = automation_parse_autochecks_file(hostname) + # write new autochecks file, but take paramstrings from existing ones + # for those checks which are kept + new_autochecks = [] + for ct, item, params, paramstring in existing: + if (ct, item) in new_items: + new_autochecks.append((ct, item, paramstring)) + del new_items[(ct, item)] + + for (ct, item), paramstring in new_items.items(): new_autochecks.append((ct, item, paramstring)) - del new_items[(ct, item)] - - for (ct, item), paramstring in new_items.items(): - new_autochecks.append((ct, item, paramstring)) - # write new autochecks file for that host - automation_write_autochecks_file(hostname, new_autochecks) + # write new autochecks file for that host + automation_write_autochecks_file(hostname, new_autochecks) def automation_get_autochecks(args): diff --git a/modules/check_mk.py b/modules/check_mk.py index adfe554..1d034c3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -945,6 +945,10 @@ def get_check_table(hostname): if hosttags_match_taglist(tags_of_host(hostname), tags) and \ in_extraconf_hostlist(hostlist, hostname): descr = service_description(checkname, item) + if service_ignored(hostname, checkname, descr): + return + if hostname != host_of_clustered_service(hostname, descr): + return deps = service_deps(hostname, descr) check_table[(checkname, item)] = (params, descr, deps) @@ -956,6 +960,22 @@ def get_check_table(hostname): for entry in g_multihost_checks: handle_entry(entry) + # Now add checks a cluster might receive from its nodes + if is_cluster(hostname): + for node in nodes_of(hostname): + node_checks = g_singlehost_checks.get(node) or [] + for entry in node_checks: + if len(entry) == 4: + hostlist, checkname, item, params = entry + tags = [] + elif len(entry) == 5: + tags, hostlist, checkname, item, params = entry + descr = service_description(checkname, item) + # TODO: single / multihost - crasht auf jeden fall + if hostname == host_of_clustered_service(node, descr): + handle_entry(((hostname,) + entry[1:])) + + # Remove dependencies to non-existing services all_descr = set([ descr for ((checkname, item), (params, descr, deps)) in check_table.items() ]) for (checkname, item), (params, descr, deps) in check_table.items(): @@ -2488,14 +2508,14 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals else: continue # user does not want this item to be checked - newcheck = ' ("%s", "%s", %r, %s),' % (hn, checkname, item, paramstring) + newcheck = ' ("%s", "%s", %r, %s),' % (hostname, checkname, item, paramstring) newcheck += "\n" if newcheck not in newchecks: # avoid duplicates if inventory outputs item twice newchecks.append(newcheck) if include_state: - newitems.append( (hn, checkname, item, paramstring, state_type) ) + newitems.append( (hostname, checkname, item, paramstring, state_type) ) else: - newitems.append( (hn, checkname, item) ) + newitems.append( (hostname, checkname, item) ) count_new += 1

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0893

by Mathias Kettner

Module: check_mk Branch: master Commit: 49839ba9d9f6c8170e46ba5b670ddb6ae109d80d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49839ba9d9f6c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 12:06:34 2013 +0200 Updated bug entries #0893 --- .bugs/893 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.bugs/893 b/.bugs/893 new file mode 100644 index 0000000..d19bebf --- /dev/null +++ b/.bugs/893 @@ -0,0 +1,15 @@ +Title: Disable view-reload in after-command-situation +Component: multisite +State: open +Date: 2013-06-13 12:05:04 +Targetversion: 1.2.3 +Class: nastiness + +If you issue a command on an object you come to a page +with a blue message and a link back to the view. + +Within that view the reload of the view is still active. +If the reload happens the view data appears, but shouldn't +The command button is still disabled. + +Disable view reload here.

11 years, 3 months

Check_MK Git: check_mk: Fix parameterhandling in winperf

by Mathias Kettner

Module: check_mk Branch: master Commit: 851ea30970c66018dd16483a46983e7d8609beae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=851ea30970c660… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 12:00:15 2013 +0200 Fix parameterhandling in winperf --- checks/winperf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/checks/winperf b/checks/winperf index 3e397ff..db11ebe 100644 --- a/checks/winperf +++ b/checks/winperf @@ -40,6 +40,13 @@ def check_win_cpuusage(item, params, info): # get parameters. Be nice to older installations that still use 'None' # as parameters if params == None: + params = winperf_cpu_default_levels # for legacy reasons + elif type(params) == tuple: + warn, crit = params + else: + warn, crit = params['levels'] + + if params == None: params = winperf_cpu_default_levels warn, crit = params

11 years, 3 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: 658518f2cf9d526202d1d345ba9b73de046b984b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=658518f2cf9d52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 12:00:54 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: fixed exception on MKGeneralException

by Andreas Boesl

Module: check_mk Branch: master Commit: ff521803459a43409229e086b8aff7d42a6cf62f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff521803459a43… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 13 11:43:26 2013 +0200 fixed exception on MKGeneralException --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index bf37b74..adfe554 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -940,7 +940,7 @@ def get_check_table(hostname): elif type(hostlist[0]) == str: hostlist = strip_tags(hostlist) elif hostlist != []: - raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname or list of hostnames" % hostinfolist) + raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname or list of hostnames" % hostlist) if hosttags_match_taglist(tags_of_host(hostname), tags) and \ in_extraconf_hostlist(hostlist, hostname):

11 years, 3 months

Check_MK Git: check_mk: fix: prevent that legacy checks receive params

by Andreas Boesl

Module: check_mk Branch: master Commit: ce34509f1b9db02367ab7c60068288031fbbf209 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce34509f1b9db0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 13 11:32:10 2013 +0200 fix: prevent that legacy checks receive params --- modules/automation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/automation.py b/modules/automation.py index 73f31bd..344070c 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -253,6 +253,7 @@ def automation_try_inventory_node(hostname): # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): + params = None if state_type not in [ 'legacy', 'active' ]: # apply check_parameters try:

11 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013