Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: #1438 FIX quicksearch: fixed various non-working quicksearch filters

by Andreas Boesl

Module: check_mk Branch: master Commit: 554e56aa8233c4d547eaff7b80fddaede60e7629 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554e56aa8233c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 14 12:02:54 2014 +0100 #1438 FIX quicksearch: fixed various non-working quicksearch filters Some of the view filters got renamed in the latest releases. These changes were not considered in the quicksearch plugins which refer to these filters. As a result the hostgroup (hg:) search did not work properly. Also the some multiple search filters (e.g. h: test s: cpu hg: testgroup) did omit the specified host- and servicegroup patterns. --- .werks/1438 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- web/plugins/sidebar/search.py | 16 ++++++++-------- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/1438 b/.werks/1438 new file mode 100644 index 0000000..090a7e5 --- /dev/null +++ b/.werks/1438 @@ -0,0 +1,15 @@ +Title: quicksearch: fixed various non-working quicksearch filters +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415962691 + +Some of the view filters got renamed in the latest releases. +These changes were not considered in the quicksearch plugins which refer to these filters. + +As a result the hostgroup (hg:) search did not work properly. +Also the some multiple search filters (e.g. h: test s: cpu hg: testgroup) did omit the +specified host- and servicegroup patterns. diff --git a/ChangeLog b/ChangeLog index eebd7e1..0fe476a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 1494 FIX: Fixed error in NagVis Maps snapin when some users had no contact groups assigned * 1496 FIX: Fixed exception after editing a dashboard as user without permission to publish dashboards... * 1436 FIX: quicksearch: search with multiple patterns (h: / s:) no longer discards the host pattern... + * 1438 FIX: quicksearch: fixed various non-working quicksearch filters... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 4f4e212..faf8b34 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -783,7 +783,7 @@ def search_url_tmpl(used_filters, row, exact = True): if ty == 'hosts': return 'view.py?view_name=searchhost&host_regex=%(name)s&filled_in=filter' elif ty == 'hostgroups': - return 'view.py?view_name=hostgroups&hostgroup_name=%(name)s&site=%(site)s' + return 'view.py?view_name=hostgroups&hostgroup_regex=%(name)s&site=%(site)s' elif ty == 'servicegroups': return 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' elif ty == 'services': diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 9b7aae8..7494ab6 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -211,17 +211,17 @@ def search_host_service_filter(filters, host_is_ip = False): def match_host_service_url_tmpl(used_filters, row_dict, host_is_ip = False): tmpl = 'view.py?view_name=searchsvc&filled_in=filter' - # Sorry, no support for multiple host- or servicegroups filters in match templates + # Sorry, no support for multiple host- or servicegroups filters in match templates (yet) for ty, entry in [ ("hostgroup", "host_groups"), ("servicegroup", "service_groups")]: if row_dict.get(entry): if type(row_dict[entry]) == list: row_dict[entry] = row_dict[entry][0] - for param, key in [ ("service_regex", "service_description"), - (host_is_ip and "host_address" or "host", "host_name"), - ("opthostgroup", "host_groups"), - ("optservicegroup", "service_groups"), - ("site", "site")]: + for param, key in [ ("service_regex", "service_description"), + (host_is_ip and "host_address" or "host_regex", "host_name"), + ("opthost_group", "host_groups"), + ("optservice_group", "service_groups"), + ("site", "site")]: if row_dict.get(key): tmpl_pre = "&%s=%%(%s)s" % (param, key) tmpl += tmpl_pre % row_dict @@ -245,8 +245,8 @@ def search_host_service_url_tmpl(used_filters, data, host_is_ip = False): for url_param, qs_name in [ ("service_regex", "services" ), host_is_ip and ("host_address", "host" )\ or ("host_regex", "hosts" ), - ("opthostgroup", "hostgroups" ), - ("optservicegroup", "servicegroups")]: + ("opthost_group", "hostgroups" ), + ("optservice_group", "servicegroups")]: if filters_combined.get(qs_name): tmpl_pre = "&%s=%%(%s)s" % (url_param, qs_name) tmpl += tmpl_pre % filters_combined

9 years, 7 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Goetz Golla

