Module: check_mk
Branch: master
Commit: 7eea087784568224bc0a2464126fba4d2aed59c4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eea0877845682…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 14 09:56:08 2017 +0200
4993 FIX Fixed visibility of events for users with limited access to events
When a user is not permitted to see all events and can only see the events
of the host he/she is a contact for and maybe also events not related to
a host existing in the monitoring core the tactical overview snapin counted
the numbers of open events not correctly.
The event list view was filtering wrong in case a user has the "see all"
permission and not the "see unrelated" permission.
Change-Id: I475a6adfcf8501feafc9f0c2064de477cefe9203
---
.werks/4993 | 17 +++++++++++++++++
web/plugins/sidebar/shipped.py | 8 ++++++++
web/plugins/views/mkeventd.py | 2 +-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/.werks/4993 b/.werks/4993
new file mode 100644
index 0000000..d01ad31
--- /dev/null
+++ b/.werks/4993
@@ -0,0 +1,17 @@
+Title: Fixed visibility of events for users with limited access to events
+Level: 1
+Component: ec
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1500018808
+
+When a user is not permitted to see all events and can only see the events
+of the host he/she is a contact for and maybe also events not related to
+a host existing in the monitoring core the tactical overview snapin counted
+the numbers of open events not correctly.
+
+The event list view was filtering wrong in case a user has the "see all"
+permission and not the "see unrelated" permission.
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index c0e7d2c..d069b6c 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -613,6 +613,13 @@ def get_tactical_overview_data(extra_filter_headers):
"Filter: host_custom_variable_names < _REALNAME\n" + \
extra_filter_headers
+ # In case the user is not allowed to see unrelated events
+ ec_filters = ""
+ if not config.user.may("mkeventd.seeall") and not config.user.may("mkeventd.seeunrelated"):
+ ec_filters = "Filter: event_contact_groups != \n" \
+ + "Filter: host_name != \n" \
+ + "Or: 2\n"
+
event_query = (
# "Events" column
"GET eventconsoleevents\n"
@@ -630,6 +637,7 @@ def get_tactical_overview_data(extra_filter_headers):
"Stats: event_state != 0\n"
"Stats: event_host_in_downtime != 1\n"
"StatsAnd: 3\n"
+ + ec_filters
)
try:
diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py
index 32d7497..99c5420 100644
--- a/web/plugins/views/mkeventd.py
+++ b/web/plugins/views/mkeventd.py
@@ -57,7 +57,7 @@ def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, t
_ec_filter_host_information_of_not_permitted_hosts(rows)
- if not config.user.may("mkeventd.seeunrelated"):
+ if not config.user.may("mkeventd.seeall") and not config.user.may("mkeventd.seeunrelated"):
# user is not allowed to see all events returned by the core
rows = [ r for r in rows if r["event_contact_groups"] != [] or r["host_name"] != "" ]
Module: check_mk
Branch: master
Commit: dbd467c014df21201c90cd44efb41db4ab91eb16
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd467c014df21…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 14 12:14:00 2017 +0200
4996 FIX Backup targets: Fixed possible MemoryError exception when editing a target
When saving a backup target a MemoryException() could occur while checking whether
or not the target is writable for the current user.
Change-Id: I2b8ff90eb914b48af213af11433357520b80073f
---
.werks/4996 | 12 ++++++++++++
web/htdocs/backup.py | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/4996 b/.werks/4996
new file mode 100644
index 0000000..1e2f1f3
--- /dev/null
+++ b/.werks/4996
@@ -0,0 +1,12 @@
+Title: Backup targets: Fixed possible MemoryError exception when editing a target
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1500027168
+
+When saving a backup target a MemoryException() could occur while checking whether
+or not the target is writable for the current user.
diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py
index 8dfa7dd..28a2f98 100644
--- a/web/htdocs/backup.py
+++ b/web/htdocs/backup.py
@@ -36,6 +36,7 @@ import shutil
import signal
import socket
import subprocess
+import time
try:
import simplejson as json
@@ -1361,9 +1362,8 @@ class BackupTargetLocal(BackupTargetType):
"need to specify an already existing directory."))
# Check write access for the site user
- test_file_path = os.tempnam(value, "write_test")
try:
- file(test_file_path, "w")
+ file(os.path.join(value, "write_test_%d" % time.time()), "w")
os.unlink(test_file_path)
except IOError, e:
if is_cma():
Module: check_mk
Branch: master
Commit: 5855164491451d95e949db544c077d16de79f52f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5855164491451d…
Author: Andreas Umbreit <au(a)mathias-kettner.de>
Date: Fri Jul 14 08:59:28 2017 +0200
4563 FIX Fix issue with @ in metric title
The @ sign is used to append a custom unit when used within metric titles.
This prevents graphs from being displayed when an @ without a special meaning
appears within a metric title. The graphing system now checks for an
existing unit within the metric title amd leaves the title untouched otherwise.
Change-Id: Ic7657bd01b779385851a7a2bfac4e9c27285c685
---
.werks/4563 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.werks/4563 b/.werks/4563
new file mode 100644
index 0000000..bfe7858
--- /dev/null
+++ b/.werks/4563
@@ -0,0 +1,14 @@
+Title: Fix issue with @ in metric title
+Level: 1
+Component: metrics
+Class: fix
+Compatible: compat
+Edition: cee
+State: unknown
+Version: 1.5.0i1
+Date: 1500015054
+
+The @ sign is used to append a custom unit when used within metric titles.
+This prevents graphs from being displayed when an @ without a special meaning
+appears within a metric title. The graphing system now checks for an
+existing unit within the metric title and leaves the title untouched otherwise.
Module: check_mk
Branch: master
Commit: 83bc27e26c1e013c162f7097d9703bbcbc3f59ef
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bc27e26c1e01…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jul 13 16:43:52 2017 +0200
datasource_programs.py
updated netapp help text
Change-Id: I45b1cf405266c114c5c6e752a8493b72a8598a88
---
web/plugins/wato/datasource_programs.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py
index d6a92da..8b4d987 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -312,9 +312,7 @@ register_rule(group,
),
title = _("Check NetApp via WebAPI"),
help = _("This rule set selects the NetApp special agent instead of the normal Check_MK Agent "
- "and allows monitoring via the NetApp Web API. Important: To get this agent running, you need to "
- "install two additional python files (<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) from the "
- "NetApp Manageabiltiy SDK into the <tt>~/local/lib/python</tt> directory. To access the data the "
+ "and allows monitoring via the NetApp Web API. To access the data the "
"user requires permissions to several API classes. They are shown when you call the agent with "
"<tt>agent_netapp --help</tt>. The agent itself is located in the site directory under "
"<tt>~/share/check_mk/agents/special</tt>."),
Module: check_mk
Branch: master
Commit: 812188098445cc0f002faf35614eb45cc282b56f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=812188098445cc…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jul 13 14:30:24 2017 +0200
5018 FIX Handle vanished service groups correctly
When a service group vanished and the "servicesbygroup" table was queried,
the Micro Core could crash. This has been fixed now.
Change-Id: Ie5cac85be23241396484efc7e99099eb063aea30
---
.werks/5018 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.werks/5018 b/.werks/5018
new file mode 100644
index 0000000..b9c243d
--- /dev/null
+++ b/.werks/5018
@@ -0,0 +1,11 @@
+Title: Handle vanished service groups correctly
+Level: 1
+Component: livestatus
+Compatible: compat
+Edition: cee
+Version: 1.5.0i1
+Date: 1499948890
+Class: fix
+
+When a service group vanished and the "servicesbygroup" table was queried,
+the Micro Core could crash. This has been fixed now.