Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64592 discussions

Check_MK Git: check_mk: Added simple php agent wrapper to treasures

by Bastian Kuhn

Module: check_mk Branch: master Commit: fa299dda2b693d43f5d96b76c08727afeb48100a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa299dda2b693d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 29 13:28:05 2014 +0100 Added simple php agent wrapper to treasures --- doc/treasures/agent_wrapper.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/treasures/agent_wrapper.php b/doc/treasures/agent_wrapper.php new file mode 100644 index 0000000..7c214d3 --- /dev/null +++ b/doc/treasures/agent_wrapper.php @@ -0,0 +1,7 @@ +<?php + # This is a simple wrapper who call's the check_mk_agent, + # to use with curl as datasource program + # May consider using sudo here. + system("/usr/bin/check_mk_agent") + +?>

10 years, 8 months

Check_MK Git: check_mk: Parameters page is now also available for services

by Mathias Kettner

Module: check_mk Branch: master Commit: 26a789039226affb3459d77b4dc75f5ae5f3a617 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26a789039226af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 28 17:43:08 2014 +0100 Parameters page is now also available for services --- .werks/687 | 19 +- ChangeLog | 2 +- modules/automation.py | 112 ++++++++ web/htdocs/wato.py | 380 ++++++++++++++++++---------- web/plugins/wato/check_mk_configuration.py | 3 +- web/plugins/wato/check_parameters.py | 6 +- 6 files changed, 381 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26a7890392…

10 years, 8 months

Check_MK Git: check_mk: New summary page with all settings of a host

by Mathias Kettner

Module: check_mk Branch: master Commit: ce35777dfa7ea89a899f84269991dedf8b1b06e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce35777dfa7ea8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 28 12:40:33 2014 +0100 New summary page with all settings of a host In WATO there is now a new summary page for each host, called Settings host host.... In this page you can see all of the host's settings that are determined by rules (via Host & Service Parameters). You will only see the current setting of each paramter, but also whether it is determined by one or more matching rules or whether it is the factory default value. A click brings you directly to the according rule set or even rule. This all makes it much simpler to get an overview over all effective settings of a host and also gives you a fast access to each setting. --- .werks/687 | 15 ++ ChangeLog | 1 + web/htdocs/check_mk.css | 2 + web/htdocs/forms.py | 4 +- web/htdocs/images/rule_no_off.png | Bin 0 -> 3133 bytes web/htdocs/images/rule_yes_off.png | Bin 0 -> 1905 bytes web/htdocs/valuespec.py | 7 +- web/htdocs/wato.css | 51 ++++ web/htdocs/wato.py | 348 ++++++++++++++++++++++------ web/plugins/wato/check_mk_configuration.py | 18 +- web/plugins/wato/datasource_programs.py | 8 +- 11 files changed, 371 insertions(+), 83 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ce35777dfa…

10 years, 8 months

Check_MK Git: check_mk: Updated checkbox text in EC global setting

by Mathias Kettner

