Module: check_mk
Branch: master
Commit: f3f229ac911104c7851fa04a8fb4bfe61c87bc2e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3f229ac911104…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Aug 10 19:29:01 2011 +0200
FIX: BI - fixed wrong variable in running_on aggregation function
---
ChangeLog | 1 +
web/htdocs/bi.py | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f0b37c3..5b145a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@
* FIX: ipmi: Skipping items with invalid data (0.000 val, "unspecified"
unit) in summary mode
* FIX: ipmi: Improved output formating in summary mode
+ * FIX: BI - fixed wrong variable in running_on aggregation function
* Introduced basic infrastructure for multilanguage support in Multisite
* Make 'Views' snapin foldable
* Replace old main view by dashboard.
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index b676e4d..18c5807 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -854,7 +854,7 @@ def aggr_running_on(nodes, regex):
# if not found, then do normal aggregation with 'worst'
if not mo or len(mo.groups()) == 0:
- state = aggregation_functions['worst'](nodes[1:])
+ state = config.aggregation_functions['worst'](nodes[1:])
state["output"] += ", running nowhere"
return state
Module: check_mk
Branch: master
Commit: ae228be58c15a1468bead7709f21703e92105a2c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae228be58c15a1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 12 16:02:43 2011 +0200
WATO: Host attributes can now be hidden from forms using "show_in_form"
---
web/htdocs/wato.py | 16 +++++++++++++---
web/plugins/wato/builtin_attributes.py | 2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a7f77b6..28fd26f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2441,6 +2441,11 @@ class Attribute:
def show_in_table(self):
return self._show_in_table
+ # Wether or not to show this attribute in the edit form.
+ # This value is set by declare_host_attribute
+ def show_in_form(self):
+ return self._show_in_form
+
# Wether or not to make this attribute configurable in
# files and folders (as defaule value for the hosts)
def show_in_folder(self):
@@ -2729,11 +2734,12 @@ host_attributes = []
host_attribute = {}
# Declare attributes with this method
-def declare_host_attribute(a, show_in_table = True, show_in_folder = True, topic = None):
+def declare_host_attribute(a, show_in_table = True, show_in_folder = True, topic = None, show_in_form = True):
host_attributes.append((a, topic))
host_attribute[a.name()] = a
- a._show_in_table = show_in_table
+ a._show_in_table = show_in_table
a._show_in_folder = show_in_folder
+ a._show_in_form = show_in_form
# Read attributes from HTML variables
def collect_attributes(do_validate = True):
@@ -2766,7 +2772,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute
# appearance. If only one topic exists, do not show topics
topics = []
for attr, topic in host_attributes:
- if topic not in topics:
+ if topic not in topics and attr.show_in_form():
topics.append(topic)
for topic in topics:
@@ -2788,6 +2794,10 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute
if attrname in without_attributes:
continue # e.g. needed to skip ipaddress in CSV-Import
+ # Skip hidden attributes
+ if not attr.show_in_form():
+ continue
+
# In folder/file not all attributes are shown
if for_what == "folder" and not attr.show_in_folder():
continue
diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py
index c128bce..5235b11 100644
--- a/web/plugins/wato/builtin_attributes.py
+++ b/web/plugins/wato/builtin_attributes.py
@@ -38,4 +38,4 @@ declare_host_attribute(IPAddressAttribute("ipaddress", _("IP Address"),
declare_host_attribute(EnumAttribute("dirty", _("Dirty"),
_("Modified since last "Active Changes"?"),
"No", [ ('no', _('No')), ('yes', _('Yes'))]),
- show_in_table = False, show_in_folder = False)
+ show_in_table = False, show_in_folder = False, show_in_form = False)
Module: check_mk
Branch: master
Commit: 86ea4afaa39dcacbf65d85948f70a13104b773dc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86ea4afaa39dca…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Aug 12 11:54:32 2011 +0200
Windows agent: handle quotes in directory name
In 64 Bit systems there is reported to be quotes in the registry
entry of the services directory. These quotes are now removed.
Unfortunately I could not test this myself. The normal case is
still working.
---
ChangeLog | 1 +
agents/windows/check_mk_agent.cc | 8 +++++++-
agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 73886d4..c858576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
* FIX: lnx_if/if/if64: ignore percentual traffic levels on NICs without
speed information.
* FIX: cisco_temp_perf: add critical level to performance data
+ * FIX: windows agent: hopefully fix case with quotes in directory name
* brocade_port: check for Brocade FC ports has been rewritten with
lots of new features.
* AIX agent now simulates <<<netctr>>> output (by Jörg Linge)
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 67689cc..ecef22c 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1139,8 +1139,14 @@ void get_agent_dir(char *buffer, int size)
while (end > buffer && *end != '\\')
end--;
*end = 0; // replace \ with string end => get directory of executable
+
+ // Handle case where name is quoted with double quotes.
+ // This is reported to happen on some 64 Bit systems when spaces
+ // are in the directory name.
+ if (*buffer == '"') {
+ memmove(buffer, buffer + 1, strlen(buffer));
+ }
}
- size = dsize;
RegCloseKey(key);
}
else {
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index bce338b..fff041c 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