Module: check_mk
Branch: master
Commit: d30442fe972d0fbd95410b2ee23b7ddb09940039
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d30442fe972d0f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 09:28:56 2013 +0100
Updated bug entries #0836
---
.bugs/836 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/836 b/.bugs/836
index 0a4b72d..d20f081 100644
--- a/.bugs/836
+++ b/.bugs/836
@@ -1,8 +1,11 @@
Title: libpcap is missing in debian
Component: core
-State: open
+Class: bug
+State: done
Date: 2013-11-07 17:42:36
Targetversion: 1.2.2
-Class: bug
On Debian with cmc, the libpcap is missing but needed by the icmphelper. Leads to GBs of logfiles and high cpu load from cmc
+
+2013-12-16 09:28:53: changed state open -> done
+Just added the runtime dependency to our builds
Module: check_mk
Branch: master
Commit: f891e3aea8b4eb3ccef643a5b13ea5580dda23d1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f891e3aea8b4eb…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 09:34:55 2013 +0100
FIX Removed CSV export icon from availability views
The "Export as CSV" links on availability views resulted in broken pages and no exported
data. The CSV export has not been created for those views yet, so the export icon has
been removed for now.
---
.bugs/834 | 7 +++++--
.werks/325 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/htmllib.py | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/.bugs/834 b/.bugs/834
index ba1b624..caf8060 100644
--- a/.bugs/834
+++ b/.bugs/834
@@ -1,8 +1,11 @@
Title: CSV Export for reporting
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2013-10-30 10:21:43
Targetversion: 1.2.3i5
-Class: bug
Clicking on export to csv does not work.
+
+2013-12-16 09:32:36: changed state open -> done
+CSV export for availability has never been created. Simply removed the CSV export icon from those views
diff --git a/.werks/325 b/.werks/325
new file mode 100644
index 0000000..29cd78b
--- /dev/null
+++ b/.werks/325
@@ -0,0 +1,10 @@
+Title: Removed CSV export icon from availability views
+Level: 1
+Component: multisite
+Version: 1.2.3i8
+Date: 1387182799
+Class: fix
+
+The "Export as CSV" links on availability views resulted in broken pages and no exported
+data. The CSV export has not been created for those views yet, so the export icon has
+been removed for now.
diff --git a/ChangeLog b/ChangeLog
index bd21c90..b06f9dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
* 0239 FIX: Fixed incorrect html formatting when displaying host or service comments...
* 0307 FIX: Increased performance of multisite GUI with a large userbase...
* 0312 FIX: Hiding views related to not existing datasources, like the EC now...
+ * 0325 FIX: Removed CSV export icon from availability views...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index b9374a7..a9fb144 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -810,7 +810,7 @@ class html:
h += '<a target="_top" href="%s"><img class=statusicon src="images/status_pageurl.png" title="%s"></a>\n' % \
("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), _("URL to this page including sidebar"))
- if self.myfile == "view":
+ if self.myfile == "view" and self.var('mode') != 'availability':
# h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \
# (self.makeuri([("output_format", "json_export")]), _("Export as JSON"))
h += '<a target="_top" href="%s"><img class=statusicon src="images/icon_download_csv.png" title="%s"></a>\n' % \
Module: check_mk
Branch: master
Commit: 8b7c848182cf4354e3aac98bf2d67e9ab725f4e0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b7c848182cf43…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 10:09:03 2013 +0100
FIX hr_fs printer_supply: Improved translation of wrong encoded chars
Now both checks are using the charset defined in the ruleset <tt>snmp_character_encodings</tt>
for the host to decode strings which might contain umlauts with non utf8 encoding.
Also new: We assume a latin1 encoding by default, when no encoding is configured for a host.
---
.bugs/1064 | 7 +++++--
.bugs/838 | 7 +++++--
.bugs/972 | 8 ++++++--
.werks/326 | 12 ++++++++++++
ChangeLog | 1 +
checks/hr_fs | 2 ++
modules/snmp.py | 2 +-
7 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/.bugs/1064 b/.bugs/1064
index 3820e2a..5f2ce6d 100644
--- a/.bugs/1064
+++ b/.bugs/1064
@@ -1,8 +1,11 @@
Title: problem with strange encoding of Umlauts when querying windows SNMP agent
Component: checks
-State: open
+Class: bug
+State: done
Date: 2013-10-31 15:37:33
Targetversion: future
-Class: bug
for detailed description and snmp walk see ticket 13, customer geobasis
+
+2013-12-16 10:07:04: changed state open -> done
+Using encoding configured via the rule "snmp_character_encodings" now. Defaulting to latin-1 now.
diff --git a/.bugs/838 b/.bugs/838
index 0c9581f..981f20f 100644
--- a/.bugs/838
+++ b/.bugs/838
@@ -1,9 +1,9 @@
Title: Its not possible to add contacts groups to foulders if a minus is in name
Component: wato
-State: open
+Class: bug
+State: done
Date: 2013-12-10 10:09:51
Targetversion: 1.2.3i6
-Class: bug
From the german mailing list:
@@ -21,3 +21,6 @@ Ich vermute, dass es an einer Wato-Funktion liegt und beim Parsen des Namens etw
Der Fehler ist reproduzierbar.
+
+2013-12-16 09:36:27: changed state open -> done
+This bug has already been fixed some days/weeks ago.
diff --git a/.bugs/972 b/.bugs/972
index 304dcfc..c06832b 100644
--- a/.bugs/972
+++ b/.bugs/972
@@ -1,9 +1,9 @@
Title: parent scan fails after renaming a wato folder
Component: wato
-State: open
+Class: bug
+State: works4me
Date: 2013-08-09 16:33:23
Targetversion: 1.2.3i5
-Class: bug
mir ist folgendes in der Entwickler Version 2013.06.17 aufgefallen.
Kurzes Beispiel:
@@ -18,3 +18,7 @@ Versucht der Parent Scan in WATO die Hosts unter dem alten Ordner Namen
(Main Directory\Kunde\Hosts )zu finden und schlägt fehl. Alle bestehenden
Regeln wurden, einwandfrei auf den neuen Ordner angepasst. Hoffe das war
euch noch nicht bekannt, habe in der Bug Liste nichts dazu gefunden.
+
+2013-12-16 09:46:23: changed state open -> works4me
+I am unable to reproduce this problem with the current code. Assumint that
+this has already been fixed.
diff --git a/.werks/326 b/.werks/326
new file mode 100644
index 0000000..d41c219
--- /dev/null
+++ b/.werks/326
@@ -0,0 +1,12 @@
+Title: hr_fs printer_supply: Improved translation of wrong encoded chars
+Level: 1
+Component: checks
+Version: 1.2.3i8
+Date: 1387184828
+Class: fix
+
+Now both checks are using the charset defined in the ruleset <tt>snmp_character_encodings</tt>
+for the host to decode strings which might contain umlauts with non utf8 encoding.
+
+Also new: We assume a latin1 encoding by default, when no encoding is configured for a host.
+
diff --git a/ChangeLog b/ChangeLog
index b06f9dd..9fad6a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
* 0310 FIX: apache_status: Improved handling of unexpeted data sent by agents...
* 0088 FIX: esx_vsphere_datastores: fixed error with reported capacity of 0 bytes...
* 0243 FIX: cisco_qos: no longer crashes when the qos policy name is not set...
+ * 0326 FIX: hr_fs printer_supply: Improved translation of wrong encoded chars...
Multisite:
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE
diff --git a/checks/hr_fs b/checks/hr_fs
index 06287e4..22353e1 100644
--- a/checks/hr_fs
+++ b/checks/hr_fs
@@ -29,6 +29,7 @@ check_includes['hr_fs'] = [ "df.include" ]
def inventory_hr_fs(info):
mplist = []
for hrtype, hrdescr, hrunits, hrsize, hrused in info:
+ hrdescr = snmp_decode_string(hrdescr)
if hrtype in [ ".1.3.6.1.2.1.25.2.1.4" ] and \
hrdescr not in inventory_df_exclude_mountpoints and \
saveint(hrsize) != 0:
@@ -38,6 +39,7 @@ def inventory_hr_fs(info):
def check_hr_fs(item, params, info):
fslist = []
for hrtype, hrdescr, hrunits, hrsize, hrused in info:
+ hrdescr = snmp_decode_string(hrdescr)
if "patterns" in params or item == hrdescr:
unit_size = saveint(hrunits)
hrsize = saveint(hrsize)
diff --git a/modules/snmp.py b/modules/snmp.py
index ecf8e48..1df83b1 100644
--- a/modules/snmp.py
+++ b/modules/snmp.py
@@ -387,7 +387,7 @@ def snmp_decode_string(text):
if encoding:
return text.decode(encoding).encode("utf-8")
else:
- return text
+ return text.decode('latin1').encode('utf-8')
# .--Classic SNMP--------------------------------------------------------.
# | ____ _ _ ____ _ _ __ __ ____ |
Module: check_mk
Branch: master
Commit: d63c6d65c41d4ab17ecd622cd11aa452d8f0c817
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d63c6d65c41d4a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 16 09:12:13 2013 +0100
Updated bugs
---
.bugs/828 | 6 +++---
.bugs/config | 4 +---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.bugs/828 b/.bugs/828
index 86b54f9..9d51899 100644
--- a/.bugs/828
+++ b/.bugs/828
@@ -1,10 +1,10 @@
-Title: locale c.utf8 is missing at least in Debian Squeeze
+Title: locale C.UTF8 is missing at least in Debian Squeeze
Component: checks
State: open
Date: 2013-08-19 09:38:38
Targetversion: future
Class: bug
-If using Debian 6 with flexible notification system, plain e mail and umlauts
-in alias, the mail never receives the mail. Reason is the missing c.utf8
+If using Debian 6 with flexible notification system, plain email and umlauts
+in alias, the mail never receives the mail. Reason is the missing C.UTF8
locale. In german debian versions, there is only de_DE.utf8.
diff --git a/.bugs/config b/.bugs/config
index a81b6c3..e6b60c1 100644
--- a/.bugs/config
+++ b/.bugs/config
@@ -30,8 +30,6 @@ classes = [
]
targetversions = [
- "1.2.2",
- "1.2.3i5",
- "1.2.3i6",
+ "1.2.4",
"future",
]
Module: check_mk
Branch: master
Commit: dc80bea5cb3a0437780a12326b60f5fa62a66920
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc80bea5cb3a04…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 09:02:13 2013 +0100
FIX Hiding views related to not existing datasources, like the EC now
Customized views loading information from datasources which do not exist
anymore in multisite are now skipped during loading. In previous version,
these views resulted in exceptions / error messages in the GUI.
---
.bugs/1086 | 7 +++++--
.werks/312 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/views.py | 4 +++-
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.bugs/1086 b/.bugs/1086
index b248248..3784921 100644
--- a/.bugs/1086
+++ b/.bugs/1086
@@ -1,9 +1,9 @@
Title: Exception in views when EC views are missing
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2013-12-03 10:12:05
Targetversion: future
-Class: bug
When you enabled the Event Console, modify an EC view and afterwards
disabled the EC again, then the views the modified views base on
@@ -11,3 +11,6 @@ are missing - and also the columns and filters. This leads to exceptions
in other views.
Solution: validate views, catch exceptions.
+
+2013-12-16 09:00:27: changed state open -> done
+Has just been fixed. Only views for existing datasources are loaded into multisite now.
diff --git a/.werks/312 b/.werks/312
new file mode 100644
index 0000000..7a4ed7e
--- /dev/null
+++ b/.werks/312
@@ -0,0 +1,11 @@
+Title: Hiding views related to not existing datasources, like the EC now
+Level: 1
+Component: multisite
+Version: 1.2.3i8
+Date: 1387180830
+Class: fix
+
+Customized views loading information from datasources which do not exist
+anymore in multisite are now skipped during loading. In previous version,
+these views resulted in exceptions / error messages in the GUI.
+
diff --git a/ChangeLog b/ChangeLog
index 552663d..bd21c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE
* 0239 FIX: Fixed incorrect html formatting when displaying host or service comments...
* 0307 FIX: Increased performance of multisite GUI with a large userbase...
+ * 0312 FIX: Hiding views related to not existing datasources, like the EC now...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 1b7c118..067f0d8 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -261,7 +261,9 @@ def load_views():
for name, view in views.items():
view["owner"] = user
view["name"] = name
- html.multisite_views[(user, name)] = view
+
+ if view['datasource'] in multisite_datasources:
+ html.multisite_views[(user, name)] = view
except SyntaxError, e:
raise MKGeneralException(_("Cannot load views from %s/views.mk: %s") % (dirpath, e))