Module: check_mk
Branch: master
Commit: 44dc80c6a114a2a93ee0879a584c9ed0c450331f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dc80c6a114a2…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Thu Dec 12 15:09:46 2013 +0100
FIX CSV export of event console was broken
For views of event console the CSV export did produce a file containing only
an error message. This is fixed now.
---
.werks/89 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/htmllib.py | 2 ++
3 files changed, 12 insertions(+)
diff --git a/.werks/89 b/.werks/89
new file mode 100644
index 0000000..e7ea43e
--- /dev/null
+++ b/.werks/89
@@ -0,0 +1,9 @@
+Title: CSV export of event console was broken
+Level: 2
+Component: ec
+Version: 1.2.3i8
+Date: 1386857228
+Class: fix
+
+For views of event console the CSV export did produce a file containing only
+an error message. This is fixed now.
diff --git a/ChangeLog b/ChangeLog
index 665aad2..6f2b8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
* 0301 Handling messages of special syslog format correctly...
* 0303 FIX: Old log entries were shown in event history first...
* 0304 FIX: Escaping several unwanted chars from incoming log messages...
+ * 0089 FIX: CSV export of event console was broken...
1.2.3i7:
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index c628238..b9374a7 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -1167,6 +1167,8 @@ class html:
# remove all HTML-tags
def strip_tags(self, ht):
+ if type(ht) not in [str, unicode]:
+ return ht
while True:
x = ht.find('<')
if x == -1:
Module: check_mk
Branch: master
Commit: 58d94555e91f6123d0f164713a0ee7f7f7de41fd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58d94555e91f61…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Thu Dec 12 11:51:31 2013 +0100
improved online help for WATO rules according specific ports
---
web/htdocs/wato.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index eae4f73..2ac0aa8 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11734,8 +11734,10 @@ def mode_edit_rule(phase, new = False):
html.help(rulespec["itemhelp"])
else:
html.help(_("You can make the rule apply only to certain services of the "
- "specified hosts. Do this by specifying explicit items to match "
- "here. <b>Note:</b> the match is done on the <u>beginning</u> "
+ "specified hosts. Do this by specifying explicit <b>items</b> to "
+ "match here. <b>Hint:</b> make sure to enter the item only, "
+ "not the full Service description. "
+ "<b>Note:</b> the match is done on the <u>beginning</u> "
"of the item in question. Regular expressions are interpreted, "
"so appending a <tt>$</tt> will force an exact match."))
else:
fixed catalog categorization
Message-ID: <52a986bc.siFWJuIelS5gT15g%bs(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: 66530d0b4ee81ea9844c69182ee48dd5cb483e32
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66530d0b4ee81e…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Thu Dec 12 10:49:43 2013 +0100
hyperv_vms: improved check manpage, fixed catalog categorization
---
checkman/hyperv_vms | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/checkman/hyperv_vms b/checkman/hyperv_vms
index 15a037b..c3e781e 100644
--- a/checkman/hyperv_vms
+++ b/checkman/hyperv_vms
@@ -1,10 +1,10 @@
-title: Hyperview Server: State of VMs
+title: Hyper-V Server: State of VMs
agents: windows
-catalog: app/hyperview
+catalog: os/services
license: GPL
distribution: check_mk
description:
- This checks queries a hyperview server via an agent plugin (hyperv_vms.ps1) and
+ This checks queries a Microsoft Hyper-V Server via an agent plugin (hyperv_vms.ps1) and
checks if the current state of the VM equals to the state detected during the inventory.
The check produces an error after the state has changed.