Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a287549bc845ea3fbcc429b5803d78f775c03d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a287549bc845e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jun 6 12:36:53 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Remove trailing 's'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59a799facb07d3f64e67a13be1337bca7ce0e602 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59a799facb07d3… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jun 6 12:35:38 2012 +0200 Remove trailing 's' --- checks/diskstat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index f2789d3..e6ba75e 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -92,7 +92,7 @@ def diskstat_parse_info(info): elif phase == 'dmsetup_info': majmin = tuple(map(int, line[1].split(':'))) if len(line) == 4: - name = "LVM %ss" % line[0] + name = "LVM %s" % line[0] else: name = "DM %s" % line[0] nameinfo[majmin] = name

12 years, 3 months

Check_MK Git: check_mk: FIX: fix bulk edit and form properties ( visibility of attributes was broken)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3045763d3a56bb31fc1fb4e09bd18646553e4965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3045763d3a56bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 12:31:40 2012 +0200 FIX: fix bulk edit and form properties (visibility of attributes was broken) --- ChangeLog | 1 + web/htdocs/wato.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2195f4b..46d3dae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ WATO: * FIX: add missing icon on cluster hosts to WATO in Multisite views * FIX: fix search field in host table if more than 10 hosts are shown + * FIX: fix bulk edit and form properties (visibility of attributes was broken) Checks & Agents: * fileinfo: added this check to Linux agent. Simply put your diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6cef8c9..b03443b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1684,7 +1684,7 @@ def mode_editfolder(phase, new): render_folder_path() check_folder_permissions(g_folder, "read") - html.begin_form("editfolder") + html.begin_form("edithost") # title forms.header(_("Title")) @@ -2185,7 +2185,7 @@ def mode_search(phase): render_folder_path() ## # Show search form - html.begin_form("search") + html.begin_form("edithost") forms.header(_("General Properties")) forms.section(_("Hostname")) html.text_input("host") @@ -2592,7 +2592,7 @@ def mode_bulk_edit(phase): "hosts share the same setting for this attribute. If you leave that selection, all hosts " "will keep their individual settings.") + "</p>") - html.begin_form("bulkedit", None, "POST") + html.begin_form("edithost", None, "POST") configure_attributes(hosts, "bulk", parent = g_folder) forms.end() html.button("_save", _("Save & Finish")) @@ -4618,13 +4618,14 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute continue attrname = attr.name() if attrname in without_attributes: + html.debug(without_attributes) continue # e.g. needed to skip ipaddress in CSV-Import # Hide invisible attributes hide_attribute = False - if for_what == "host" and not attr.show_in_form(): + if for_what in [ "host", "bulk" ] and not attr.show_in_form(): hide_attribute = True - elif (for_what == "folder" or for_what == "bulk") and not attr.show_in_folder(): + elif (for_what == "folder") and not attr.show_in_folder(): hide_attribute = True # Determine visibility information if this attribute is not always hidden

12 years, 3 months

Check_MK Git: check_mk: fix search field in host table if more than 10 hosts are shown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca7d997cce05865c734266e466f79eb695363679 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca7d997cce0586… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 12:14:11 2012 +0200 fix search field in host table if more than 10 hosts are shown --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 ++ web/htdocs/wato.py | 15 +++++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3059f67..2195f4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0: WATO: * FIX: add missing icon on cluster hosts to WATO in Multisite views + * FIX: fix search field in host table if more than 10 hosts are shown Checks & Agents: * fileinfo: added this check to Linux agent. Simply put your diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f9c679f..b1bfe2d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -986,6 +986,8 @@ class html: def del_var(self, varname): if varname in self.req.vars: del self.req.vars[varname] + if varname in self.req.listvars: + del self.req.listvars[varname] def javascript(self, code): self.write("<script language=\"javascript\">\n%s\n</script>\n" % code) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a071416..6cef8c9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1179,15 +1179,17 @@ def show_hosts(folder): # Helper function for showing bulk actions. This is needed at the bottom # of the table of hosts and - if there are more than just a few - also # at the top of the table. - def bulk_actions(at_least_one_imported, top, colspan, odd): + search_shown = False + def bulk_actions(at_least_one_imported, top, withsearch, colspan, odd): # bulk actions html.write('<tr class="data %s0">' % odd) html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') html.write("</td><td class=bulksearch colspan=2>") - html.text_input("search") - html.button("_search", _("Search")) - html.set_focus("search") + if withsearch: + html.text_input(top and "search" or "search") + html.button("_search", _("Search")) + html.set_focus("search") html.write('</td>') html.write("<td class=bulkactions colspan=%d>" % (colspan-3)) html.write(' ' + _("Selected hosts:\n")) @@ -1240,7 +1242,8 @@ def show_hosts(folder): # list shows more than 10 rows if more_than_ten_items and \ (config.may("wato.edit_hosts") or config.may("wato.manage_hosts")): - bulk_actions(at_least_one_imported, True, colspan, "even") + bulk_actions(at_least_one_imported, True, True, colspan, "even") + search_shown = True # Header line html.write("<tr><th class=left></th><th>"+_("Actions")+"</th><th>" @@ -1361,7 +1364,7 @@ def show_hosts(folder): html.write("</tr>\n") if config.may("wato.edit_hosts") or config.may("wato.manage_hosts"): - bulk_actions(at_least_one_imported, False, colspan, odd) + bulk_actions(at_least_one_imported, False, not search_shown, colspan, odd) html.write("</table>\n") html.hidden_fields()

12 years, 3 months

Check_MK Git: check_mk: Removed debug code (broke inventory in WATO)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a68a6d14776adeaf50c800cde74920b570e71ab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a68a6d14776ade… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 6 09:24:24 2012 +0200 Removed debug code (broke inventory in WATO) --- checks/diskstat.include | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 6e60b5e..bd093b8 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -44,8 +44,6 @@ diskstat_inventory = [] # ] def inventory_diskstat_generic(info): - print diskstat_inventory_mode - # New style: use rule based configuration, defaulting to summary mode if diskstat_inventory_mode == "rule": hits = host_extra_conf(g_hostname, diskstat_inventory)

12 years, 3 months

Check_MK Git: check_mk: diskstat: support for checking latency, LVM and VxVM on Linux

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54087e5a270e6aa610cc382d4cf7ba92c421365d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54087e5a270e6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 5 21:16:58 2012 +0200 diskstat: support for checking latency, LVM and VxVM on Linux --- ChangeLog | 2 + checks/diskstat | 67 +++++++++++++++++++- checks/diskstat.include | 96 +++++++++++++++++++++++++--- web/plugins/wato/check_mk_configuration.py | 6 +- web/plugins/wato/check_parameters.py | 47 ++++++++++---- 5 files changed, 192 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=54087e5a27…

12 years, 3 months

Check_MK Git: check_mk: WATO Rules for IO latency

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8537fce79d78d94928ace72e0df93e80bf542c77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8537fce79d78d9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 20:48:06 2012 +0200 WATO Rules for IO latency --- web/plugins/wato/check_mk_configuration.py | 1 + web/plugins/wato/check_parameters.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d36e36d..594e0de 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -496,6 +496,7 @@ register_configvar(group, ('summary', _("one summary check per host")), ('single' , _("one check per individual disk/LUN") ), ('legacy' , _("one check for read, one for write") ), + ('rule' , _("controlled by ruleset diskio_inventory_mode") ), ]), ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9bfe53f..eb8fa5f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1199,6 +1199,7 @@ checkgroups.append(( checkgroups.append(( subgroup_storage, + # umbenennen "disk_io", _("Levels on disk IO (throughput)"), Dictionary( @@ -1224,12 +1225,24 @@ checkgroups.append(( "of the disk throughput is computed and the levels for read " "and write will be applied to the average instead of the current " "value."), - unit = "min")) + unit = "min")), + ( "latency", + Integer( + title = _("IO latency"), + elements = [ + Float(title = "warning at", unit = _("ms")), + Float(title = "critical at", unit = _("ms")), + ])), ]), OptionalDropdownChoice( choices = [ ( "SUMMARY", _("Summary of all disks") ), ( "read", _("Summary of disk input (read)") ), ( "write", _("Summary of disk output (write)") ), + ( "latency_perfdata", _("Collect performance data for disk latency") ), + ( "physical", _("Collect performance statistics for physical disks") ), + ( "lvm", _("Collect performance statistics for LVM Volumes") ), + ( "vxvm", _("Collect performance statistics for VxVM Volumes") ), +# ( "latency", _("ms")), ], otherlabel = _("On explicit devices ->"), explicit = TextAscii(allow_empty = False),

12 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52d50acaa44c56c6b81559216885fca0256fa9e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d50acaa44c56… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 19:46:48 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Check_MK Agent for Linux: Handle disk statistics for Volume Managers directly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b770101542b2d6b0ed5905d5aaa915e7f38b1c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b770101542b2d… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 19:46:24 2012 +0200 Check_MK Agent for Linux: Handle disk statistics for Volume Managers directly --- agents/check_mk_agent.linux | 11 +++++- agents/plugins/lnx_lvmstat | 63 ---------------------------------- agents/plugins/veritas/vxvm_volstats | 22 ------------ checkman/lvm_volstats | 13 ------- checkman/vxvm_volstats | 13 ------- checks/lnx_lvmstat | 49 -------------------------- checks/vxvm_volstats | 48 -------------------------- 7 files changed, 10 insertions(+), 209 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b77010154…

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0766

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 46e9949f0f762bc7a8427893b984f5f478402a6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46e9949f0f762b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 5 18:01:45 2012 +0200 Updated bug entries #0766 --- .bugs/766 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/766 b/.bugs/766 new file mode 100644 index 0000000..e53be88 --- /dev/null +++ b/.bugs/766 @@ -0,0 +1,9 @@ +Title: Search filed in WATO folder view does not work +Component: wato +State: open +Date: 2012-06-05 18:01:17 +Targetversion: 1.2.0 +Class: bug + +It simply does not filter out anything, regardless what one +types in.

12 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012