Module: check_mk
Branch: master
Commit: 2155bfcd02cc9831b96ee93a5ad590b7f7de078d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2155bfcd02cc98…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 11:24:50 2013 +0100
FIX: Parameter --cleanup-autochecks (long for -u) works now like suggested in help
---
.bugs/746 | 7 +++++--
ChangeLog | 1 +
modules/check_mk.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.bugs/746 b/.bugs/746
index 650eb13..95f0fa9 100644
--- a/.bugs/746
+++ b/.bugs/746
@@ -1,8 +1,11 @@
Title: check_mk --cleanup-autochecks shows usage message instead of performing operation.
Component: core
-State: open
+Class: nastiness
+State: done
Date: 2012-10-11 10:49:23
Targetversion: future
-Class: nastiness
The documentation suggests that check_mk --cleanup-autochecks is synonymous with check_mk -u but when I run check_mk --cleanup-autochecks it reports a usage error instead of performing the operation. When I run check_mk -u, it does not report the usage message.
+
+2013-01-03 11:24:01: changed state open -> done
+Fixed this issue. No cleanup was performed with the long format parameter.
diff --git a/ChangeLog b/ChangeLog
index d9a93de..266f42a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* Output better error message in case of old inventory function
* Do object cache precompile for monitoring core on cmk -R/-O
* Avoid duplicate verification of monitoring config on cmk -R/-O
+ * FIX: Parameter --cleanup-autochecks (long for -u) works now like suggested in help
Notifications:
* Fix flexible notifications on non-OMD systems
diff --git a/modules/check_mk.py b/modules/check_mk.py
index f79f889..a35e1cb 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -4717,7 +4717,7 @@ if __name__ == "__main__":
opt_showperfdata = True
elif o == '-n':
opt_dont_submit = True
- elif o == '-u':
+ elif o in [ '-u', '--cleanup-autochecks' ]:
opt_cleanup_autochecks = True
elif o == '--fake-dns':
fake_dns = a
Module: check_mk
Branch: master
Commit: dfef29c6d5d00e8133c2816f6923dbf456fc2c03
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfef29c6d5d00e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 11:00:02 2013 +0100
FIX: Speedometer: Terminating data updates when snapin is removed from sidebar
---
ChangeLog | 1 +
web/plugins/sidebar/shipped.py | 12 +++++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e3df7e..d9a93de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@
* Option dials (refresh, number of columns) now turnable by mouse wheel
* FIX: Sidebar not raising exceptions on configured but not available snapins
* FIX: Quicksearch: Fixed Up/Down arrow handling in chrome
+ * FIX: Speedometer: Terminating data updates when snapin is removed from sidebar
WATO:
* FIX: Fixed generated manual check definitions for checks without items
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index 339aab2..b869586 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -656,7 +656,11 @@ def render_speedometer():
html.javascript("""
function show_speed(percentage) {
- var context = document.getElementById('speedometer').getContext('2d');
+ var canvas = document.getElementById('speedometer');
+ if (!canvas)
+ return;
+
+ var context = canvas.getContext('2d');
if (!context)
return;
@@ -701,6 +705,12 @@ function speedometer_show_speed(last_perc, program_start, scheduled_rate)
title = code[4];
oDiv = document.getElementById('speedometer');
+
+ // Terminate reschedule when the speedometer div does not exist anymore
+ // (e.g. the snapin has been removed)
+ if (!oDiv)
+ return;
+
oDiv.title = title
oDiv = document.getElementById('speedometerbg');
oDiv.title = title
Module: check_mk
Branch: master
Commit: 12dc9c5064b025a750bf8a3dcc2b5711e2155649
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12dc9c5064b025…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 11:10:32 2013 +0100
Updated bug entries #0874, #0811
---
.bugs/811 | 7 +++++--
.bugs/874 | 10 ++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.bugs/811 b/.bugs/811
index c52ad1d..ca511fa 100644
--- a/.bugs/811
+++ b/.bugs/811
@@ -1,9 +1,9 @@
Title: Multisite does not display local check man pages
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2012-11-16 10:39:32
Targetversion: 1.2.0
-Class: bug
If you install an MKP and it brings a check man page this man page is not
displayed from Multisite, instead it gives an error about not finding the
@@ -14,3 +14,6 @@ LM: This is already implemented, but with the nastyness, that the regular
check manpages are placed in share/doc/check_mk/checks but the local
check manpages are searched in local/share/check_mk/checkman. This should
be cleaned up!
+
+2013-01-03 11:08:57: changed state open -> done
+This is already solved. I open a new bug for the path nastiness
diff --git a/.bugs/874 b/.bugs/874
new file mode 100644
index 0000000..62a68b5
--- /dev/null
+++ b/.bugs/874
@@ -0,0 +1,10 @@
+Title: Cleanup OMD manpage paths
+Component: core
+State: open
+Date: 2013-01-03 11:09:30
+Targetversion: future
+Class: nastiness
+
+The regular check manpage path in OMD is share/doc/check_mk/checks but the local path
+is local/share/check_mk/checkman. This is confusing. Cleanup the normal/local paths to
+make them equal.
Module: check_mk
Branch: master
Commit: 717b393ab7da8a1d613f89b84d321f0283aaa1a3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717b393ab7da8a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 10:58:15 2013 +0100
Updated bug entries #0872
---
.bugs/872 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.bugs/872 b/.bugs/872
index dfc0f4e..420abf5 100644
--- a/.bugs/872
+++ b/.bugs/872
@@ -1,12 +1,15 @@
-Title: Sidebar does not terminate refresh jobs of removed snapins
+Title: Speedometer scheduler is not terminated when removed from sidebar
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2012-10-29 09:20:48
Targetversion: future
-Class: bug
When having e.g. the speedometer in the sidebar and removing it, the javascript worker code
remains fetching the speedometer webservice. The worker should detect that the snapin has
been removed and stop updating the data.
Not a general problem: The speedometer uses its own scheduler. Must be fixed individually.
+
+2013-01-03 10:58:12: changed state open -> done
+The speedometer timeout detects the removal of the snpain and terminates itselfs now.
Module: check_mk
Branch: master
Commit: 9ae7fb1f18c21240d8a3e4f22cba8fb6b735c1bf
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae7fb1f18c212…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 09:57:40 2013 +0100
FIX: Sidebar not raising exceptions on configured but not available snapins
---
ChangeLog | 1 +
web/htdocs/sidebar.py | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9d3eb83..a19f579 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
* FIX: handle ldap logins with ',' in distinguished name
* FIX: quote HTML variable names, fixes potential JS injection
* Option dials (refresh, number of columns) now turnable by mouse wheel
+ * FIX: Sidebar not raising exceptions on configured but not available snapins
WATO:
* FIX: Fixed generated manual check definitions for checks without items
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index e4cb533..fbfed65 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -116,7 +116,11 @@ def load_user_config():
user_config = config.sidebar
# Remove entries the user is not allowed for or which have state "off" (from legacy version)
- return [ entry for entry in user_config if entry[1] != "off" and config.may("sidesnap." + entry[0])]
+ # silently skip configured but not existant snapins
+ return [ entry for entry in user_config
+ if entry[0] in sidebar_snapins
+ and entry[1] != "off"
+ and config.may("sidesnap." + entry[0])]
def save_user_config(user_config):
if config.may("general.configure_sidebar"):
Module: check_mk
Branch: master
Commit: ede18e27b704b62b1d50693ffecc019c9ad2c25d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ede18e27b704b6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 3 09:43:31 2013 +0100
Allowing "%" and "+" in mail prefixes of contacts now
---
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7125342..9d3eb83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@
* Modularized the authentication and user management code
* Default config: add contact group 'all' and put all hosts into it
* Reverse order of Condition, Value and General options in rule editor
+ * Allowing "%" and "+" in mail prefixes of contacts now
Event Console:
* FIX: fix exception in rules that use facility local7
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 5f5b2a8..77ba498 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7924,7 +7924,7 @@ def mode_edit_user(phase):
# Email address
email = html.var("email").strip()
- regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$-znba55ab8jc'
+ regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.+%]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$-znba55ab8jc'
if email and not re.match(regex_email, email):
raise MKUserError("email", _("'%s' is not a valid email address." % email))
new_user["email"] = email