diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst b/doc/userguide/output/files-json/elk.rst similarity index 94% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst rename to doc/userguide/output/files-json/elk.rst index adbb73aa66..234cf203ca 100644 --- a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output.rst +++ b/doc/userguide/output/files-json/elk.rst @@ -219,21 +219,21 @@ Some possible customization of the output of Logstash and Kibana -.. image:: logstash-kibana-and-suricata-json-output/Logstash1.png +.. image:: elk/Logstash1.png -.. image:: logstash-kibana-and-suricata-json-output/Logstash2.png +.. image:: elk/Logstash2.png -.. image:: logstash-kibana-and-suricata-json-output/Logstash3.png +.. image:: elk/Logstash3.png -.. image:: logstash-kibana-and-suricata-json-output/Logstash4.png +.. image:: elk/Logstash4.png -.. image:: logstash-kibana-and-suricata-json-output/Logstash5.png +.. image:: elk/Logstash5.png -.. image:: logstash-kibana-and-suricata-json-output/Logstash6.png +.. image:: elk/Logstash6.png Peter Manev diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash1.png b/doc/userguide/output/files-json/elk/Logstash1.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash1.png rename to doc/userguide/output/files-json/elk/Logstash1.png diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash2.png b/doc/userguide/output/files-json/elk/Logstash2.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash2.png rename to doc/userguide/output/files-json/elk/Logstash2.png diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash3.png b/doc/userguide/output/files-json/elk/Logstash3.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash3.png rename to doc/userguide/output/files-json/elk/Logstash3.png diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash4.png b/doc/userguide/output/files-json/elk/Logstash4.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash4.png rename to doc/userguide/output/files-json/elk/Logstash4.png diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash5.png b/doc/userguide/output/files-json/elk/Logstash5.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash5.png rename to doc/userguide/output/files-json/elk/Logstash5.png diff --git a/doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash6.png b/doc/userguide/output/files-json/elk/Logstash6.png similarity index 100% rename from doc/userguide/output/files-json-log-output/logstash-kibana-and-suricata-json-output/Logstash6.png rename to doc/userguide/output/files-json/elk/Logstash6.png diff --git a/doc/userguide/output/files-json-log-output/files-json-log-output.rst b/doc/userguide/output/files-json/files-json.rst similarity index 97% rename from doc/userguide/output/files-json-log-output/files-json-log-output.rst rename to doc/userguide/output/files-json/files-json.rst index 036d77f734..472ae3bbd1 100644 --- a/doc/userguide/output/files-json-log-output/files-json-log-output.rst +++ b/doc/userguide/output/files-json/files-json.rst @@ -8,7 +8,7 @@ What to do with files-json.log output postgresql useful-queries-for-mysql-and-postgresql mongodb - logstash-kibana-and-suricata-json-output + elk Suricata has the ability to produce the files-json.log output. Basically this is a JSON style format output logfile with entries like this: diff --git a/doc/userguide/output/files-json-log-output/mongodb.rst b/doc/userguide/output/files-json/mongodb.rst similarity index 100% rename from doc/userguide/output/files-json-log-output/mongodb.rst rename to doc/userguide/output/files-json/mongodb.rst diff --git a/doc/userguide/output/files-json-log-output/mysql.rst b/doc/userguide/output/files-json/mysql.rst similarity index 100% rename from doc/userguide/output/files-json-log-output/mysql.rst rename to doc/userguide/output/files-json/mysql.rst diff --git a/doc/userguide/output/files-json-log-output/postgresql.rst b/doc/userguide/output/files-json/postgresql.rst similarity index 100% rename from doc/userguide/output/files-json-log-output/postgresql.rst rename to doc/userguide/output/files-json/postgresql.rst diff --git a/doc/userguide/output/files-json-log-output/script-follow-json.rst b/doc/userguide/output/files-json/script-follow-json.rst similarity index 100% rename from doc/userguide/output/files-json-log-output/script-follow-json.rst rename to doc/userguide/output/files-json/script-follow-json.rst diff --git a/doc/userguide/output/files-json-log-output/useful-queries-for-mysql-and-postgresql.rst b/doc/userguide/output/files-json/useful-queries-for-mysql-and-postgresql.rst similarity index 100% rename from doc/userguide/output/files-json-log-output/useful-queries-for-mysql-and-postgresql.rst rename to doc/userguide/output/files-json/useful-queries-for-mysql-and-postgresql.rst diff --git a/doc/userguide/output/index.rst b/doc/userguide/output/index.rst index 40aec04dc0..6d9a4f2864 100644 --- a/doc/userguide/output/index.rst +++ b/doc/userguide/output/index.rst @@ -7,4 +7,4 @@ Output lua-output syslog-alerting-comp custom-http-logging - files-json-log-output/files-json-log-output.rst + files-json/files-json.rst