eve: tls: respect global metadata config

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index 18d45dce2463cab5a949c46445660daf20dd4332..375c8a6973e9f52f57b0da50bf8d292435ccd240 100644 (file)
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -102,6 +102,7 @@ typedef struct OutputTlsCtx_ {
     LogFileCtx *file_ctx;
     uint32_t flags;  /** Store mode */
     uint64_t fields; /** Store fields */
+    bool include_metadata;
 } OutputTlsCtx;
 
 
@@ -361,6 +362,10 @@ static int JsonTlsLogger(ThreadVars *tv, void *thread_data, const Packet *p,
         return 0;
     }
 
+    if (tls_ctx->include_metadata) {
+        JsonAddMetadata(p, f, js);
+    }
+
     json_t *tjs = json_object();
     if (tjs == NULL) {
         free(js);
@@ -565,6 +570,7 @@ static OutputInitResult OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ct
     }
 
     tls_ctx->file_ctx = ojc->file_ctx;
+    tls_ctx->include_metadata = ojc->include_metadata;
 
     if ((tls_ctx->fields & LOG_TLS_FIELD_CERTIFICATE) &&
             (tls_ctx->fields & LOG_TLS_FIELD_CHAIN)) {