Module: check_mk
Branch: master
Commit: 87ed404c51f02ca89db3140e4c65d37b4a356b24
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ed404c51f02c…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Jan 14 10:20:35 2015 +0100
In the previous version a interface group could only get created out of
interfaces which shared the same interface type.
With this update you can now specify grouped interfaces by their type as well
as their item name. Keep in mind that the item name depends on the parameters
<tt>if_inventory_uses_alias</tt> or <tt>if_inventory_uses_description</tt>.
---
.werks/1668 | 14 +++++++
ChangeLog | 1 +
checkman/if | 9 ++--
checkman/if64 | 9 ++--
checkman/if_lancom | 9 ++--
checkman/lnx_if | 9 ++--
checkman/mcdata_fcport | 9 ++--
checkman/netapp_api_if | 9 ++--
checks/if.include | 76 +++++++++++++++++++++-------------
web/plugins/wato/check_parameters.py | 16 ++++---
10 files changed, 110 insertions(+), 51 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=87ed404c51…
Module: check_mk
Branch: master
Commit: 8ebfa97b92f6495b9e82ba028cae0fe980dc8660
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ebfa97b92f649…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 14 09:46:05 2015 +0100
Fixed typo in host rename result output
---
web/htdocs/wato.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index d6bd702..7ddf0a8 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2392,7 +2392,7 @@ def rename_host(host, newname):
elif what == "history":
actions.append(_("Monitoring history entries (events and availability)"))
elif what == "retention":
- actions.append(_("The current monitoring state (including ackowledgements and downtimes)"))
+ actions.append(_("The current monitoring state (including acknowledgements and downtimes)"))
elif what == "ipfail":
actions.append("<div class=error>%s</div>" % (_("<b>WARNING:</b> the IP address lookup of "
"<tt>%s</tt> has failed. The core has been started by using the address <tt>0.0.0.0</tt> for the while. "
Module: check_mk
Branch: master
Commit: e86f4658a0a95a06faa3d6d374176f6aa24ca08f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e86f4658a0a95a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jan 13 14:36:55 2015 +0100
#1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of the day
With this new check parameter you can make the check go critical only during certain
times of the day. That way you can for example say: Between 8:00 and 9:00 this must
exist a certain file, but otherwise it is not neccessary.
---
.werks/1841 | 11 +++++++++++
ChangeLog | 1 +
checks/fileinfo | 36 +++++++++++++++++++++++++++++-----
web/htdocs/valuespec.py | 34 +++++++++++++++++++++++++++++---
web/htdocs/wato.py | 9 +++++----
web/plugins/wato/check_parameters.py | 15 ++++++++++++--
6 files changed, 92 insertions(+), 14 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e86f4658a0…
Module: check_mk
Branch: master
Commit: c4ee98c914bd3680509346cf6d4e15fd75d94b07
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4ee98c914bd36…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Jan 13 13:17:29 2015 +0100
#1212 FIX Fixed default value in wato parameter page for timeperiods
In some cases wato has shown the wrong default values on the parameter page for all rules
based on time periods (e.g. check period, notification period)
---
.werks/1212 | 12 ++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 3 +++
3 files changed, 16 insertions(+)
diff --git a/.werks/1212 b/.werks/1212
new file mode 100644
index 0000000..f225e1f
--- /dev/null
+++ b/.werks/1212
@@ -0,0 +1,12 @@
+Title: Fixed default value in wato parameter page for timeperiods
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421151221
+
+In some cases wato has shown the wrong default values on the parameter page for all rules
+based on time periods (e.g. check period, notification period)
+
diff --git a/ChangeLog b/ChangeLog
index f9d3804..6531c0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@
* 1794 FIX: Fix exception in WATO service list in case of vanished checks
* 1805 FIX: Changing roles marks sites where users can login dirty for sync now...
* 1211 FIX: Fixed g_git_messages error on activate changes...
+ * 1212 FIX: Fixed default value in wato parameter page for timeperiods...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 362ce2e..34599bb 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9806,6 +9806,9 @@ class TimeperiodSelection(ElementSelection):
[ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ])
return elements
+ def default_value(self):
+ return "24x7"
+
# Check if a timeperiod is currently in use and cannot be deleted
# Returns a list of occurrances.
# Possible usages:
Module: check_mk
Branch: master
Commit: b0b3f5e4217ad4f9cc737174d980c56c5e647ab9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b3f5e4217ad4…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Jan 13 13:07:10 2015 +0100
#1211 FIX Fixed g_git_messages error on activate changes
Randomly there was a error message while activate changes g_git_messages, referenced before assignment. This
should be fixed now.
---
.werks/1211 | 12 ++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 8 +++-----
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.werks/1211 b/.werks/1211
new file mode 100644
index 0000000..fb476d6
--- /dev/null
+++ b/.werks/1211
@@ -0,0 +1,12 @@
+Title: Fixed g_git_messages error on activate changes
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421150687
+
+Randomly there was a error message while activate changes g_git_messages, referenced before assignment. This
+should be fixed now.
+
diff --git a/ChangeLog b/ChangeLog
index ad00190..f9d3804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@
* 1790 FIX: Fix WATO parameters page for passive checks...
* 1794 FIX: Fix exception in WATO service list in case of vanished checks
* 1805 FIX: Changing roles marks sites where users can login dirty for sync now...
+ * 1211 FIX: Fixed g_git_messages error on activate changes...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 00fefa3..362ce2e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -173,8 +173,6 @@ wato_styles = [ "pages", "wato", "status" ]
def page_handler():
global g_html_head_open
g_html_head_open = False
- global g_git_messages
- g_git_messages = []
if not config.wato_enabled:
raise MKGeneralException(_("WATO is disabled. Please set <tt>wato_enabled = True</tt>"
@@ -11232,9 +11230,6 @@ def page_automation():
if secret != get_login_secret():
raise MKAuthException(_("Invalid automation secret."))
- global g_git_messages
- g_git_messages = []
-
# To prevent mixups in written files we use the same lock here as for
# the normal WATO page processing. This might not be needed for some
# special automation requests, like inventory e.g., but to keep it simple,
@@ -18457,6 +18452,9 @@ modes = {
loaded_with_language = False
def load_plugins():
+ global g_git_messages
+ g_git_messages = []
+
global loaded_with_language
if loaded_with_language == current_language:
return
Module: check_mk
Branch: master
Commit: 473db9a63fb65734f19f94b2afb1412d9682b5a5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473db9a63fb657…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Jan 13 11:03:43 2015 +0100
#1667 Sidebar snapin 'Tree of Folders' and 'WATO folder' filter now available on slave sites
The multisite filter <i>WATO folder</i> was not available on slave sites with disabled WATO.
The <i>Tree of Folders</i> snapin was available even if WATO was disabled.
If you clicked on a link on the <i>Tree of Folders</i> snapin the upcoming page displayed
wrong information because the <i>WATO folder</i> filter was missing.
This has been fixed.
The new behaviour:
<ul>
<li>Slave site:<i>Tree of Folders</i> snapin is always available</li>
<li>Slave site:<i>WATO folder</i> filter is always available</li>
<li>Master site:<i>Tree of Folders</i> snapin is not available if WATO is disabled</li>
<li>Master site:<i>WATO folder</i> filter not available if WATO is disabled</li>
</ul>
---
.werks/1667 | 22 ++++++++++++++++++++++
ChangeLog | 1 +
web/htdocs/visuals.py | 4 ++--
web/plugins/sidebar/wato.py | 9 +++++++++
web/plugins/visuals/wato.py | 7 ++++++-
5 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/.werks/1667 b/.werks/1667
new file mode 100644
index 0000000..96b6b2b
--- /dev/null
+++ b/.werks/1667
@@ -0,0 +1,22 @@
+Title: Sidebar snapin 'Tree of Folders' and 'WATO folder' filter now available on slave sites
+Level: 1
+Component: multisite
+Class: feature
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421142996
+
+The multisite filter <i>WATO folder</i> was not available on slave sites with disabled WATO.
+The <i>Tree of Folders</i> snapin was available even if WATO was disabled.
+If you clicked on a link on the <i>Tree of Folders</i> snapin the upcoming page displayed
+wrong information because the <i>WATO folder</i> filter was missing.
+This has been fixed.
+
+The new behaviour:
+<ul>
+<li>Slave site:<i>Tree of Folders</i> snapin is always available</li>
+<li>Slave site:<i>WATO folder</i> filter is always available</li>
+<li>Master site:<i>Tree of Folders</i> snapin is not available if WATO is disabled</li>
+<li>Master site:<i>WATO folder</i> filter not available if WATO is disabled</li>
+</ul>
diff --git a/ChangeLog b/ChangeLog
index 1e2fe51..ad00190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@
* 1776 Dashboard: Allowing unicode characters in static text dashlet
* 1210 New Downtime Filter for comments...
* 1811 Added new filter for regex based filtering of contacts to log based views...
+ * 1667 Sidebar snapin 'Tree of Folders' and 'WATO folder' filter now available on slave sites...
* 1781 FIX: Fix broken grouping by host/service group in availability
* 1783 FIX: Finish the view "History of Scheduled Downtimes"...
* 1206 FIX: Hostname not longer shown as column in host views
diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py
index e35205e..afc8b32 100644
--- a/web/htdocs/visuals.py
+++ b/web/htdocs/visuals.py
@@ -887,9 +887,9 @@ def filters_of_visual(visual, info_keys, show_all=False):
# add ubiquitary_filters that are possible for these infos
for fn in ubiquitary_filters:
# Disable 'wato_folder' filter, if WATO is disabled or there is a single host view
- if fn == "wato_folder" and (not config.wato_enabled or 'host' in visual['single_infos']):
- continue
filter = get_filter(fn)
+ if fn == "wato_folder" and (not filter.available() or 'host' in visual['single_infos']):
+ continue
if not filter.info or filter.info in info_keys:
filters.append(filter)
diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py
index afbf458..cb3adfc 100644
--- a/web/plugins/sidebar/wato.py
+++ b/web/plugins/sidebar/wato.py
@@ -212,6 +212,15 @@ def render_tree_folder(f, js_func):
def render_wato_foldertree():
+ is_slave_site = not wato.is_distributed() and os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk")
+ if not is_slave_site:
+ if not config.wato_enabled:
+ html.write(_("WATO is disabled."))
+ return False
+ elif not config.may("wato.use"):
+ html.write(_("You are not allowed to use Check_MK's web configuration GUI."))
+ return False
+
user_folders = compute_foldertree()
#
diff --git a/web/plugins/visuals/wato.py b/web/plugins/visuals/wato.py
index a910957..4185f7d 100644
--- a/web/plugins/visuals/wato.py
+++ b/web/plugins/visuals/wato.py
@@ -32,7 +32,12 @@ class FilterWatoFile(Filter):
self.last_wato_data_update = None
def available(self):
- return config.wato_enabled and wato.have_folders()
+ # This filter is also available on slave sites with disabled WATO
+ # To determine if this site is a slave we check the existance of the distributed_wato.mk
+ # file and the absence of any site configuration
+ return (config.wato_enabled or\
+ (not wato.is_distributed() and os.path.exists(defaults.check_mk_configdir + "/distributed_wato.mk")))\
+ and wato.have_folders()
def load_wato_data(self):
self.tree = wato.get_folder_tree()