Module: check_mk
Branch: master
Commit: 728ee107e06e69f40b9a150ed81945f532ba3a79
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=728ee107e06e69…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 12 08:36:43 2013 +0200
Updated bug entries #0934
---
.bugs/934 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.bugs/934 b/.bugs/934
index a8f20f2..08a13a4 100644
--- a/.bugs/934
+++ b/.bugs/934
@@ -1,9 +1,9 @@
Title: fileinfo.groups and "patterns" check_parameter
Component: wato
-State: open
+Class: bug
+State: done
Date: 2013-07-08 09:56:03
Targetversion: future
-Class: bug
The fileinfo.groups checks evaluates the parameter fileinfo_groups upon inventory
and create an autocheck file with a pattern key.
@@ -17,3 +17,8 @@ it is not possible to define patterns in the fileinfo_groups valuespec
Solution:
Add patterns to fileinfo_groups valuespec
+
+2013-07-12 08:36:21: changed state open -> done
+Has been cleaned up by removing the pattern attribute and adding a precompile
+function to the check which precompiles the patterns of a fileinfo group
+just like the logwatch check
Module: check_mk
Branch: master
Commit: 7c86ff31db9bd89d61b579c556d0925088d7863f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c86ff31db9bd8…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 12 09:15:05 2013 +0200
Fixed port number mixup
---
mkeventd/bin/mkeventd | 13 +++++++------
mkeventd/src/mkeventd_open514.c | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 059d30d..092ba0e 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -804,8 +804,8 @@ class EventServer:
else:
self._snmptrap = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self._snmptrap.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- self._snmptrap.bind(("0.0.0.0", 612))
- log("Opened builtin snmptrap server on UDP port 612")
+ self._snmptrap.bind(("0.0.0.0", 162))
+ log("Opened builtin snmptrap server on UDP port 162")
except Exception, e:
raise Exception("Cannot start builtin snmptrap server: %s" % e)
@@ -1070,10 +1070,9 @@ class EventServer:
if self._syslog != None and self._syslog.fileno() in readable:
self.process_raw_lines(self._syslog.recv(4096))
- # Accept
-
# Read events from builtin snmptrap server
if self._snmptrap != None and self._snmptrap.fileno() in readable:
+ print 'got trap data'
try:
self.process_raw_data(self.process_snmptrap, self._snmptrap.recvfrom(65535))
except Exception, e:
@@ -2974,10 +2973,12 @@ def usage():
-E, --eventsocket P Path to unix socket for receiving events (optional)
-L, --livestatus P Path to livestatus socket of monitoring core (optional)
-P, --pipe P Path to pipe for receiving events
- --syslog Enable builtin syslog server
+ --syslog Enable builtin UDP syslog server
--syslog-fd FD Do not open UDP port 514, but inherit it via this FD
+ --syslog-tcp Enable builtin TCP syslog server
+ --syslog-tcp-fd FD Do not open TCP port 514, but inherit it via this FD
--snmptrap Enable builtin snmptrap server
- --snmptrap-fd FD Do not open UDP port 612, but inherit it via this FD
+ --snmptrap-fd FD Do not open UDP port 162, but inherit it via this FD
--statedir D Path to directory for saving status
--logdir D Path to directory where mkeventd.log is created
-p, --pidfile Path to PID file
diff --git a/mkeventd/src/mkeventd_open514.c b/mkeventd/src/mkeventd_open514.c
index 0402a0a..fa53054 100644
--- a/mkeventd/src/mkeventd_open514.c
+++ b/mkeventd/src/mkeventd_open514.c
@@ -39,7 +39,7 @@
#include <stdio.h>
#define SYSLOG_PORT 514
-#define SNMPTRAP_PORT 612
+#define SNMPTRAP_PORT 162
#define PROGRAM "mkeventd"
Module: check_mk
Branch: master
Commit: 2c8e634cef115e239f4695d6a03c68e87f2338d1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c8e634cef115e…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Thu Jul 11 17:32:30 2013 +0200
added deprecated notice in all remaining j4p check manpages
---
checkman/j4p_performance.mem | 4 +++-
checkman/j4p_performance.threads | 4 +++-
checkman/j4p_performance.uptime | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/checkman/j4p_performance.mem b/checkman/j4p_performance.mem
index 865fecb..068578d 100644
--- a/checkman/j4p_performance.mem
+++ b/checkman/j4p_performance.mem
@@ -1,9 +1,11 @@
-title: Memory usage of Java application server via JMX and j4p.war
+title: Memory usage of Java application server via JMX and j4p.war - DEPRECATED
agents: linux
catalog: app/java
license: GPL
distribution: check_mk
description:
+ Do not use this plugin. It will be removed soon. Use jolokia_metrics instead.
+
This checks uses the JSON HTTP service of j4p (from jmx4perl) to
monitor the current memory usage of a Java application server like
Tomcat or JBoss. You can define levels against the total memory
diff --git a/checkman/j4p_performance.threads b/checkman/j4p_performance.threads
index 8e05e7d..bcbd2f5 100644
--- a/checkman/j4p_performance.threads
+++ b/checkman/j4p_performance.threads
@@ -1,9 +1,11 @@
-title: Threads of Java application server via JMX and j4p.war
+title: Threads of Java application server via JMX and j4p.war - DEPRECATED
agents: linux
catalog: app/java
license: GPL
distribution: check_mk
description:
+ Do not use this plugin. It will be removed soon. Use jolokia_metrics instead.
+
This checks uses the JSON HTTP service of j4p (from jmx4perl) to
monitor the number of threads created by a Java application server like
Tomcat or JBoss. You can define levels against the number of threads
diff --git a/checkman/j4p_performance.uptime b/checkman/j4p_performance.uptime
index bc07d88..08f8a10 100644
--- a/checkman/j4p_performance.uptime
+++ b/checkman/j4p_performance.uptime
@@ -1,9 +1,11 @@
-title: Uptime of Java application server via JMX and j4p.war
+title: Uptime of Java application server via JMX and j4p.war - DEPRECATED
agents: linux
catalog: app/java
license: GPL
distribution: check_mk
description:
+ Do not use this plugin. It will be removed soon. Use jolokia_metrics instead.
+
This checks uses the JSON HTTP service of j4p (from jmx4perl) to
monitor the uptime of a Java application server like
Tomcat or JBoss.