Make smman able to parse logs into JSON for ES.

6 files changed, 156 insertions, 15 deletions

diff --git a/src/bin/config.c b/src/bin/config.c
index 65b2637..4c29e34 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -28,6 +28,8 @@ config_done(void *data,
    DBG("Server = %s", smman->cfg.server);
    DBG("Host = %s", smman->cfg.host);
    eina_iterator_free(it);
+
+   smman->store = store_new(smman->cfg.server);
 }
 
 void
diff --git a/src/bin/filter.c b/src/bin/filter.c
index 274f0cb..fec905e 100644
--- a/src/bin/filter.c
+++ b/src/bin/filter.c
@@ -40,10 +40,9 @@ filter_load(void *data,
    DBG("smman[%p] rules[%p] rule[%p][%s]", smman, rules, rule, rule->name);
 
    DBG("rule : %s\n\tfilename[%s]\n\tsource_host[%s]\n\t"
-       "source_path[%s]\n\ttags[%s]\n\ttodel[%s]",
+       "source_path[%s]\ntodel[%s]",
        rule->name, rule->spec.filename, rule->spec.source_host,
-       rule->spec.source_path, rule->spec.tags,
-       (rule->spec.todel) ? "EINA_TRUE" : "EINA_FALSE");
+       rule->spec.source_path, (rule->spec.todel) ? "EINA_TRUE" : "EINA_FALSE");
 
    /* Loop with globbing to write here! */
    r = glob(rule->spec.filename, GLOB_MARK, 0, &files);
@@ -65,6 +64,13 @@ filter_load(void *data,
         DBG("No filter found for %s, creating new one", *s);
         filter = calloc(1, sizeof(Filter));
         filter->sf = spy_file_new(smman->spy, *s);
+        if (!filter->sf)
+          {
+             ERR("Failed to put spy on %s", *s);
+             free(filter);
+             continue;
+          }
+
         spy_file_data_set(filter->sf, filter);
         filter->filename = strdup(*s);
         filter->rules = eina_hash_string_superfast_new(_filter_rules_free);
@@ -76,6 +82,7 @@ filter_load(void *data,
             rule, rule->name, filter, filter->filename);
         eina_hash_add(filter->rules, rule->name, rule);
      }
+   globfree(&files);
 }
 
 void
diff --git a/src/bin/log.c b/src/bin/log.c
index 4ebc053..0ecfe4c 100644
--- a/src/bin/log.c
+++ b/src/bin/log.c
@@ -6,10 +6,75 @@ typedef struct _Log
               *source_host,
               *source_path,
               *message;
-   Eina_Strbuf *tags;
+   Eina_List *tags;
    Eina_Bool todel;
 } Log;
 
