summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorHolger Weiss <hweiss@users.sourceforge.net>2009-04-22 00:28:53 +0200
committerHolger Weiss <hweiss@users.sourceforge.net>2009-05-10 13:37:35 +0200
commit006597a12d28d9cd752b3eeb56dff3bc97049f4c (patch)
tree26e322d4b996b901e0d928e11bba46658646b30f /plugins
parentdd52d7e5e7acfd42243bc1ce173a0bf5d62fe347 (diff)
downloadmonitoring-plugins-006597a12d28d9cd752b3eeb56dff3bc97049f4c.tar.gz
Make C plugin output format configurablehw/output/functions
The development guidelines¹ currently state that the plugin output should be in the format "SERVICE STATUS: Information text". However, the SERVICE and STATUS information is redundant, as the plugin caller (e.g., Nagios) should know which SERVICE is checked and the STATUS is returned via the plugin's exit code. After discussing² this issue on the development list, we decided to make the plugin output configurable at compile time (separately for "normal" and "verbose" output). ¹ http://nagiosplug.sf.net/developer-guidelines.html ² http://thread.gmane.org/gmane.network.nagios.plugins.devel/5155 Signed-off-by: Holger Weiss <hweiss@users.sourceforge.net>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/utils.c17
-rw-r--r--plugins/utils.h2
2 files changed, 0 insertions, 19 deletions
diff --git a/plugins/utils.c b/plugins/utils.c
index 45373909..91fa671f 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -147,23 +147,6 @@ print_revision (const char *command_name, const char *revision)
147 command_name, revision, PACKAGE, VERSION); 147 command_name, revision, PACKAGE, VERSION);
148} 148}
149 149
150const char *
151state_text (int result)
152{
153 switch (result) {
154 case STATE_OK:
155 return "OK";
156 case STATE_WARNING:
157 return "WARNING";
158 case STATE_CRITICAL:
159 return "CRITICAL";
160 case STATE_DEPENDENT:
161 return "DEPENDENT";
162 default:
163 return "UNKNOWN";
164 }
165}
166
167void 150void
168timeout_alarm_handler (int signo) 151timeout_alarm_handler (int signo)
169{ 152{
diff --git a/plugins/utils.h b/plugins/utils.h
index d6e9c8f7..9912fbf2 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -92,8 +92,6 @@ void usage4(const char *) __attribute__((noreturn));
92void usage5(void) __attribute__((noreturn)); 92void usage5(void) __attribute__((noreturn));
93void usage_va(const char *fmt, ...) __attribute__((noreturn)); 93void usage_va(const char *fmt, ...) __attribute__((noreturn));
94 94
95const char *state_text (int);
96
97#define max(a,b) (((a)>(b))?(a):(b)) 95#define max(a,b) (((a)>(b))?(a):(b))
98#define min(a,b) (((a)<(b))?(a):(b)) 96#define min(a,b) (((a)<(b))?(a):(b))
99 97