Module: check_mk
Branch: master
Commit: a059095a71a01ea372154293aa0b660c4ae88392
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a059095a71a01e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 29 08:34:52 2014 +0100
#1163 Service discovery: Added direct link to check parameter ruleset of services
This link was existing before. It had been replaced by a link to a page which lists
all rulesets affecting a service. This commit adds the link again as additional one to the
list of discovered services
---
.werks/1163 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/images/button_diagnose_hi.png | Bin 0 -> 3195 bytes
web/htdocs/images/button_diagnose_lo.png | Bin 0 -> 3963 bytes
web/htdocs/images/button_ignore_hi.png | Bin 0 -> 3326 bytes
web/htdocs/images/button_ignore_lo.png | Bin 0 -> 3640 bytes
web/htdocs/wato.py | 29 ++++++++---------------------
7 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.werks/1163 b/.werks/1163
new file mode 100644
index 0000000..6268f02
--- /dev/null
+++ b/.werks/1163
@@ -0,0 +1,11 @@
+Title: Service discovery: Added direct link to check parameter ruleset of services
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.2.5i6
+Date: 1414567986
+Class: feature
+
+This link was existing before. It had been replaced by a link to a page which lists
+all rulesets affecting a service. This commit adds the link again as additional one to the
+list of discovered services
diff --git a/ChangeLog b/ChangeLog
index b1761c1..957232e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,7 @@
* 1115 Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c...
* 1404 Make title/help of custom user attributes localizable...
* 1159 Remote BI Aggregations can now be configured to be checked as single services...
+ * 1163 Service discovery: Added direct link to check parameter ruleset of services...
* 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)...
* 1089 FIX: Snapshot restore: fixed exception during exception handling......
* 1091 FIX: logwatch patterns: allow unicode text in pattern comment
diff --git a/web/htdocs/images/button_diagnose_hi.png b/web/htdocs/images/button_diagnose_hi.png
new file mode 100644
index 0000000..15b6e00
Binary files /dev/null and b/web/htdocs/images/button_diagnose_hi.png differ
diff --git a/web/htdocs/images/button_diagnose_lo.png b/web/htdocs/images/button_diagnose_lo.png
new file mode 100644
index 0000000..8517c1d
Binary files /dev/null and b/web/htdocs/images/button_diagnose_lo.png differ
diff --git a/web/htdocs/images/button_ignore_hi.png b/web/htdocs/images/button_ignore_hi.png
new file mode 100644
index 0000000..59a7804
Binary files /dev/null and b/web/htdocs/images/button_ignore_hi.png differ
diff --git a/web/htdocs/images/button_ignore_lo.png b/web/htdocs/images/button_ignore_lo.png
new file mode 100644
index 0000000..6b4497d
Binary files /dev/null and b/web/htdocs/images/button_ignore_lo.png differ
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index b180543..18dfd15 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3300,10 +3300,6 @@ def show_service_table(host, firsttime):
table.cell(_("Check Parameters"))
if varname and varname in g_rulespecs:
rulespec = g_rulespecs[varname]
- url = make_link([("mode", "edit_ruleset"),
- ("varname", varname),
- ("host", hostname),
- ("item", mk_repr(item))])
try:
rulespec["valuespec"].validate_datatype(params, "")
rulespec["valuespec"].validate_value(params, "")
@@ -3314,30 +3310,22 @@ def show_service_table(host, firsttime):
html.write(paramtext)
- # # Strip all HTML code from the paramtext
- # table.cell("")
- # paramtext = paramtext.replace('</td>', '\t')
- # paramtext = paramtext.replace('</tr>', '\n')
- # paramtext = html.strip_tags(paramtext)
-
- # if parameter_column:
- # title = _("Edit the parameters of this services")
- # else:
- # title = _("Check parameters for this service") + ": \n" + paramtext
- # #html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' %
- # # (url, title))
-
# Icon for Service parameters. Not for missing services!
- table.cell("", "")
+ table.cell(css='buttons')
if state_type not in [ "new", "ignored" ]:
+ # Link to list of all rulesets affecting this service
params_url = make_link([("mode", "object_parameters"),
("host", hostname),
("service", descr)])
html.icon_button(params_url, _("View and modify the parameters for this service"), "rulesets")
+ url = make_link([("mode", "edit_ruleset"),
+ ("varname", varname),
+ ("host", hostname),
+ ("item", mk_repr(item))])
+ html.icon_button(url, _("Edit and analyze the check parameters of this services"), "diagnose")
# Permanently disable icon
- table.cell()
if state_type in ['new', 'old']:
url = make_link([
('mode', 'edit_ruleset'),
@@ -3350,8 +3338,7 @@ def show_service_table(host, firsttime):
('rule_folder', ''),
('back_mode', 'inventory'),
])
- html.write('<a href="%s"><img title="%s" class=icon src="images/icon_ignore.png"></a>' %
- (url, _("Create rule to permanently disable this service")))
+ html.icon_button(url, _("Create rule to permanently disable this service"), "ignore")
# Temporary ignore checkbox
table.cell()
Module: check_mk
Branch: master
Commit: 474ac311e8310101350c5665137170330f9b8f8d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=474ac311e83101…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Oct 28 13:49:57 2014 +0100
Werk 1426: fixed formatting
---
.werks/1426 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.werks/1426 b/.werks/1426
index 4c33031..6cd0a18 100644
--- a/.werks/1426
+++ b/.werks/1426
@@ -9,6 +9,6 @@ Class: fix
Sometimes the windows agent read error texts out of dll files.
Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path.
-However, there were instances were the prefix was <tt>%windir%</tt>.
-This placeholder was not replaced correctly. As a result the dll were not found,
+However, there were instances where the prefix was <tt>%windir%</tt>.
+This placeholder was not replaced correctly. As a result the dll could not get opened,
which lead to incorrect formatted texts.
Module: check_mk
Branch: master
Commit: d0a8fdcf8ddfdb7e3eb498a9ca4ad8a5598fdd5c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0a8fdcf8ddfdb…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Oct 28 13:48:08 2014 +0100
#1426 FIX windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)
Sometimes the windows agent read error texts out of dll files.
Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path.
However, there were instances were the prefix was <tt>%windir%</tt>.
This placeholder was not replaced correctly. As a result the dll were not found,
which lead to incorrect formatted texts.
---
.werks/1426 | 14 ++++++++++++++
ChangeLog | 1 +
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes
agents/windows/check_mk_agent.cc | 2 ++
agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes
agents/windows/install_agent-64.exe | Bin 160117 -> 160293 bytes
agents/windows/install_agent.exe | Bin 157057 -> 157222 bytes
10 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.werks/1426 b/.werks/1426
new file mode 100644
index 0000000..4c33031
--- /dev/null
+++ b/.werks/1426
@@ -0,0 +1,14 @@
+Title: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.5i6
+Date: 1414500095
+Class: fix
+
+Sometimes the windows agent read error texts out of dll files.
+Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path.
+
+However, there were instances were the prefix was <tt>%windir%</tt>.
+This placeholder was not replaced correctly. As a result the dll were not found,
+which lead to incorrect formatted texts.
diff --git a/ChangeLog b/ChangeLog
index af93fea..ca38465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
* 1373 SEC: Do not ouput complete command line when datasource programs fail...
* 1425 New section header option "encoding" for agent output...
* 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files...
+ * 1426 FIX: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)...
Checks & Agents:
* 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 49541f7..f906e18 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-94
+96
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 0ed2329..dd9dad1 100755
Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe
index defdda0..d73c2bc 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 20b166a..fa6b383 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1055,6 +1055,8 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch
// but not entirely for sure - C:\WINDOWS
if (strncasecmp(dllpath, "%SystemRoot%", 12) == 0)
snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 12);
+ else if (strncasecmp(dllpath, "%windir%", 8) == 0)
+ snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 8);
else
snprintf(dll_realpath, sizeof(dll_realpath), "%s", dllpath);
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index d088125..5ce8ccc 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe
index 952b59f..6288309 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 64da341..6acaa93 100755
Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 0b5ede7..900fbaa 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