Module: check_mk
Branch: master
Commit: 5ef979e277401035557e34ccbe6175beaaf704a6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef979e2774010…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Apr 3 11:16:09 2013 +0200
check_mkevents now allows specification of a UNIX socket
---
ChangeLog | 2 +
mkeventd/checks/check_mkevents | 6 ++++-
mkeventd/web/plugins/wato/mkeventd.py | 42 ++++++++++++++++++++++-----------
3 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f6b6826..7ae071e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,6 +124,8 @@
Event Console:
* FIX: check_mkevents: fix usage help if called with illegal options
+ * check_mkevents now allows specification of a UNIX socket
+ This is needed in non-OMD environments
* setup.py now tries to setup Event Console even in non-OMD world
1.2.2b5:
diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents
index 3f54b74..1f322ca 100644
--- a/mkeventd/checks/check_mkevents
+++ b/mkeventd/checks/check_mkevents
@@ -4,7 +4,11 @@
def check_mkevents_arguments(params):
args = ""
if "remote" in params:
- args += "-H %s:%d " % (params["remote"])
+ remote = params["remote"]
+ if type(remote) == tuple:
+ args += "-H %s:%d " % (quote_shell_string(remote[0]), remote[1])
+ else:
+ args += "-H %s " % quote_shell_string(remote)
if params.get("ignore_acknowledged"):
args += "-a "
args += params.get("hostspec", "$HOSTADDRESS$")
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index cd7fb7c..f3ec445 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1732,24 +1732,38 @@ register_rule(
)
),
( "remote",
- Tuple(
+ Alternative(
+ title = _("Access to the Event Console"),
elements = [
+ Tuple(
+ elements = [
+ TextAscii(
+ title = _("Hostname/IP address of Event Console:"),
+ allow_empty = False,
+ ),
+ Integer(
+ title = _("TCP Port number:"),
+ minvalue = 1,
+ maxvalue = 65535,
+ default_value = 6558,
+ ),
+ ],
+ title = _("Access via TCP"),
+ help = _("In a distributed setup where the Event Console is not running in the same "
+ "site as the host is monitored you need to access the remote Event Console "
+ "via TCP. Please make sure that this is activated in the global settings of "
+ "the event console. The default port number is 6558."),
+ ),
TextAscii(
- title = _("Hostname/IP address of Event Console:"),
+ title = _("Access via UNIX socket"),
allow_empty = False,
+ size = 64,
),
- Integer(
- title = _("TCP Port number:"),
- minvalue = 1,
- maxvalue = 65535,
- default_value = 6558,
- ),
- ],
- title = _("Access Event Console via TCP"),
- help = _("In a distributed setup where the Event Console is not running in the same "
- "site as the host is monitored you need to access the remote Event Console "
- "via TCP. Please make sure that this is activated in the global settings of "
- "the event console. The default port number is 6558."),
+
+ ],
+ default_value = defaults.omd_root
+ and defaults.omd_root + "/tmp/run/mkeventd/status"
+ or defaults.livestatus_unix_socket.split("/",1)[0] + "/mkeventd/status"
)
),
],
Module: check_mk
Branch: master
Commit: ac51f4db6d7c8f696c57b871aa0db22fff25edee
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac51f4db6d7c8f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 3 10:43:55 2013 +0200
Updated bug entries #0906
Conflicts:
.bugs/906
---
.bugs/917 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/.bugs/917 b/.bugs/917
new file mode 100644
index 0000000..768e435
--- /dev/null
+++ b/.bugs/917
@@ -0,0 +1,14 @@
+Title: Make ssl cert check possible on custom port
+Component: wato
+State: open
+Date: 2013-04-03 10:43:07
+Targetversion: future
+Class: feature
+
+wir haben viele HTTPS-Sites auf Ports ab vom Standard (443).
+
+Es waere echt klasse, wenn wir das in den WATO-Rules der aktiven HTTP-Checks so konfigurieren koennten, dass das Zertifikat auf diesem Port geprueft wird - und noch besser waere es, wenn wir das in der kommenden 1.2.2 tun koennten ;-)
+
+Aktuell machen wir das ueber manuelle .mk-Rules, die zwar funktionieren, im WATO allerdings als "invalid" angezeigt werden und dort nicht nutzbar sind.
+
+Wenn mehr Infos benoetigt werden koennte ich die natuerlich auch liefern.
Module: check_mk
Branch: master
Commit: e6f9219acdfa54110e790ede47afed433ae7107a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f9219acdfa54…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 3 09:57:25 2013 +0200
Also populating empty auth serials file in page hook
---
web/htdocs/userdb.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py
index 075a467..2d2853a 100644
--- a/web/htdocs/userdb.py
+++ b/web/htdocs/userdb.py
@@ -556,7 +556,7 @@ def general_page_hook():
# Create initial auth.serials file, same issue as auth.php above
serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file)
- if not os.path.exists(serials_file):
+ if not os.path.exists(serials_file) or os.path.getsize(serials_file) == 0:
save_users(load_users())
# Hook function can be registered here to execute actions on a "regular" base without