Module: check_mk
Branch: master
Commit: f5d6b37b3a58c3b54feb14285645b901d3eb12b1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5d6b37b3a58c3…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Mar 31 12:18:30 2017 +0200
Extracted standalone Makefile fragment for C++ executables.
Change-Id: I960a6c2ec5bc0d8c9edd803f5698ce89887cbe8d
---
active_checks/Makefile | 9 ++-------
bin/Makefile | 17 +----------------
standalone.make | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/active_checks/Makefile b/active_checks/Makefile
index 73ff386..de5fd73 100644
--- a/active_checks/Makefile
+++ b/active_checks/Makefile
@@ -22,10 +22,5 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-all: check_mkevents
-
-check_mkevents: check_mkevents.cc
- g++ -O2 -s -o check_mkevents check_mkevents.cc
-
-clean:
- rm -f check_mkevents
+EXECUTABLES := check_mkevents
+include ../standalone.make
diff --git a/bin/Makefile b/bin/Makefile
index 318d0f5..404d69f 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -22,20 +22,5 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-# TODO(sp) We should really use autotools here...
-ifneq ($(shell which g++-6 2>/dev/null),)
- CXX := g++-6
-else
- CXX := g++-5
-endif
-
-CXXFLAGS := -std=c++14 -g -O3 -Wall -Wextra
-LDFLAGS := -static-libstdc++
EXECUTABLES := mkevent mkeventd_open514
-
-.PHONY: all clean
-
-all: $(EXECUTABLES)
-
-clean:
- $(RM) $(EXECUTABLES)
+include ../standalone.make
diff --git a/standalone.make b/standalone.make
new file mode 100644
index 0000000..188f996
--- /dev/null
+++ b/standalone.make
@@ -0,0 +1,40 @@
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# tails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# TODO(sp) We should really use autotools here...
+ifneq ($(shell which g++-6 2>/dev/null),)
+ CXX := g++-6 -std=c++14
+else
+ CXX := g++-5 -std=c++14
+endif
+
+CXXFLAGS := -g -O3 -Wall -Wextra
+LDFLAGS := -static-libstdc++
+
+.PHONY: all clean
+
+all: $(EXECUTABLES)
+
+clean:
+ $(RM) $(EXECUTABLES)
Module: check_mk
Branch: master
Commit: 518c15ea979c6854ae6dd283d4190d5822ad75ba
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=518c15ea979c68…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Mar 30 13:57:19 2017 +0200
CME: Prevent WATO access on customer sites
Change-Id: I2d492b18ddafcb9ab299e05c48e9741c3d918aac
---
web/htdocs/wato.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index f6280cf..774ca5d 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -153,6 +153,11 @@ def page_handler():
if not config.wato_enabled:
raise MKGeneralException(_("WATO is disabled. Please set <tt>wato_enabled = True</tt>"
" in your <tt>multisite.mk</tt> if you want to use WATO."))
+
+ if cmk.is_managed_edition() and not managed.is_provider(config.current_customer):
+ raise MKGeneralException(_("Check_MK can only be configured on "
+ "the managers central site."))
+
current_mode = html.var("mode") or "main"
modeperms, modefunc = get_mode_function(current_mode)
Module: check_mk
Branch: master
Commit: b885a7d1e8ae6ab56798ec27b44f9af903531394
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b885a7d1e8ae6a…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Mar 30 13:43:24 2017 +0200
4431 FIX Fixed enabling/disabling of notifications/active checks/passive checks
Changing various flags in an ad-hoc (i.e. non-rule-based) manner did not
work correctly: Changing a flag to a value different from the configurated
one worked, but trying to change it back to its configurated value had no
effect. This affected the various Enable/Disable buttons on the
host/service details pages plus the corresponding Livestatus commands
(ENABLE_HOST_CHECK etc.).
Note that 1.2.8 versions and earlier are were not affected by this bug.
Change-Id: I0c92ecc4db32cc2c5b7a071cb28cccda786f3806
---
.werks/4431 | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/.werks/4431 b/.werks/4431
new file mode 100644
index 0000000..8524d2c
--- /dev/null
+++ b/.werks/4431
@@ -0,0 +1,17 @@
+Title: Fixed enabling/disabling of notifications/active checks/passive checks
+Level: 1
+Component: core
+Compatible: compat
+Edition: cee
+Version: 1.5.0i1
+Date: 1490873695
+Class: fix
+
+Changing various flags in an ad-hoc (i.e. non-rule-based) manner did not
+work correctly: Changing a flag to a value different from the configurated
+one worked, but trying to change it back to its configurated value had no
+effect. This affected the various Enable/Disable buttons on the
+host/service details pages plus the corresponding Livestatus commands
+(ENABLE_HOST_CHECK etc.).
+
+Note that 1.2.8 versions and earlier are were not affected by this bug.