Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Fixed typo in comment

by Lars Michelsen

Module: check_mk Branch: master Commit: 63382fec6aaaa91f2a3e8611af8255f162a880d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63382fec6aaaa9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 19 12:36:47 2014 +0200 Fixed typo in comment --- 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 0b44b8c..b9cb90a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7675,7 +7675,7 @@ def save_configuration_settings(vars): per_domain.setdefault(domain, {})[varname] = vars[varname] # The global setting wato_enabled is not registered in the configuration domains - # sind the user must not change it directly. It is set by D-WATO on slave sites. + # since the user must not change it directly. It is set by D-WATO on slave sites. if "wato_enabled" in vars: per_domain.setdefault("multisite", {})["wato_enabled"] = vars["wato_enabled"]

9 years, 8 months

Check_MK Git: check_mk: zombies.mk: now works in OMD without changes

by Mathias Kettner

Module: check_mk Branch: master Commit: 3fdad7ef2d97efc19e0402b7b4f4ce8fa084b392 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fdad7ef2d97ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 17 19:50:55 2014 +0200 zombies.mk: now works in OMD without changes --- doc/treasures/zombies.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/treasures/zombies.mk b/doc/treasures/zombies.mk index 5ba66d0..da7daf6 100644 --- a/doc/treasures/zombies.mk +++ b/doc/treasures/zombies.mk @@ -13,8 +13,10 @@ _num_zombies = 100 for _z in range(0, _num_zombies): _name = "zombie%04d" % _z all_hosts.append(_name + "|zombie") - ipaddresses[_name] = "127.0.0.1" + _x = _z % 255 + 1 + _y = (_z / 255) % 255 + 1 + ipaddresses[_name] = "127.0.%d.%d" % (_y, _x) datasource_programs = [ - ( "cat /var/lib/check_mk/cache/localhost", [ "zombie" ], ALL_HOSTS), + ( "cat ~/tmp/check_mk/cache/localhost", [ "zombie" ], ALL_HOSTS), ]

9 years, 8 months

Check_MK Git: check_mk: fixed incorrect call of inventory plugin

by Andreas Boesl

Module: check_mk Branch: master Commit: 7ab687f904e7f09ad0a39047ec8a1eaa4894382b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ab687f904e7f0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 16:07:00 2014 +0200 fixed incorrect call of inventory plugin Inventory plugins are handled one after another. If there wasn't any info available for the first plugin 'None' was returned. If there wasn't any info available for the followup plugins an Exception was raised and catched. In some scenarios an inventory plugin got called, even if there was no info available. --- modules/inventory.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/inventory.py b/modules/inventory.py index 0739d8f..5c274c1 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -229,7 +229,8 @@ def do_inv_for(hostname, ipaddress): raise # Otherwise simply ignore missing agent section continue - if info == None: # section not present + if not info: # section not present (None or []) + # Note: this also excludes existing sections without info.. continue if opt_verbose:

9 years, 8 months

Check_MK Git: check_mk: Inventory: new painters for 'Bus speed' and ' Bios date'

by Andreas Boesl