Module: check_mk Branch: master Commit: a2121a3792dfc33ce67657d15c533eabfd8a057f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2121a3792dfc3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 28 08:49:08 2014 +0100 Updated checkbox text in EC global setting --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 74ec05c..5250f5b 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1773,7 +1773,7 @@ if mkeventd_enabled: register_configvar(_("Configuration GUI (WATO)"), "mkeventd_pprint_rules", - Checkbox(title = _("Pretty-Print rules in configuration file"), + Checkbox(title = _("Pretty-Print rules in config file of Event Console"), label = _("enable pretty-printing of rules"), help = _("When the WATO module of the Event Console saves rules to the file " "<tt>mkeventd.d/wato/rules.mk</tt> it usually prints the Python "

10 years, 8 months

Check_MK Git: check_mk: FIX Multisite host tag filter: Now uses exact match

by Andreas Boesl

Module: check_mk Branch: master Commit: eee91d2ba5718aee869bef24cfaee51563b11a0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eee91d2ba5718a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 27 19:26:20 2014 +0100 FIX Multisite host tag filter: Now uses exact match --- .werks/270 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/filters.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/270 b/.werks/270 new file mode 100644 index 0000000..12dafee --- /dev/null +++ b/.werks/270 @@ -0,0 +1,10 @@ +Title: Multisite host tag filter: Now uses exact match +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390847004 + +Filtering for host tags could lead to wrong results, because the livestatus filter did not look for an exact match. +If the filter was set to <tt>lan</tt>, hosts with <tt>wlan</tt> or <tt>bland</tt> were also found. diff --git a/ChangeLog b/ChangeLog index 47c4cd9..44b53de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -185,6 +185,7 @@ * 0122 FIX: Multisite view editor not longer throwing a exception when loading views from other users * 0569 FIX: recurring updates of serial numbers of disabled ldap users fixed... * 0676 FIX: Move view "Stale services" to Problems folder + * 0270 FIX: Multisite host tag filter: Now uses exact match... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 5e00808..e3a839d 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -817,7 +817,7 @@ class FilterHostTags(Filter): if op and val: operator = op != 'is' and '!~' or '~' - headers.append('Filter: host_custom_variables %s TAGS %s' % (operator, val)) + headers.append('Filter: host_custom_variables %s TAGS (^|[ ])%s($|[ ])' % (operator, val)) if headers: return '\n'.join(headers) + '\n'

10 years, 8 months

Check_MK Git: check_mk: fileinfo.groups: new feature to include current date in file pattern

by Götz Golla

Module: check_mk Branch: master Commit: 98aa29bad7b8cbd17ea86275ac0fc96f68ac8fbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98aa29bad7b8cb… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 27 17:55:12 2014 +0100 fileinfo.groups: new feature to include current date in file pattern --- .werks/576 | 8 ++++++++ ChangeLog | 1 + checkman/fileinfo.groups | 26 ++++++++++++++++---------- checks/fileinfo | 17 ++++++++++++++--- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.werks/576 b/.werks/576 new file mode 100644 index 0000000..dd07b64 --- /dev/null +++ b/.werks/576 @@ -0,0 +1,8 @@ +Title: fileinfo.groups: new feature to include current date in file pattern +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1390841625 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1838d2e..7ecc087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 0265 mpre_include: run additional mrpe configs within user context... * 0266 windows_agent: now supports mrpe include files... * 0574 if64: check now supports clustering... + * 0576 fileinfo.groups: new feature to include current date in file pattern * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/fileinfo.groups b/checkman/fileinfo.groups index 04d3b03..50d1b96 100644 --- a/checkman/fileinfo.groups +++ b/checkman/fileinfo.groups @@ -13,31 +13,37 @@ description: know the information about which files need to be sent. Please refer to fileinfos manpage for information about setting up the agent. - The check also needs a configured file grouping pattern. File grouping - patterns combine a simple pattern based on {*} and {?} to join a subset - of the file names send by the agent into a file group. In addition an - {exclude} pattern may be define to exclude certain filenames. - The name of the file group is referenced in the check configuration - as the item. + The check also needs a configured file grouping pattern. The name of the + file group is referenced in the check configuration as the item. + + File grouping patterns combine a simple pattern based on {*} and {?} to + join a subset of the file names send by the agent into a file group. In + addition an {exclude} pattern may be defined to exclude certain filenames. + + Furthermore, the current time/date in a configurable format may be + included in the pattern. The syntax is as follows: {$DATE:format-spec$}, + where {format-spec} is a list of time format directives of the unix date + command. Example: {$DATE:%Y%m%d$} is todays date, e.g. 20140127. A pattern + of {/var/tmp/backups/$DATE:%Y%m%d$.txt} would search for .txt files with + todays date as name in the directory /var/tmp/backups. item: Configured name of the file group examples: - -# old syntax of file group patterns, still valid + # old syntax of file group patterns, still valid fileinfo_groups = [ ([("Auth_group",r"/var/log/auth*")], ALL_HOSTS), ([("Message_group", r"/var/log/messages*")], ['test2'], ALL_HOSTS), ] -# new syntax of file group patterns, including exclude pattern + # new syntax of file group patterns, including exclude pattern fileinfo_groups = [ ([("Auth_group", ("/var/log/auth*","/var/log/*.debug"))], ALL_HOSTS), ([("Message_group", ("/var/log/messages*",""))], ['test2'], ALL_HOSTS), ] -# syntax of check + # syntax of check check_parameters = [ ({ "minsize": (200.0, 300.0), diff --git a/checks/fileinfo b/checks/fileinfo index 7907fdf..59b1c43 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -125,11 +125,20 @@ def check_fileinfo_groups(item, params, info): size_all = 0 size_smallest = None size_largest = 0 - # Start counting all values + date_inclusion = "" + # Start counting values on all files for line in info[1:]: for pattern in params['precompiled_patterns']: - if fnmatch.fnmatch(line[0], pattern[0]) and str(line[1]) != 'missing' \ - and not fnmatch.fnmatch(line[0], pattern[1]): + inclusion, exclusion = pattern + disect = re.match('(/.*/)\$DATE:((?:%\w.?){1,})\$(.*)',inclusion) + if disect: + prefix = disect.group(1) + datepattern = time.strftime(disect.group(2),time.localtime(reftime)) + postfix = disect.group(3) + inclusion = prefix+datepattern+postfix + date_inclusion = inclusion + if fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ + and not fnmatch.fnmatch(line[0], exclusion): size = int(line[1]) size_all += size if size_smallest == None: @@ -163,6 +172,8 @@ def check_fileinfo_groups(item, params, info): check_definition.append(("size_smallest", size_smallest, get_filesize_human_readable)) if size_largest != 0: check_definition.append(("size_largest", size_largest, get_filesize_human_readable)) + if date_inclusion: + check_definition.append(("date pattern", date_inclusion, str )) return fileinfo_check_function(check_definition, params)

10 years, 8 months

Check_MK Git: check_mk: Fixed usage() after -I

by Mathias Kettner

Module: check_mk Branch: master Commit: 139f21693c6662d189eb7f7628b2d3de3b2d180a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=139f21693c6662… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 27 15:46:49 2014 +0100 Fixed usage() after -I --- 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 20bb90b..a09f8d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5933,7 +5933,7 @@ if __name__ == "__main__": make_inventory(checkname, hostnames, False) do_cleanup_autochecks() - + done = True if done: output_profile()

10 years, 8 months

Check_MK Git: check_mk: FIX brocade_fcport: fixed problem on displaying check_parameters in WATO

by Andreas Boesl

Module: check_mk Branch: master Commit: be0953f1c36e97b757083ba684950d081902907c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be0953f1c36e97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 27 13:07:30 2014 +0100 FIX brocade_fcport: fixed problem on displaying check_parameters in WATO The checks parameters stored in the autochecks file could not get processed and displayed correctly by the WATO inventory. --- .werks/269 | 11 +++++++++++ ChangeLog | 3 ++- checks/brocade_fcport | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/269 b/.werks/269 new file mode 100644 index 0000000..adb42a5 --- /dev/null +++ b/.werks/269 @@ -0,0 +1,11 @@ +Title: brocade_fcport: fixed problem on displaying check_parameters in WATO +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390824236 + +The checks parameters stored in the autochecks file could not get processed and +displayed correctly by the WATO inventory. + diff --git a/ChangeLog b/ChangeLog index b0c4456..80da780 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,8 +232,9 @@ * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places * 0268 FIX: wato inventory: fixed missing services... - * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... * 0686 FIX: Fix replication with WATO if EC is enabled on master and disabled on slave + * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... + * 0269 FIX: brocade_fcport: fixed problem on displaying check_parameters in WATO... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 42c5f77..40078c7 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -88,7 +88,7 @@ def inventory_brocade_fcport(info): phystate in brocade_fcport_inventory_phystates: inventory.append(( brocade_fcport_getitem(info[0], index, portname, is_isl), - '{ "phystate": %d, "opstate": %d, "admstate": %d }' + '{ "phystate": [%d], "opstate": [%d], "admstate": [%d] }' % (phystate, opstate, admstate) )) return inventory

10 years, 8 months

Check_MK Git: check_mk: fixed merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 036d1ab33434a4c546ecc33eaac686b3033ddf3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036d1ab33434a4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 27 12:46:59 2014 +0100 fixed merge conflict ---

10 years, 8 months

Check_MK Git: check_mk: FIX Fixed permission bug in "Edit user profile" dialog.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 04177e5d099caa0ecd581eb71fd2eff51c5203d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04177e5d099caa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 27 12:45:43 2014 +0100 FIX Fixed permission bug in "Edit user profile" dialog. The Edit user profile dialog has shown even the not user editable custom fields. --- .werks/129 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 9 +++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/129 b/.werks/129 new file mode 100644 index 0000000..7441ef2 --- /dev/null +++ b/.werks/129 @@ -0,0 +1,9 @@ +Title: Fixed permission bug in "Edit user profile" dialog. +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390823084 + +The Edit user profile dialog has shown even the not user editable custom fields. diff --git a/ChangeLog b/ChangeLog index 1838d2e..30f4b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -231,6 +231,7 @@ * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... * 0678 FIX: Move two last global settings of Event Console to proper places * 0268 FIX: wato inventory: fixed missing services... + * 0129 FIX: Fixed permission bug in "Edit user profile" dialog.... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ab66e2c..db5fdc4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12975,10 +12975,11 @@ def page_user_profile(): if config.may('general.edit_user_attributes'): for name, attr in userdb.get_user_attributes(): - vs = attr['valuespec'] - forms.section(vs.title()) - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - html.help(vs.help()) + if attr['user_editable']: + vs = attr['valuespec'] + forms.section(vs.title()) + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.help(vs.help()) # Save button forms.end()

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits