Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: deprecated backup domains no longer stored in automatically created snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: 7b52f51972906ce3e81eea0072888baa62981fb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b52f51972906c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 2 09:10:44 2014 +0200 deprecated backup domains no longer stored in automatically created snapshots --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c81d10f..438031f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6524,7 +6524,7 @@ def get_backup_domains(modes, extra_domains = {}): domains = {} for mode in modes: for domain, value in backup_domains.items(): - if mode in value: + if mode in value and not value.get("deprecated"): domains.update({domain: value}) domains.update(extra_domains) return domains

10 years, 5 months

Check_MK Git: check_mk: Yet another fix for the new secure transaction ids

by Mathias Kettner

Module: check_mk Branch: master Commit: 3b635f13232a4d26e2c77b471c551c9eb6991126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b635f13232a4d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 1 15:41:45 2014 +0200 Yet another fix for the new secure transaction ids --- web/htdocs/html_mod_python.py | 3 ++- web/htdocs/htmllib.py | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 5c28a76..b164ad4 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -151,7 +151,8 @@ class html_mod_python(htmllib.html): return config.load_user_file("transids", []) def save_transids(self, used_ids): - config.save_user_file("transids", used_ids) + if config.user_id: + config.save_user_file("transids", used_ids) def save_tree_states(self): config.save_user_file("treestates", self.treestates) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d897b80..ae524a8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -798,14 +798,14 @@ class html: self.javascript(self.final_javascript_code) self.write("</body></html>\n") + # Hopefully this is the correct place to performe some "finalization" tasks. + self.store_new_transids() + def footer(self): if self.output_format == "html": self.bottom_footer() self.body_end() - # Hopefully this is the correct place to performe some "finalization" tasks. - if self.user: - self.store_new_transids() def add_status_icon(self, img, tooltip, url = None): if url: @@ -963,16 +963,17 @@ class html: # time we remove all entries from that list that are older # than one week. def store_new_transids(self): - valid_ids = self.load_transids() + if self.new_transids: + valid_ids = self.load_transids() - cleared_ids = [] - now = time.time() - for valid_id in valid_ids: - timestamp, rand = valid_id.split("/") - if now - int(timestamp) < 604800: # 7 * 24 hours - cleared_ids.append(valid_id) + cleared_ids = [] + now = time.time() + for valid_id in valid_ids: + timestamp, rand = valid_id.split("/") + if now - int(timestamp) < 604800: # 7 * 24 hours + cleared_ids.append(valid_id) - self.save_transids(cleared_ids + self.new_transids) + self.save_transids(cleared_ids + self.new_transids) # Remove the used transid from the list of valid ones def invalidate_transid(self, used_id):

10 years, 5 months

Check_MK Git: check_mk: reduced superflueous calls of get_snapshot_status() . fixed wording

by Andreas Boesl

Module: check_mk Branch: master Commit: 2618332e82e72ffed13378e3ebc2c6b68cef0e5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2618332e82e72f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 1 14:10:55 2014 +0200 reduced superflueous calls of get_snapshot_status(). fixed wording Conflicts: web/htdocs/wato.py --- web/htdocs/wato.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6b3a668..c81d10f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6180,7 +6180,8 @@ def mode_snapshot_detail(phase): if not os.path.exists(snapshot_dir + '/' + snapshot_name): raise MKUserError("_snapshot_name", _("The requested snapshot does not exist")) - status = get_snapshot_status(snapshot_name, validate_checksums = True) + if phase not in ["buttons", "action"]: + status = get_snapshot_status(snapshot_name, validate_checksums = True) if phase == "title": return _("Snapshot details of %s") % html.attrencode(status["name"]) @@ -6424,16 +6425,16 @@ def mode_snapshot(phase): elif status["type"] == "legacy" and status['checksums'] == None: q = _('The integrity of this snapshot could not be verified. ' - 'You are importing a legacy snapshot which can not be verified. The snapshot contains ' + 'You are restoring a legacy snapshot which can not be verified. The snapshot contains ' 'files which contain code that will be executed during runtime of the monitoring. Please ' 'ensure that the snapshot is a legit, not manipulated file. ' 'Do you want to continue restoring the snapshot?') else: q = _('The integrity of this snapshot could not be verified. ' - 'If you import a snapshot on the same site as you exported it, the checksum should ' + 'If you restore a snapshot on the same site as where it was created, the checksum should ' 'always be OK. If not, it is likely that something has been modified in the snapshot. ' - 'When you exported the snapshot on another site, the checksum check will always fail. ' + 'When you restore the snapshot on a different site, the checksum check will always fail. ' 'The snapshot contains files which contain code that will be executed during runtime ' 'of the monitoring. Please ensure that the snapshot is a legit, not manipulated file. ' 'Do you want to ignore the failed integrity check and restore the snapshot?')

10 years, 5 months

Check_MK Git: check_mk: FIX Signing and verification of WATO snapshot ( addresses CVE-2014-2330)

by Lars Michelsen

Module: check_mk Branch: master Commit: 402218b6a4f0303c13da8d053f9f0f75879e4d9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=402218b6a4f030… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 1 13:57:18 2014 +0200 FIX Signing and verification of WATO snapshot (addresses CVE-2014-2330) This change addresses possible attacks against Check_MK using the WATO "Backup & Restore" module, known as CVE-2014-2330. In previous versions there were no checksum verifications or signings of the snapshots contents implemented. This has been changed now. The files within the snapshot which contain Check_MK configuration files and definitions of check commands etc. are now verified using checksums and signed. When you import / export a snapshot on a single site, there is no difference to the former handling. When you or someone else modifies the snapshots between import and export, the restore process will warn you about the modification and let you decide if you trust the file and restore it anyways or terminate the restore process. In the case you import a snapshot from another site, the singing can not be verified. In this case, you get a warning about this and can continue or skip the restore process. Conflicts: ChangeLog modules/automation.py web/htdocs/wato.py web/plugins/wato/backup_domains.py --- .werks/767 | 22 +++ ChangeLog | 3 + modules/automation.py | 61 ++++++-- web/htdocs/images/icon_snapshot_checksum.png | Bin 0 -> 2992 bytes web/htdocs/images/icon_snapshot_nchecksum.png | Bin 0 -> 3550 bytes web/htdocs/images/icon_snapshot_pchecksum.png | Bin 0 -> 3054 bytes web/htdocs/wato.py | 192 +++++++++++++++++++------ web/plugins/wato/backup_domains.py | 4 +- 8 files changed, 227 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=402218b6a4…

10 years, 5 months

Check_MK Git: check_mk: Fixed problem in yesterdays change in transaction id handling

by Lars Michelsen

Module: check_mk Branch: master Commit: a86d4c62b3e14484234b434a6b315d929f3d6a71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a86d4c62b3e144… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 1 11:36:36 2014 +0200 Fixed problem in yesterdays change in transaction id handling --- web/htdocs/htmllib.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 847d338..d897b80 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -994,12 +994,16 @@ class html: def transaction_valid(self): if not self.has_var("_transid"): return False + id = self.var("_transid") - if not id or self.ignore_transids: + if self.ignore_transids and (not id or id == '-1'): return True # automation + if '/' not in id: + return False + # Normal user/password auth user handling - timestamp, rand = id.split("/") + timestamp, rand = id.split("/", 1) # If age is too old (one week), it is always # invalid:

10 years, 5 months

Check_MK Git: check_mk: tsm_paths: little source cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5a6705c30243638c16d428dd9eda62b77e5a311b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a6705c3024363… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 1 11:29:10 2014 +0200 tsm_paths: little source cleanup --- checks/tsm_paths | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checks/tsm_paths b/checks/tsm_paths index 1bd1eef..2b7f804 100644 --- a/checks/tsm_paths +++ b/checks/tsm_paths @@ -24,10 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output from agent: -# Put here the example output from your TCP-Based agent. If the -# check is SNMP-Based, then remove this section - def inventory_tsm_paths(info): return [(None, None)]

10 years, 5 months

Check_MK Git: check_mk: cisco_mem: Fixed error handling

by Bastian Kuhn

Module: check_mk Branch: master Commit: eed0ab6f018b37d666e145297c0061d839712c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eed0ab6f018b37… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 1 10:15:38 2014 +0200 cisco_mem: Fixed error handling --- checks/cisco_mem | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/cisco_mem b/checks/cisco_mem index 9034ebe..44ff0ac 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -40,8 +40,9 @@ def check_cisco_mem(item, params, info): if line[0] == item: mem_free = saveint(line[2]) mem_used = saveint(line[1]) - mem_total = mem_free + mem_used - return check_cisco_mem_sub(params, mem_used, mem_total) + mem_total = mem_free + mem_used + return check_cisco_mem_sub(params, mem_used, mem_total) + return 3, "Error getting information. Try a reinventory" def check_cisco_mem_sub(params, mem_used, mem_total): perc_used = 100 * (float(mem_used) / float(mem_total))

10 years, 5 months

Check_MK Git: check_mk: mem, fortigate_memory, solaris_mem:

by Andreas Boesl