+void
+_log_send(Smman *smman,
+          Log *log)
+{
+   cJSON *json,
+         *json_tags;
+   char *source,
+        *date,
+        *tag;
+   Eina_List *l;
+
+   json = cJSON_CreateObject();
+   if (!json)
+     {
+        ERR("Failed to allocate JSON object");
+        return;
+     }
+
+   source = sdupf("file://%s%s", smman->cfg.server, log->source_path);
+   EINA_SAFETY_ON_NULL_RETURN(source);
+
+   date = date_es();
+   EINA_SAFETY_ON_NULL_RETURN(date);
+
+
+   cJSON_AddStringToObject(json, "@source", source);
+   cJSON_AddStringToObject(json, "@type", "syslog");
+
+   json_tags = cJSON_CreateArray();
+   cJSON_AddItemToObject(json, "tags", json_tags);
+
+   EINA_LIST_FOREACH(log->tags, l, tag)
+     {
+        cJSON_AddItemToArray(json_tags, cJSON_CreateString(tag));
+     }
+
+   cJSON_AddItemToObject(json, "fields", cJSON_CreateObject());
+
+   cJSON_AddStringToObject(json, "@message", log->message);
+   cJSON_AddStringToObject(json, "@timestamp", date);
+   cJSON_AddStringToObject(json, "@source_host", log->source_host);
+   cJSON_AddStringToObject(json, "@source_path", log->source_path);
+
+
+   free(date);
+   free(source);
+   DBG("JSON = \n%s", cJSON_Print(json));
+   cJSON_Delete(json);
+}
+
+void
+_log_free(Log *log)
+{
+   char *tag;
+
+   eina_stringshare_replace(&log->filename, NULL);
+   eina_stringshare_replace(&log->source_host, NULL);
+   eina_stringshare_replace(&log->source_path, NULL);
+   eina_stringshare_replace(&log->message, NULL);
+
+   EINA_LIST_FREE(log->tags, tag)
+     free(tag);
+   free(log);
+}
+
 Eina_Bool
 _log_line_match(const char *log, Rule *rule)
 {
@@ -47,6 +112,7 @@ log_line_event(void *data,
    Eina_Iterator *it;
    Eina_Hash_Tuple *t;
    Eina_Bool r;
+   const char *tag;
 
    DBG("smman[%p] sl[%p][%s] filter[%p][%s]",
        smman, sl, spy_file_name_get(sf), filter, filter->filename);
@@ -56,13 +122,13 @@ log_line_event(void *data,
    eina_stringshare_replace(&log->filename, filter->filename);
    eina_stringshare_replace(&log->source_host, smman->cfg.host);
    eina_stringshare_replace(&log->source_path, filter->filename);
-   log->tags = eina_strbuf_new();
 
    /* Now we apply rules */
    it = eina_hash_iterator_tuple_new(filter->rules);
    while (eina_iterator_next(it, (void **)&t))
      {
         const char *name;
+        Eina_List *l;
 
         name = t->key;
         rule = t->data;
@@ -84,12 +150,8 @@ log_line_event(void *data,
         if (rule->spec.source_path)
           eina_stringshare_replace(&log->source_path, rule->spec.source_path);
 
-        if (rule->spec.tags)
-          {
-             if (eina_strbuf_length_get(log->tags))
-               eina_strbuf_append(log->tags, ",");
-             eina_strbuf_append(log->tags, rule->spec.tags);
-          }
+        EINA_LIST_FOREACH(rule->spec.tags, l, tag)
+          log->tags = eina_list_append(log->tags, strdup(tag));
      }
    eina_iterator_free(it);
 
@@ -101,13 +163,14 @@ log_line_event(void *data,
        "\tmessage = %s\n"
        "\tfilename = %s\n"
        "\tsource_host = %s\n"
-       "\tsource_path = %s\n"
-       "\ttags = %s\n",
+       "\tsource_path = %s",
        log->message,
        log->filename,
        log->source_host,
-       log->source_path,
-       eina_strbuf_string_get(log->tags));
+       log->source_path);
+
+   _log_send(smman, log);
 
+   _log_free(log);
    return EINA_TRUE;
 }
diff --git a/src/bin/smman.h b/src/bin/smman.h
index d75452b..d912ffa 100644
--- a/src/bin/smman.h
+++ b/src/bin/smman.h
@@ -9,6 +9,8 @@
 #include <Conf.h>
 #include <Rules.h>
 #include <Spy.h>
+#include <Store.h>
+#include <cJSON.h>
 
 int smman_log_dom_global;
 
@@ -16,6 +18,7 @@ typedef struct _Smman
 {
    Rules *rules;
    Spy *spy;
+   Store *store;
    Eina_Inlist *filters;
 
    struct
@@ -52,3 +55,6 @@ void filter_load_done(void *data, Rules *rules);
 void filter_load_error(void *data, Rules *rules, const char *errstr);
 
 Eina_Bool log_line_event(void *data, int type, void *event);
+
+char * sdupf(const char *s, ...);
+char * date_es(void);
diff --git a/src/bin/utils.c b/src/bin/utils.c
new file mode 100644
index 0000000..dcdf3a8
--- /dev/null
+++ b/src/bin/utils.c
@@ -0,0 +1,42 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+
+#include "smman.h"
+
+char *
+sdupf(const char *s, ...)
+{
+   va_list args;
+   int len;
+   char *str;
+
+   va_start(args, s);
+   len = vasprintf(&str, s, args);
+   va_end(args);
+
+   if (len == -1)
+     return NULL;
+
+   return str;
+}
+
+char *
+date_es(void)
+{
+   char *s;
+   time_t temps;
+   struct tm temp;
+
+   temps = time(NULL);
+   if (!localtime_r(&temps,&temp))
+     return NULL;
+
+   s = calloc(1, 28);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(s, NULL);
+
+   sprintf(s,"%04d-%02d-%02dT%02d:%02d:%02d.000000Z",
+           (temp.tm_year)+1900,(temp.tm_mon)+1,temp.tm_mday,
+           temp.tm_hour,temp.tm_min,temp.tm_sec);
+   return s;
+}
+
diff --git a/src/include/Store.h b/src/include/Store.h
new file mode 100644
index 0000000..3a867b3
--- /dev/null
+++ b/src/include/Store.h
@@ -0,0 +1,21 @@
+#ifndef STORE_H
+#define STORE_H
+#include <Eina.h>
+#include <Ecore.h>
+#include <Ecore_Con.h>
+
+
+typedef struct _Store Store;
+
+typedef void (*Store_Done_Cb)(void *data, Store *store, char *answer, size_t len);
+typedef void (*Store_Error_Cb)(void *data, Store *store, char *strerr);
+
+int store_init(void);
+int store_shutdown(void);
+
+Store * store_new(const char *url);
+Eina_Bool store_add(Store *store, const char *buf, size_t len, Store_Done_Cb done_cb, Store_Error_Cb error_cb, const void *data);
+
+void store_data_set(Store *store, const void *data);
+void * store_data_get(Store *store);
+#endif