Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: New valuespec for Hostname or IPv4 Address

by Mathias Kettner

Module: check_mk Branch: master Commit: 7539c539435509d2d285c3a3d395cefabaa64866 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7539c539435509… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 14:54:20 2014 +0100 New valuespec for Hostname or IPv4 Address --- web/htdocs/valuespec.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8fdec8b..4abd944 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -562,6 +562,13 @@ class IPv4Address(IPv4Network): self.validate_ipaddress(value, varprefix) ValueSpec.custom_validate(self, value, varprefix) +# A host name with or without domain part. Also allow IP addresses +class Hostname(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._regex = re.compile('^[-0-9a-zA-Z_.]+$') + self._regex_error = _("Please enter a valid hostname or IPv4 address.") + # Valuespec for a HTTP Url (not HTTPS), that # automatically adds http:// to the value

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2223

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ee5eaaed50494d6036b4ca8cca7d0af0c4ec031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ee5eaaed50494… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 14:09:28 2014 +0100 Updated bug entries #2223 --- .bugs/2223 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2223 b/.bugs/2223 new file mode 100644 index 0000000..0efcc53 --- /dev/null +++ b/.bugs/2223 @@ -0,0 +1,10 @@ +Title: SNMPv3 garbles cmk -D and also WATO dialog +Component: core +State: open +Date: 2014-11-11 14:08:30 +Targetversion: 1.2.5i1 +Class: nastiness + +Hosts with SNMPv3 are not properly displayed in cmk -D. Also +in the WATO host dialog the str(...) of the 4/6-tuple of the +v3 settings is being displayed as a string.

9 years, 7 months

Check_MK Git: check_mk: Better detection of garbled command line

by Mathias Kettner

Module: check_mk Branch: master Commit: ac5896345fbf6d96d1ed1f9709e27e89b6f1e80b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac5896345fbf6d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 13:52:58 2014 +0100 Better detection of garbled command line --- modules/check_mk.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a2b433a..51916c0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -6010,7 +6010,9 @@ if __name__ == "__main__": elif o in [ '-f', '--force' ]: opt_force = True elif o == '-c': - check_mk_configfile = a + if check_mk_configfile != 'a': + sys.stderr.write("Please use the option -c separated by the other options.\n") + sys.exit(1) elif o == '--cache': opt_use_cachefile = True check_max_cachefile_age = 1000000000

9 years, 7 months

Check_MK Git: check_mk: fixed 'Item not found' for vm snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: 3318f505e5a22b25d34a02face42a1e458e55c9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3318f505e5a22b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 11 13:08:09 2014 +0100 fixed 'Item not found' for vm snapshots --- checks/esx_vsphere_vm | 67 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 117f637..7212b61 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -372,40 +372,39 @@ def check_esx_vsphere_vm_snapshots(_no_item, params, info): data = esx_vsphere_vm_convert(info) if 'snapshot.rootSnapshotList' not in data: - return 0, "No snapshots found" - - last_snapshot = None - powered_on_snapshot = None - snapshots = map(lambda x: x.split(" ", 3), " ".join(data["snapshot.rootSnapshotList"]).split("|")) - snapshots = map(lambda x: (int(x[0]), int(x[1]), x[2], x[3]) , snapshots) - yield 0, "Number of Snapshots %d" % len(snapshots) - - if len(snapshots) > 0: - last_snapshot = snapshots[0] - for snapshot in snapshots: - if snapshot[1] > last_snapshot[1]: - last_snapshot = snapshot - if snapshot[2] == "poweredOn": - powered_on_snapshot = snapshot - - yield 0, "Powered On: %s" % (powered_on_snapshot and powered_on_snapshot[3] or "None") - - perfdata = [] - if params.get("age"): - warn, crit = params["age"] - snapshot_age = time.time() - last_snapshot[1] - if snapshot_age > crit: - yield 2, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) - elif snapshot_age > warn: - yield 1, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) - perfdata = [("age", last_snapshot[1], warn, crit)] - else: - perfdata = [("age", last_snapshot[1])] - - - yield 0, "Last Snapshot: %s %s" % (last_snapshot[3], - time.strftime("%D %H:%M",time.localtime(last_snapshot[1]))),\ - perfdata + yield 0, "No snapshots found" + else: + last_snapshot = None + powered_on_snapshot = None + snapshots = map(lambda x: x.split(" ", 3), " ".join(data["snapshot.rootSnapshotList"]).split("|")) + snapshots = map(lambda x: (int(x[0]), int(x[1]), x[2], x[3]) , snapshots) + yield 0, "Number of Snapshots %d" % len(snapshots) + + if len(snapshots) > 0: + last_snapshot = snapshots[0] + for snapshot in snapshots: + if snapshot[1] > last_snapshot[1]: + last_snapshot = snapshot + if snapshot[2] == "poweredOn": + powered_on_snapshot = snapshot + + yield 0, "Powered On: %s" % (powered_on_snapshot and powered_on_snapshot[3] or "None") + + perfdata = [] + if params.get("age"): + warn, crit = params["age"] + snapshot_age = time.time() - last_snapshot[1] + if snapshot_age > crit: + yield 2, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) + elif snapshot_age > warn: + yield 1, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) + perfdata = [("age", last_snapshot[1], warn, crit)] + else: + perfdata = [("age", last_snapshot[1])] + + yield 0, "Last Snapshot: %s %s" % (last_snapshot[3], + time.strftime("%D %H:%M",time.localtime(last_snapshot[1]))),\ + perfdata

9 years, 7 months

Check_MK Git: check_mk: #1435 FIX Saving BI aggregations: No longer reports 'Request-URI Too Large'

by Andreas Boesl

Module: check_mk Branch: master Commit: e6db9c30fdc9d8e1bc99e4596b44fba07c85e446 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6db9c30fdc9d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 11 12:20:48 2014 +0100 #1435 FIX Saving BI aggregations: No longer reports 'Request-URI Too Large' The data from this formular now gets send as a POST instead of a GET request. --- .werks/1435 | 10 ++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1435 b/.werks/1435 new file mode 100644 index 0000000..83c5ec3 --- /dev/null +++ b/.werks/1435 @@ -0,0 +1,10 @@ +Title: Saving BI aggregations: No longer reports 'Request-URI Too Large' +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415704778 + +The data from this formular now gets send as a POST instead of a GET request. diff --git a/ChangeLog b/ChangeLog index 67b71d5..0850e9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,9 @@ Notifications: * 1168 FIX: HTML mails can now be configured to display graphs among each other... + BI: + * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... + Event Console: * 1169 Added host state type filter to "recent event history" view diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9621790..081460b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16614,7 +16614,7 @@ def mode_bi_edit_aggregation(phase): else: value = aggregations[nr] - html.begin_form("biaggr") + html.begin_form("biaggr", method = "POST") vs_aggregation.render_input("aggr", value) forms.end() html.hidden_fields()

9 years, 7 months

Check_MK Git: check_mk: fixed 'Item not found' for vm snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: a5c097d6fe558858a06f3f45635df1801aa610fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5c097d6fe5588… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 11 11:50:07 2014 +0100 fixed 'Item not found' for vm snapshots --- checks/esx_vsphere_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index da3532b..117f637 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -372,7 +372,7 @@ def check_esx_vsphere_vm_snapshots(_no_item, params, info): data = esx_vsphere_vm_convert(info) if 'snapshot.rootSnapshotList' not in data: - return + return 0, "No snapshots found" last_snapshot = None powered_on_snapshot = None

9 years, 7 months

Check_MK Git: check_mk: Restrict cron URL to localhost

by Mathias Kettner

Module: check_mk Branch: master Commit: a722a4507ed1ef2453703c88e9c218e64e87ef23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a722a4507ed1ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 11:49:55 2014 +0100 Restrict cron URL to localhost --- scripts/setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 7907667..6786b26 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -958,8 +958,9 @@ and change the path there. Restart Apache afterwards." # Trigger cron jobs. This is done without authentication <Location "${url_prefix}check_mk/run_cron.py"> - Order allow,deny - Allow from all + Order deny,allow + Deny from all + Allow from 127.0.0.1 Satisfy any </Location>

9 years, 7 months

Check_MK Git: check_mk: Avoid exception if some plugins directory is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d4bb97fba5a89c39984c89291972e676328cf7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d4bb97fba5a89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 11:43:36 2014 +0100 Avoid exception if some plugins directory is missing --- web/htdocs/lib.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 37a7708..3477ca1 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -149,18 +149,18 @@ def gen_id(): # local-hierarchy for OMD def load_web_plugins(forwhat, globalvars): plugins_path = defaults.web_dir + "/plugins/" + forwhat - - fns = os.listdir(plugins_path) - fns.sort() - for fn in fns: - file_path = plugins_path + "/" + fn - if fn.endswith(".py"): - if not os.path.exists(file_path + "c"): - execfile(file_path, globalvars) - elif fn.endswith(".pyc"): - code_bytes = file(file_path).read()[8:] - code = marshal.loads(code_bytes) - exec code in globalvars + if os.path.exists(plugins_path): + fns = os.listdir(plugins_path) + fns.sort() + for fn in fns: + file_path = plugins_path + "/" + fn + if fn.endswith(".py"): + if not os.path.exists(file_path + "c"): + execfile(file_path, globalvars) + elif fn.endswith(".pyc"): + code_bytes = file(file_path).read()[8:] + code = marshal.loads(code_bytes) + exec code in globalvars if defaults.omd_root: local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/" + forwhat

9 years, 7 months

Check_MK Git: check_mk: Better output of exceptions in cron jobs

by Mathias Kettner

Module: check_mk Branch: master Commit: a5bf6ffb2d3a7b3c66e3e8db6a8bf3df31b4a67b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5bf6ffb2d3a7b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 11 11:39:22 2014 +0100 Better output of exceptions in cron jobs --- web/htdocs/index.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b889c96..663c7c0 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -165,6 +165,8 @@ def handler(req, fields = None, profiling = True): handler() except Exception, e: html.write(str(e)) + if config.debug: + html.write(html.attrencode(format_exception())) release_all_locks() return apache.OK

9 years, 7 months

Check_MK Git: check_mk: #1496 FIX Fixed exception after editing a dashboard as user without permission to publish dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: 39dbeb2cb2dfd134cd0c5b16a0c848d04a98e472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39dbeb2cb2dfd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 11 10:06:13 2014 +0100 #1496 FIX Fixed exception after editing a dashboard as user without permission to publish dashboards When a user without permission to publish a dashboard created or customized a dashboard, the dashboard could be saved, but resulted in an exception later during rendering the following pages. This fix prevents creation of damages dashboards. The exception can be fixed by removing the dashboard definition from var/check_mk/web/USER/user_dashboards.mk or simply removing the whole file, which would delete all custom dashboards of the user. --- .werks/1496 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 3 +++ 3 files changed, 19 insertions(+) diff --git a/.werks/1496 b/.werks/1496 new file mode 100644 index 0000000..0077d79 --- /dev/null +++ b/.werks/1496 @@ -0,0 +1,15 @@ +Title: Fixed exception after editing a dashboard as user without permission to publish dashboards +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415696641 + +When a user without permission to publish a dashboard created or customized a dashboard, +the dashboard could be saved, but resulted in an exception later during rendering the +following pages. This fix prevents creation of damages dashboards. + +The exception can be fixed by removing the dashboard definition from var/check_mk/web/USER/user_dashboards.mk +or simply removing the whole file, which would delete all custom dashboards of the user. diff --git a/ChangeLog b/ChangeLog index f26c72c..67b71d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1488 FIX: Fixed wrong information showing up on "Host Group" and "Service Group" views... * 1433 FIX: Quicksearch: no longer shows an invalid search result when looking for multiple hosts... * 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... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 1245c9d..d06a733 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -667,6 +667,9 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, for key, title in visibility_choices: visual[key] = key in general_properties['visibility'] + if not config.may("general.publish_" + what): + visual['public'] = False + if create_handler: visual = create_handler(old_visual, visual)

9 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
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