Module: check_mk
Branch: master
Commit: 0839c528842ffa70aeaed5cd63c1dc3cea45ee70
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0839c528842ffa…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Aug 31 10:31:28 2018 +0200
6523 FIX nginx_status: Fixed discovery of running instances on Ubuntu
Nginx instances on Ubuntu based on the official packages were not detected correctly.
To apply this fix you need to update the nginx_status agent plugin.
FEED-834
Change-Id: I5ec539abcc143157980ecffc224608429da1cdac
---
.werks/6523 | 12 ++++++++++++
agents/plugins/nginx_status | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/6523 b/.werks/6523
new file mode 100644
index 0000000..99179fd
--- /dev/null
+++ b/.werks/6523
@@ -0,0 +1,12 @@
+Title: nginx_status: Fixed discovery of running instances on Ubuntu
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1535704132
+
+Nginx instances on Ubuntu based on the official packages were not detected correctly.
+To apply this fix you need to update the nginx_status agent plugin.
diff --git a/agents/plugins/nginx_status b/agents/plugins/nginx_status
index becd540..c952783 100755
--- a/agents/plugins/nginx_status
+++ b/agents/plugins/nginx_status
@@ -69,7 +69,7 @@ def try_detect_servers():
to_replace = re.compile('^.*/')
proc = to_replace.sub('', proc)
- procs = [ 'nginx', 'nginx:' ]
+ procs = [ 'nginx', 'nginx:', 'nginx.conf' ]
# the pid/proc field length is limited to 19 chars. Thus in case of
# long PIDs, the process names are stripped of by that length.
# Workaround this problem here