Module: check_mk Branch: master Commit: 2481b06b7712f945e07a6e5ab881f41c61dcfb03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2481b06b7712f9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 15:39:15 2014 +0200 Inventory: new painters for 'Bus speed' and 'Bios date' --- web/plugins/views/inventory.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index bd6c5b6..bacfd1d 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -388,11 +388,13 @@ inventory_displayhints.update({ ".hardware.bios." : { "title" : _("BIOS"), }, ".hardware.bios.vendor" : { "title" : _("Vendor"), }, ".hardware.bios.version" : { "title" : _("Version"), }, + ".hardware.bios.date" : { "title" : _("Date"), "paint": "date"}, ".hardware.chassis." : { "title" : _("Chassis"), }, ".hardware.cpu." : { "title" : _("Processor"), }, ".hardware.cpu.model" : { "title" : _("Model"), "short" : _("CPU Model"), }, ".hardware.cpu.cache_size" : { "title" : _("Cache Size"), "paint" : "bytes" }, ".hardware.cpu.max_speed" : { "title" : _("Maximum Speed"), "paint" : "hz" }, + ".hardware.cpu.bus_speed" : { "title" : _("Bus Speed"), "paint" : "hz" }, ".hardware.cpu.voltage" : { "title" : _("Voltage"), "paint" : "volt" }, ".hardware.cpu.cores_per_cpu" : { "title" : _("Cores per CPU"), "paint" : "count" }, ".hardware.cpu.threads_per_cpu" : { "title" : _("Hyperthreads per CPU"), "paint" : "count" },

9 years, 8 months

Check_MK Git: check_mk: improved werk layout

by Andreas Boesl

Module: check_mk Branch: master Commit: 22f352b8406592ac1cffe781c14714fe45805c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f352b8406592… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 15:38:09 2014 +0200 improved werk layout --- .werks/1130 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.werks/1130 b/.werks/1130 index 4c5dd17..7facf7c 100644 --- a/.werks/1130 +++ b/.werks/1130 @@ -6,8 +6,7 @@ Version: 1.2.5i6 Date: 1413552488 Class: feature -The ESX Agent now also queries more data which is used in the HW-Inventory<br> -For example:<br><br> +The ESX Agent now also queries more data which is used in the HW-Inventory. For example:<br><br> <tt>BIOS</tt> C+:

9 years, 8 months

Check_MK Git: check_mk: improved werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: 0d484ab90d3fadfca3f89d12be177bf4e5ceeca5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d484ab90d3fad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 15:37:43 2014 +0200 improved werk description --- .werks/1130 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.werks/1130 b/.werks/1130 index c3aca2b..4c5dd17 100644 --- a/.werks/1130 +++ b/.werks/1130 @@ -6,7 +6,8 @@ Version: 1.2.5i6 Date: 1413552488 Class: feature -The ESX Agent now also queries the following data which is used in the HW-Inventory<br> +The ESX Agent now also queries more data which is used in the HW-Inventory<br> +For example:<br><br> <tt>BIOS</tt> C+:

9 years, 8 months

Check_MK Git: check_mk: #1130 esx monitoring: agent_vsphere now retrieves additional data (used by HW-inventory)

by Andreas Boesl

Module: check_mk Branch: master Commit: bfd074550e1e9530dc802d51181bf1c297c2a5a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd074550e1e95… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 15:36:35 2014 +0200 #1130 esx monitoring: agent_vsphere now retrieves additional data (used by HW-inventory) The ESX Agent now also queries the following data which is used in the HW-Inventory<br> <tt>BIOS</tt> C+: Date 2012-11-26 Version -[D6E158AUS-1.16]- C-: <tt>Processor</tt> C+: Speed 133.3 MHz Cores per CPU 6 Hyperthreads per CPU 12 Maximum Speed 2.93 GHz Model Intel(R) Xeon(R) CPU X5670 @ 2.93GHz Total Number of CPUs 2 Total Number of Cores 12 Total Number of Hyperthreads 24 Vendor intel C-: <tt>System</tt> C+: Product System x3650 M3 -[7945M2G]- Vendor IBM C-: --- .werks/1130 | 34 +++++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 82 +++++++++++++++++++++---------- inventory/esx_vpshere_hostsystem | 101 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bfd074550e…

9 years, 8 months

Check_MK Git: check_mk: age valuespec: reduced size of first entry

by Andreas Boesl

Module: check_mk Branch: master Commit: 8e669b8100f230d2098a43c77c0a1595af334f75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e669b8100f230… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 11:22:50 2014 +0200 age valuespec: reduced size of first entry --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index db439c2..7e42253 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -186,7 +186,7 @@ class Age(ValueSpec): if uid in self._display: value += takeover takeover = 0 - html.number_input(varprefix + "_" + uid, value, first and 6 or 2) + html.number_input(varprefix + "_" + uid, value, first and 3 or 2) html.write(" %s " % title) first = False else:

9 years, 8 months

Check_MK Git: check_mk: age valuespec: no longer cuts too high values

by Andreas Boesl

Module: check_mk Branch: master Commit: 17a858c8d4bac8723451c1837048dea8dc99556f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17a858c8d4bac8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 11:22:03 2014 +0200 age valuespec: no longer cuts too high values --- web/htdocs/valuespec.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9753664..db439c2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -177,13 +177,20 @@ class Age(ValueSpec): if self._label: html.write(self._label + " ") - for uid, title, value, length in [ ("days", _("days"), days, 3), - ("hours", _("hours"), hours, 2), - ("minutes", _("mins"), minutes, 2), - ("seconds", _("secs"), seconds, 2) ]: + takeover = 0 + first = True + for uid, title, value, tkovr_fac in [ ("days", _("days"), days, 24), + ("hours", _("hours"), hours, 60), + ("minutes", _("mins"), minutes, 60), + ("seconds", _("secs"), seconds, 60) ]: if uid in self._display: - html.number_input(varprefix + "_" + uid, value, length) + value += takeover + takeover = 0 + html.number_input(varprefix + "_" + uid, value, first and 6 or 2) html.write(" %s " % title) + first = False + else: + takeover = (takeover + value) * tkovr_fac html.write("</div>") def from_html_vars(self, varprefix):

9 years, 8 months

Check_MK Git: check_mk: Age valuespec: now able to configure time interval

by Andreas Boesl

Module: check_mk Branch: master Commit: 32d45578f1bf41f2f49f70f172c16e41ff946d3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32d45578f1bf41… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 17 10:53:59 2014 +0200 Age valuespec: now able to configure time interval --- web/htdocs/valuespec.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 20c92f0..9753664 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -160,6 +160,7 @@ class Age(ValueSpec): ValueSpec.__init__(self, **kwargs) self._label = kwargs.get("label") self._minvalue = kwargs.get("minvalue") + self._display = kwargs.get("display", ["days", "hours", "minutes", "seconds"]) def canonical_value(self): if self._minvalue: @@ -175,22 +176,22 @@ class Age(ValueSpec): html.write("<div>") if self._label: html.write(self._label + " ") - html.number_input(varprefix+'_days', days, 3) - html.write(" %s " % _("days")) - html.number_input(varprefix+'_hours', hours, 2) - html.write(" %s " % _("hours")) - html.number_input(varprefix+'_minutes', minutes, 2) - html.write(" %s " % _("min")) - html.number_input(varprefix+'_seconds', seconds, 2) - html.write(" %s " % _("sec")) + + for uid, title, value, length in [ ("days", _("days"), days, 3), + ("hours", _("hours"), hours, 2), + ("minutes", _("mins"), minutes, 2), + ("seconds", _("secs"), seconds, 2) ]: + if uid in self._display: + html.number_input(varprefix + "_" + uid, value, length) + html.write(" %s " % title) html.write("</div>") def from_html_vars(self, varprefix): return ( - saveint(html.var(varprefix+'_days')) * 3600 * 24 - + saveint(html.var(varprefix+'_hours')) * 3600 - + saveint(html.var(varprefix+'_minutes')) * 60 - + saveint(html.var(varprefix+'_seconds')) + saveint(html.var(varprefix+'_days', 0)) * 3600 * 24 + + saveint(html.var(varprefix+'_hours',0)) * 3600 + + saveint(html.var(varprefix+'_minutes',0)) * 60 + + saveint(html.var(varprefix+'_seconds',0)) ) def value_to_text(self, value):

9 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014