Module: check_mk Branch: master Commit: 8747e43aa8e2706cdda060b706c4a8ccabc7b006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8747e43aa8e270… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:54:39 2014 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1e51a82..7f8dea7 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2232 +2252

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #1016, #1015

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b433023b7a23e64a759c21bf29d7f9784c6b6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b433023b7a23e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 17:44:36 2014 +0100 Updated bug entries #1016, #1015 --- .bugs/1015 | 17 +++++++++++++---- .bugs/1016 | 16 +++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.bugs/1015 b/.bugs/1015 index 7534a2c..76b0a83 100644 --- a/.bugs/1015 +++ b/.bugs/1015 @@ -1,9 +1,18 @@ -Title: HW/SW Inventory Check should not be applied to clusters +Title: HW/SW-Inventory Check should not be applied to clusters Component: inv State: open Date: 2014-11-13 17:11:09 Targetversion: future -Class: bug +Class: nastiness -When HW/SW Inventory is set to be applied to a group of hosts, clusters should be automatically excluded -since it does not make sense to include themn in the inventory +When HW/SW-Inventory is set to be applied to a group of hosts, +clusters should be automatically excluded +since it does not make sense to include them in the inventory. + +Problem: it is not clear of how to implement this. Check_MK rules +always apply to all hosts. Inventory is just one active check - +like many others. We would need a general enhancement for all +rules. Or we might restrict all active checks to physical +nodes. It could be helpful, however, to place something +like HTTP checks to cluster nodes that have IP-addresses, +though. diff --git a/.bugs/1016 b/.bugs/1016 index d28f5fc..4903548 100644 --- a/.bugs/1016 +++ b/.bugs/1016 @@ -3,9 +3,15 @@ Component: inv State: open Date: 2014-11-13 17:20:46 Targetversion: future -Class: nastiness +Class: cleanup -the inventory data stored in var/check_mk/inventory are stored in a regular text file as well as a gzipped version -for the file. This is redundant, and also may lead to problems when a hostname itself contains the postfix ".gz". -It also makes using scripts on the stored data inconvenient. -Data should be stored either in gzip format, or in text files, not both +the inventory data stored in var/check_mk/inventory are stored in a regular +text file as well as a gzipped version for the file. This is redundant, and +also may lead to problems when a hostname itself contains the postfix ".gz". +It also makes using scripts on the stored data inconvenient. Data should +be stored either in gzip format, or in text files, not both. + +On the other hand we need the gzipped file for fast replication. And we +need the unpacked files for fast access by the local Web-GUI. + +A solution could be to use two different directories.

9 years, 7 months

Check_MK Git: check_mk: Minor cleanup of code documentation

by Mathias Kettner

Module: check_mk Branch: master Commit: 12b44c36ce718e793ab999f366d4de2bc2fcbc27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12b44c36ce718e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 17:35:42 2014 +0100 Minor cleanup of code documentation --- web/htdocs/wato.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e2db49..5d4ca8e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17160,7 +17160,8 @@ def link_to_host(hostname): [("mode", "edithost"), ("host", hostname)]) -# .--API HELPERS---------------------------------------------------------. +#. +# .--API Helpers---------------------------------------------------------. # | _ ____ ___ _ _ _____ _ ____ _____ ____ ____ | # | / \ | _ \_ _| | | | | ____| | | _ \| ____| _ \/ ___| | # | / _ \ | |_) | | | |_| | _| | | | |_) | _| | |_) \___ \ | @@ -17308,6 +17309,7 @@ def delete_host(host): call_hook_hosts_changed(folder) +#. # .--WEB API-------------------------------------------------------------. # | __ _______ ____ _ ____ ___ | # | \ \ / / ____| __ ) / \ | _ \_ _| |

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #1016

by Goetz Golla

Module: check_mk Branch: master Commit: 5750c3855869722b9f6015a9a4bdce06e8745cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5750c385586972… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:33:32 2014 +0100 Updated bug entries #1016 --- .bugs/1016 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1016 b/.bugs/1016 new file mode 100644 index 0000000..d28f5fc --- /dev/null +++ b/.bugs/1016 @@ -0,0 +1,11 @@ +Title: inventory data are stored in both a regular file and a gzipped file +Component: inv +State: open +Date: 2014-11-13 17:20:46 +Targetversion: future +Class: nastiness + +the inventory data stored in var/check_mk/inventory are stored in a regular text file as well as a gzipped version +for the file. This is redundant, and also may lead to problems when a hostname itself contains the postfix ".gz". +It also makes using scripts on the stored data inconvenient. +Data should be stored either in gzip format, or in text files, not both

9 years, 7 months

Check_MK Git: check_mk: extract_inventory.py: adapt script to the presence of extra files in var/check_mk/inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 28ffbdf09df2afdce4b1e32f7967dfd98ca65c80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ffbdf09df2af… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:31:17 2014 +0100 extract_inventory.py: adapt script to the presence of extra files in var/check_mk/inventory --- doc/treasures/inventory/extract_inventory.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/treasures/inventory/extract_inventory.py b/doc/treasures/inventory/extract_inventory.py index 9b53aae..5055f4a 100755 --- a/doc/treasures/inventory/extract_inventory.py +++ b/doc/treasures/inventory/extract_inventory.py @@ -224,6 +224,9 @@ def list_get(hostname, list_start): all_data = {} inventory_date = {} for hostname in os.listdir(inv_dir): + # ignore gziped files and invisible files in directory for now + if hostname.endswith(".gz") or hostname.startswith("."): + continue fn = inv_dir + hostname if os.path.isfile(fn): a = eval(open(fn,'r').read())

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #1015

by Goetz Golla

Module: check_mk Branch: master Commit: fc7b3887188940311c7b29e6b18d6a738d72dd0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7b3887188940… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:13:51 2014 +0100 Updated bug entries #1015 --- .bugs/1015 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1015 b/.bugs/1015 new file mode 100644 index 0000000..7534a2c --- /dev/null +++ b/.bugs/1015 @@ -0,0 +1,9 @@ +Title: HW/SW Inventory Check should not be applied to clusters +Component: inv +State: open +Date: 2014-11-13 17:11:09 +Targetversion: future +Class: bug + +When HW/SW Inventory is set to be applied to a group of hosts, clusters should be automatically excluded +since it does not make sense to include themn in the inventory

