SOURCES: nagios-snmp-plugins-format-report.patch (NEW) - formattin...

[glen]

Author: glen                         Date: Mon Sep 18 14:19:47 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- formatting patch, made in few hours

---- Files affected:
SOURCES:
   nagios-snmp-plugins-format-report.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/nagios-snmp-plugins-format-report.patch
diff -u /dev/null SOURCES/nagios-snmp-plugins-format-report.patch:1.1
--- /dev/null	Mon Sep 18 16:19:47 2006
+++ SOURCES/nagios-snmp-plugins-format-report.patch	Mon Sep 18 16:19:42 2006
@@ -0,0 +1,116 @@
+Format report in single line, as Nagios only takes first line in notification.
+The most complicated part is the truncation and formatting messages nicely.
+
+Author: Elan Ruusamäe <glen at pld-linux.org>
+Date: 2006-09-18
+
+--- nagios-snmp-plugins-1.0/check_snmp_proc.c	2004-03-29 17:04:40.000000000 +0300
++++ ../nagios-snmp-plugins-1.0/check_snmp_proc.c	2006-09-18 17:15:34.491043432 +0300
+@@ -127,6 +130,92 @@
+   exit(ret);
+ }
+ 
++void format_report(int cnt, long *errors, char **errormsg)
++{
++  int i;
++  size_t nmany = 0, nfew = 0, nunkn = 0;
++  char **errmany = NULL, **errfew = NULL, **errunkn = NULL;
++  char **pmany = NULL, **pfew = NULL, **punkn = NULL;
++
++  errmany = calloc(sizeof(char **), cnt);
++  if (!errmany) {
++    printf("%s: Could not allocate memory for error information\n", bn);
++    return;
++  }
++  errfew = calloc(sizeof(char **), cnt);
++  if (!errfew) {
++    printf("%s: Could not allocate memory for error information\n", bn);
++    return;
++  }
++  errunkn = calloc(sizeof(char **), cnt);
++  if (!errunkn) {
++    printf("%s: Could not allocate memory for error information\n", bn);
++    return;
++  }
++
++#define _msg_few "Too few "
++#define _msg_many "Too many "
++  pmany = errmany; pfew = errfew; punkn = errunkn;
++  for (i = 0; i < cnt; i++) {
++    if (errors[i]) {
++      size_t len = strlen(errormsg[i]);
++      if (strncmp(errormsg[i], _msg_many, sizeof(_msg_many) - 1) == 0) {
++        *(pmany++) = errormsg[i] + sizeof(_msg_many) - 1;
++        nmany++;
++
++      } else if (strncmp(errormsg[i], _msg_few, sizeof(_msg_few) - 1) == 0) {
++        *(pfew++) = errormsg[i] + sizeof(_msg_few) - 1;
++        nfew++;
++
++      } else {
++        *(punkn++) = errormsg[i];
++        nunkn++;
++      }
++    }
++  }
++
++  if (verbose) {
++    printf("%s: Got %ld few, %ld many, %ld unknown messages\n", bn, nfew, nmany, nunkn);
++  }
++
++#define _msg_running " running"
++  if (nmany) {
++    char *p;
++    printf("%s", _msg_many);
++    for (i = 0; i < nmany- 1; i++) {
++      p = strstr(errmany[i], _msg_running);
++      printf("%.*s%s, ", p - errmany[i], errmany[i], p + sizeof(_msg_running) - 1);
++    }
++    p = strstr(errmany[i], _msg_running);
++    printf("%.*s%s", p - errmany[i], errmany[i], p + sizeof(_msg_running) - 1);
++    printf("%s", _msg_running);
++  }
++  if (nfew) {
++    char *p;
++    if (nmany) {
++      printf(". ");
++    }
++    printf("%s", _msg_few);
++    for (i = 0; i < nfew - 1; i++) {
++      p = strstr(errfew[i], _msg_running);
++      printf("%.*s%s, ", p - errfew[i], errfew[i], p + sizeof(_msg_running) - 1);
++    }
++    p = strstr(errfew[i], _msg_running);
++    printf("%.*s%s", p - errfew[i], errfew[i], p + sizeof(_msg_running) - 1);
++    printf("%s", _msg_running);
++  }
++  if (nunkn) {
++    if (nfew) {
++      printf(". ");
++    }
++    for (i = 0; i < nunkn - 1; i++) {
++      printf("%s", errunkn[i]);
++    }
++    printf("%s", errunkn[i]);
++  }
++  printf("\n");
++}
++
+ int report_proc()
+ {
+   int cnt;
+@@ -195,12 +284,8 @@
+     printf("%s: Could not fetch error messages\n", bn);
+     return STATE_CRITICAL;
+   }
+-  
+-  for(i=0; i < cnt; i++)
+-  {
+-    if(errors[i])
+-      printf("%s\n", errormsg[i]);
+-  }
++
++  format_report(cnt, errors, errormsg);
+ 
+   return STATE_CRITICAL;
+ }
================================================================