Merge pull request #1 from SKOV-DK/master

Add the possiblilty for configuring structured-data, so the systemd.n…

Author: ssahani

README.md

@@ -27,6 +27,12 @@ Create a user  **systemd-journal-netlog**
 
            The the address string format is similar to socket units. See systemd.socket(1)
 
+       Optional settings
+
+       StructuredData=
+           Meta information about the syslog message, which can be used for Cloud Based
+           syslog servers, such as Loggly
+
 **EXAMPLE**
 
  Example 1. /etc/systemd/systemd-netlogd.conf
@@ -38,3 +44,9 @@ Example 2. /etc/systemd/systemd-netlogd.conf
 
            [Network]
            Address=192.168.8.101:514
+
+Example 3. /etc/systemd/systemd-netlogd.conf
+
+           [Network]
+           Address=192.168.8.101:514
+           StructuredData=[1ab456b6-90bb-6578-abcd-5b734584aaaa@41058]

man/systemd-netlogd.conf.xml

@@ -80,6 +80,14 @@
         </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><varname>StructuredData=</varname></term>
+        <listitem><para>Meta information about the syslog message,
+        which can be used for Cloud Based syslog servers, such as Loggly</para>
+
+        <para>The StructureData is only an optional setting</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -103,6 +111,17 @@ Address=192.168.8.101:514
     </example>
   </refsect1>
 
+  <refsect1>
+    <title>Example</title>
+    <example>
+      <title>/etc/systemd/systemd-netlogd.conf</title>
+      <programlisting>[Network]
+Address=192.168.8.101:514
+StructuredData=[1ab456b6-90bb-6578-abcd-5b734584aaaa@41058]
+      </programlisting>
+    </example>
+  </refsect1>
+
   <refsect1>
       <title>See Also</title>
       <para>

src/conf-parser.c

@@ -458,3 +458,41 @@ int config_parse_many(const char *conf_file,
                 return 0;                                               \
         }                                                               \
         struct __useless_struct_to_allow_trailing_semicolon__
+
+int config_parse_string(
+                const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *section,
+                unsigned section_line,
+                const char *lvalue,
+                int ltype,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        char **s = data, *n;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (!utf8_is_valid(rvalue)) {
+                log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
+                return 0;
+        }
+
+        if (isempty(rvalue))
+                n = NULL;
+        else {
+                n = strdup(rvalue);
+                if (!n)
+                        return log_oom();
+        }
+
+        free(*s);
+        *s = n;
+
+        return 0;
+}

src/conf-parser.h

@@ -103,6 +103,9 @@ int config_parse_many(const char *conf_file,      /* possibly NULL */
                       bool relaxed,
                       void *userdata);
 
+/* Generic parsers */
+int config_parse_string(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
 #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg)                \
         int function(const char *unit,                                  \
                      const char *filename,                              \

src/netlog-gperf.gperf

@@ -16,3 +16,4 @@ struct ConfigPerfItem;
 %includes
 %%
 Network.Address,  config_parse_netlog_remote_address, 0, 0
+Network.StructuredData,  config_parse_string, 0, offsetof(Manager, structured_data)

src/netlog-manager.h

@@ -52,6 +52,7 @@ struct Manager {
         char *state_file;
 
         char *last_cursor, *current_cursor;
+        char *structured_data;
 };
 
 int manager_new(Manager **ret, const char *state_file, const char *cursor);

src/netlog-network.c

@@ -161,7 +161,11 @@ int manager_push_to_network(Manager *m,
         IOVEC_SET_STRING(iov[n++], " ");
 
         /* Eighth: [structured-data] */
-        IOVEC_SET_STRING(iov[n++], RFC_5424_NILVALUE);
+        if (m->structured_data)
+                IOVEC_SET_STRING(iov[n++], m->structured_data);
+        else
+                IOVEC_SET_STRING(iov[n++], RFC_5424_NILVALUE);
+
         IOVEC_SET_STRING(iov[n++], " ");
 
         /* Ninth: message */