display total SWAP info in check output Message-ID: <533a6733.Iz33+f/xaln5Ikn7%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f50da6085c45a36987ac94c5c25424684ff68433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50da6085c45a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 1 09:13:52 2014 +0200 mem, fortigate_memory, solaris_mem: display total SWAP info in check output --- .werks/743 | 8 ++++++++ ChangeLog | 1 + checks/mem.include | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/743 b/.werks/743 new file mode 100644 index 0000000..10a1192 --- /dev/null +++ b/.werks/743 @@ -0,0 +1,8 @@ +Title: mem, fortigate_memory, solaris_mem: display total SWAP info in check output +Level: 1 +Component: checks +Version: 1.2.5i2 +Date: 1396336419 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a0cf1b1..d4baa97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 0764 lnx_quota: Added new check to monitor Linux File System Quota... * 0776 ibm_svc_nodestats.cpu_util: new check for CPU Utilization per Node on IBM SVC / V7000 devices * 0600 nfsexports.solaris: new agent plugin for monitoring nfs exports on solaris systems... + * 0743 mem, fortigate_memory, solaris_mem: display total SWAP info in check output * 0740 FIX: winperf_if: now able to handle bandwidth > 4GBit... Multisite: diff --git a/checks/mem.include b/checks/mem.include index 3f1cc83..682fe6b 100644 --- a/checks/mem.include +++ b/checks/mem.include @@ -58,9 +58,9 @@ def check_memory(params, meminfo): pgtext = " + %.2f Pagetables" % (pagetables_mb / 1024.0) else: pgtext = "" - infotext = "%.2f GB used (%.2f RAM + %.2f SWAP%s, this is %.1f%% of %.2f RAM" % \ + infotext = "%.2f GB used (%.2f RAM + %.2f SWAP%s, this is %.1f%% of %.2f RAM (%.2f total SWAP)" % \ (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, - pgtext, totalused_perc, totalmem_mb / 1024.0) + pgtext, totalused_perc, totalmem_mb / 1024.0, meminfo["SwapTotal"] / 1024.0 / 1024) # Take into account averaging average_min = params.get("average")

10 years, 5 months

Check_MK Git: check_mk: htmllib.py: converted tabs to spaces

by Andreas Boesl

Module: check_mk Branch: master Commit: 8602d0bcc06f5af368754f8decd09100eb924f7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8602d0bcc06f5a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 1 09:08:48 2014 +0200 htmllib.py: converted tabs to spaces --- web/htdocs/htmllib.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a9b4d79..847d338 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -514,9 +514,9 @@ class html: def begin_radio_group(self, horizontal=False): if self.mobile: if horizontal: - add = 'data-type="horizontal" ' - else: - add = '' + add = 'data-type="horizontal" ' + else: + add = '' self.write('<fieldset %s data-role="controlgroup">' % add) def end_radio_group(self): @@ -539,7 +539,7 @@ class html: self.form_vars.append(varname) def begin_checkbox_group(self, horizonal=False): - self.begin_radio_group(horizonal) + self.begin_radio_group(horizonal) def end_checkbox_group(self): self.end_radio_group() @@ -808,10 +808,10 @@ class html: self.store_new_transids() def add_status_icon(self, img, tooltip, url = None): - if url: - self.status_icons[img] = tooltip, url - else: - self.status_icons[img] = tooltip + if url: + self.status_icons[img] = tooltip, url + else: + self.status_icons[img] = tooltip def render_status_icons(self): h = '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ @@ -825,12 +825,12 @@ class html: (self.makeuri([("output_format", "csv_export")]), _("Export as CSV")) for img, tooltip in self.status_icons.items(): - if type(tooltip) == tuple: - tooltip, url = tooltip - h += '<a target="_top" href="%s"><img class=statusicon src="images/status_%s.png" title="%s"></a>\n' % \ - (url, img, tooltip) - else: - h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) + if type(tooltip) == tuple: + tooltip, url = tooltip + h += '<a target="_top" href="%s"><img class=statusicon src="images/status_%s.png" title="%s"></a>\n' % \ + (url, img, tooltip) + else: + h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) return h def show_error(self, msg):

10 years, 5 months

Check_MK Git: check_mk: fixed exception on user logon screen

by Andreas Boesl

Module: check_mk Branch: master Commit: 5b8cadc6002ed27b5d71b0cd8a346a66d72586e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b8cadc6002ed2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 1 09:04:30 2014 +0200 fixed exception on user logon screen --- web/htdocs/htmllib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6a9c84c..a9b4d79 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -804,7 +804,8 @@ class html: self.body_end() # Hopefully this is the correct place to performe some "finalization" tasks. - self.store_new_transids() + if self.user: + self.store_new_transids() def add_status_icon(self, img, tooltip, url = None): if url:

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014