9 years, 7 months

Check_MK Git: check_mk: Fix searching in WATO tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 9cbd75e080f29a9702f25d7b0d985a3db6862cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cbd75e080f29a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 16:01:30 2014 +0100 Fix searching in WATO tables --- web/htdocs/table.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index b55ffc7..c0fbdb4 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -307,8 +307,9 @@ def end(): if not html.in_form(): html.begin_form("%s_actions" % table_id) - html.hidden_fields() - html.end_form() + + html.hidden_fields() + html.end_form() html.write('</tr>') odd = "even"

9 years, 7 months

Check_MK Git: check_mk: #1437 FIX veeam_jobs: fixed incorrect state for BackupSync job

by Andreas Boesl

Module: check_mk Branch: master Commit: be5f253448ef6fdad7db334798323a5a5f2b9b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5f253448ef6f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 13 15:20:54 2014 +0100 #1437 FIX veeam_jobs: fixed incorrect state for BackupSync job The check now reports an OK state when type is <tt>BackupSync</tt> and the current state is <tt>Idle</tt>. Previously it checked the backup status for <tt>Idle</tt> --- .werks/1437 | 11 +++++++++++ ChangeLog | 1 + checks/veeam_jobs | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1437 b/.werks/1437 new file mode 100644 index 0000000..dbf1f74 --- /dev/null +++ b/.werks/1437 @@ -0,0 +1,11 @@ +Title: veeam_jobs: fixed incorrect state for BackupSync job +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415886692 + +The check now reports an OK state when type is <tt>BackupSync</tt> and the current state is <tt>Idle</tt>. +Previously it checked the backup status for <tt>Idle</tt> diff --git a/ChangeLog b/ChangeLog index 9e22544..9de321b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 1446 FIX: cisco_temp_perf: Check now finds missing sensors in case where also cisco_temp_sensor is being used.... * 1203 FIX: veeam_client: Now supports multiple Backups for one host... NOTE: Please refer to the migration notes! + * 1437 FIX: veeam_jobs: fixed incorrect state for BackupSync job... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 50ebc3b..9418253 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -48,7 +48,7 @@ def check_veeam_jobs(item, _no_params, info): if backup_status == "Success": state = 0 - elif backup_status == 'Idle' and backup_type == "BackupSync": + elif backup_current == 'Idle' and backup_type == "BackupSync": # A sync job is always idle state = 0 elif backup_current == "Working":

9 years, 7 months

Check_MK Git: check_mk: #1511 FIX oracle_jobs: avoid broken checks, make compatible with old version

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f218818139e6e1deeb8a0cc9fed4955105c4be9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f218818139e6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 15:18:48 2014 +0100 #1511 FIX oracle_jobs: avoid broken checks, make compatible with old version After the introduction of the necessary job owner, previous checks would fail until reinventorized. This has been fixed. The check is now compatible with old checks where the job owner is not yet contained in the item. --- .werks/1511 | 13 +++++++++++++ ChangeLog | 1 + checks/oracle_jobs | 14 +++++++------- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/1511 b/.werks/1511 new file mode 100644 index 0000000..b225d21 --- /dev/null +++ b/.werks/1511 @@ -0,0 +1,13 @@ +Title: oracle_jobs: avoid broken checks, make compatible with old version +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415888257 + +After the introduction of the necessary job owner, previous checks would fail +until reinventorized. This has been fixed. The check is now compatible with +old checks where the job owner is not yet contained in the item. + diff --git a/ChangeLog b/ChangeLog index 9e22544..2165c9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 1446 FIX: cisco_temp_perf: Check now finds missing sensors in case where also cisco_temp_sensor is being used.... * 1203 FIX: veeam_client: Now supports multiple Backups for one host... NOTE: Please refer to the migration notes! + * 1511 FIX: oracle_jobs: avoid broken checks, make compatible with old version... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/oracle_jobs b/checks/oracle_jobs index cf5eb0d..c285bfb 100644 --- a/checks/oracle_jobs +++ b/checks/oracle_jobs @@ -45,21 +45,21 @@ def inventory_oracle_jobs(info): return [ ( ("%s.%s.%s" % (line[0], line[1], line[2])), {} ) for line in info ] def check_oracle_jobs(item, params, info): - try: - if item.count('.') == 2: - sid, job_owner, job_name = item.split('.') - except ValueError: - return (3, 'Invalid check item given (<SID>.<job_owner>.<job_name> expected)') + if item.count('.') == 2: + sid, job_owner, job_name = item.split('.') + else: + # old format without job owner. Simply ignore owner. + sid, job_name = item.split('.') + job_owner = None data_found = False for line in info: - service_found = False if line[0] == sid: data_found = True - if (line[0] == sid and line[1] == job_owner and line[2] == job_name): + if line[0] == sid and (line[1] == job_owner or job_owner == None) and line[2] == job_name: service_found = True param_disabled = params["disabled"]

9 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014