Module: check_mk
Branch: master
Commit: 704c1b8077f54729116fda4089167cd10d82c433
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704c1b8077f547…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Aug 25 13:28:25 2014 +0200
#1146 nfsmounts: supported by AIX agent now
In order to make this work you need the GNU version of <tt>stat</tt> installed
on AIX and make have it precedence over the AIX version of <tt>stat</tt>. GNU
<tt>stat</tt> is contained in the GNU <tt>coreutils</tt> package.
---
.werks/1146 | 11 +++++++++++
ChangeLog | 1 +
2 files changed, 12 insertions(+)
diff --git a/.werks/1146 b/.werks/1146
new file mode 100644
index 0000000..87618c1
--- /dev/null
+++ b/.werks/1146
@@ -0,0 +1,11 @@
+Title: nfsmounts: supported by AIX agent now
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1408966023
+Class: feature
+
+In order to make this work you need the GNU version of <tt>stat</tt> installed
+on AIX and make have it precedence over the AIX version of <tt>stat</tt>. GNU
+<tt>stat</tt> is contained in the GNU <tt>coreutils</tt> package.
diff --git a/ChangeLog b/ChangeLog
index ca9b26b..d1b6b9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@
* 1375 vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm...
* 1376 dmraid: moved plugin code into normal Linux agent...
* 1377 Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices...
+ * 1146 nfsmounts: supported by AIX agent now...
* 1051 FIX: tcp_conn_stats: fix missing performance data...
* 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked
* 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries
Module: check_mk
Branch: master
Commit: ebc7a7193a9bbd0f1802df520fbed1ac8a142190
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebc7a7193a9bbd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 22:05:24 2014 +0200
#1378 FIX mk_logwatch: remove exceeding \n when rewriting message and using \0
When using <tt>R</tt> for rewriting message and then using <tt>\0</tt> for
inserting the complete original message there was only exceeding linefeed.
This has been removed and thus the format being fixed.
---
.werks/1378 | 11 +++++++++++
ChangeLog | 1 +
agents/plugins/mk_logwatch | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/1378 b/.werks/1378
new file mode 100644
index 0000000..b4c2bd6
--- /dev/null
+++ b/.werks/1378
@@ -0,0 +1,11 @@
+Title: mk_logwatch: remove exceeding \n when rewriting message and using \0
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1408910658
+Class: fix
+
+When using <tt>R</tt> for rewriting message and then using <tt>\0</tt> for
+inserting the complete original message there was only exceeding linefeed.
+This has been removed and thus the format being fixed.
diff --git a/ChangeLog b/ChangeLog
index ef7e7f4..ca9b26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@
* 1144 FIX: blade_bx_temp, dell_chassis_temp, emerson_temp, ibm_svc_enclosurestats, ups_bat_temp: rename service description...
NOTE: Please refer to the migration notes!
* 1145 FIX: windows_tasks: handle case correctly where task is currently running...
+ * 1378 FIX: mk_logwatch: remove exceeding \n when rewriting message and using \0...
Multisite:
* 1066 Implemented Dashboard Designer...
diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch
index 65ab679..d5326ef 100755
--- a/agents/plugins/mk_logwatch
+++ b/agents/plugins/mk_logwatch
@@ -282,7 +282,7 @@ def process_logfile(logfile, patterns):
# Replacement
for replace in replacements:
- line = replace.replace('\\0', line) + "\n"
+ line = replace.replace('\\0', line.rstrip()) + "\n"
for nr, group in enumerate(matches.groups()):
line = line.replace('\\%d' % (nr+1), group)
add example for ngnix
Message-ID: <53fa171b.9hb3ajAVXXG4myTB%mk(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: f617a1cc2967dd90fc8b3ada481de4d9cae780e9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f617a1cc2967dd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 18:47:15 2014 +0200
Moved config examples to subdirectory, add example for ngnix
---
agents/{ => cfg_examples}/apache_status.cfg | 0
agents/{ => cfg_examples}/jolokia.cfg | 0
agents/{ => cfg_examples}/logwatch.cfg | 0
agents/cfg_examples/nginx_status.cfg | 16 ++++++++++++++++
agents/{ => cfg_examples}/sqlplus.sh | 0
checkman/nginx_status | 17 +----------------
6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/agents/apache_status.cfg b/agents/cfg_examples/apache_status.cfg
similarity index 100%
rename from agents/apache_status.cfg
rename to agents/cfg_examples/apache_status.cfg
diff --git a/agents/jolokia.cfg b/agents/cfg_examples/jolokia.cfg
similarity index 100%
rename from agents/jolokia.cfg
rename to agents/cfg_examples/jolokia.cfg
diff --git a/agents/logwatch.cfg b/agents/cfg_examples/logwatch.cfg
similarity index 100%
rename from agents/logwatch.cfg
rename to agents/cfg_examples/logwatch.cfg
diff --git a/agents/cfg_examples/nginx_status.cfg b/agents/cfg_examples/nginx_status.cfg
new file mode 100644
index 0000000..68805dd
--- /dev/null
+++ b/agents/cfg_examples/nginx_status.cfg
@@ -0,0 +1,16 @@
+# Example configuration file. If you do not supply
+# a configuration file then autodetection is being tried.
+
+servers = [
+ {
+ "protocol" : "http",
+ "address" : "localhost",
+ "port" : 80,
+ },
+ {
+ "protocol" : "https",
+ "address" : "localhost",
+ "port" : 443,
+ "page" : "nginx_status",
+ },
+]
diff --git a/agents/sqlplus.sh b/agents/cfg_examples/sqlplus.sh
similarity index 100%
rename from agents/sqlplus.sh
rename to agents/cfg_examples/sqlplus.sh
diff --git a/checkman/nginx_status b/checkman/nginx_status
index 02ffc02..e3bc1ae 100644
--- a/checkman/nginx_status
+++ b/checkman/nginx_status
@@ -43,22 +43,7 @@ description:
The plugin tries to autodetect all running nginx servers. If that fails
for some reason you need to create the configuration file
{/etc/check_mk/nginx_status.cfg} and configure your servers in that file.
- Take a look at the example section for the content of that file.
-
-examples:
- servers = [
- {
- 'protocol' : 'http',
- 'address' : 'localhost',
- 'port' : 80 ,
- },
- {
- 'protocol' : 'https',
- 'address' : 'localhost',
- 'port' : 443 ,
- 'page' : 'my-server-status',
- },
- ]
+ You find an example of that file in your agent directory ({share/check_mk/agents}).
inventory:
One service per web server will be created.
Module: check_mk
Branch: master
Commit: 3b80897136801030a8267cf12b86b524bf368ba8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b808971368010…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Aug 24 18:43:09 2014 +0200
Fix bold font in ngnix_status manpage
---
checkman/nginx_status | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkman/nginx_status b/checkman/nginx_status
index 0384549..02ffc02 100644
--- a/checkman/nginx_status
+++ b/checkman/nginx_status
@@ -21,7 +21,7 @@ description:
{nginx -V 2>&1 | grep -o with-http_stub_status_module} to check this. You should see a single
line of output when you have this module available.
- Now you need to add the following configuration to a nginx site, inside the {server {..}} block.
+ Now you need to add the following configuration to a nginx site, inside the {server} block.
On a debian system, this is located in the file {/etc/nginx/sites-enabled/default}. Now add the
following block: