Changeset 272 for trunk/src/sh_log_evalrule.c

Timestamp:

Jan 27, 2010, 10:52:20 PM (15 years ago)

Author:

katerina

Message:

Fixes tickets #190, #191, #192, #193, and #194.

File:

• trunk/src/sh_log_evalrule.c (modified) (12 diffs)

trunk/src/sh_log_evalrule.c

@@ -151 +151 @@
   char **      splits = split_array(new, &nfields, ':', lengths);
 
+  /* group is label:regex
+   */
+
   if (group_open)
     group_open = NULL;
@@ -313 +316 @@
   struct sh_qeval * nq;
   int     severity;
-  unsigned int nfields = 4; /* label:interval:(report|sum):severity */
-  size_t  lengths[4];
+  unsigned int nfields = 5; /* label:interval:(report|sum):severity[:alias] */
+  size_t  lengths[5];
   char *  new = sh_util_strdup(str);
   char ** splits = split_array(new, &nfields, ':', lengths);
 
-  if (nfields != 4)
+  if (nfields < 4)
     {
       SH_FREE(splits);
@@ -356 +359 @@
   nq = SH_ALLOC(sizeof(struct sh_qeval));
   nq->label = sh_string_new_from_lchar(splits[0], lengths[0]);
+  nq->alias = NULL;
 
   DEBUG("debug: splits[2] = %s, policy = %d\n",splits[2],nq->policy); 
@@ -368 +372 @@
 
   nq->severity = severity;
+
+  if (nfields == 5)
+    {
+      nq->alias = sh_string_new_from_lchar(splits[4], lengths[4]);
+    }
+
   nq->next     = queuelist;
   queuelist    = nq;
@@ -408 +418 @@
   return SH_ERR_SEVERE;
 }
+
+sh_string * sh_log_lookup_alias(const char * str)
+{
+  struct sh_qeval * queue;
+
+  if (str)
+    {
+      if (0 != strcmp(str, _("trash")))
+        {
+          queue = sh_log_find_queue(str);
+          
+          if (queue)
+            return queue->alias;
+        }
+    }
+  return NULL;
+}
+
 
 static char * get_label_and_time(const char * inprefix, char * str, 
@@ -993 +1021 @@
 }
 
-static void msg_report(int severity, struct sh_geval * rule, struct sh_logrecord * record)
+static void msg_report(int severity, const sh_string * alias, 
+                       struct sh_geval * rule, struct sh_logrecord * record)
 {
   char      * tmp;
@@ -1017 +1046 @@
                    sh_string_str(record->host),
                    tmp);
+  if (alias)
+    {
+      sh_error_mail (sh_string_str(alias),
+                     severity, FIL__, __LINE__, 0, MSG_LOGMON_REP,
+                     msg,
+                     ttt,
+                     sh_string_str(record->host),
+                     tmp);
+    }
   SH_FREE(ttt);
   SH_FREE(msg);
@@ -1025 +1063 @@
 }
 
-static void sum_report(int severity, sh_string * host, sh_string * message, sh_string * path)
+static void sum_report(int severity, const sh_string * alias,
+                       sh_string * host, sh_string * message, sh_string * path)
 {
   char * tmp;
@@ -1037 +1076 @@
                    sh_string_str(host), 
                    tmp);
+  if (alias)
+    {
+      sh_error_mail (sh_string_str(alias),
+                     severity, FIL__, __LINE__, 0, MSG_LOGMON_SUM,
+                     msg,
+                     sh_string_str(host),
+                     tmp);
+    }
   SH_FREE(msg);
   SH_FREE(tmp);
@@ -1108 +1155 @@
     {
       DEBUG("debug: report count\n");
-      sum_report(rule->queue->severity, counter->hostname, 
-                 counter->counted_str, counter->filename);
+      sum_report(rule->queue->severity, rule->queue->alias,
+                 counter->hostname, counter->counted_str, counter->filename);
       counter->start = time(NULL);
       counter->count = 0;
@@ -1131 +1178 @@
                  sh_string_str(record->host), 
                  sh_string_str(record->message));
-          msg_report(queue->severity, rule, record);
+          msg_report(queue->severity, queue->alias, rule, record);
           retval = 0;
         }
@@ -1177 +1224 @@
         {
           DEBUG("debug: (%lu) no rule found\n", i); ++i;
-          msg_report(DEFAULT_SEVERITY, NULL, record);
+          msg_report(DEFAULT_SEVERITY, NULL, NULL, record);
         }