diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile new file mode 100644 index 000000000..cf63c1365 --- /dev/null +++ b/sysutils/beats/Makefile @@ -0,0 +1,8 @@ +PLUGIN_NAME= beats +PLUGIN_VERSION= 0.1 +PLUGIN_DEVEL= yes +PLUGIN_COMMENT= Send logs, network, metrics and heartbeat to Elasticsearch +PLUGIN_DEPENDS= beats8 +PLUGIN_MAINTAINER= 0xThiebaut + +.include "../../Mk/plugins.mk" diff --git a/sysutils/beats8/pkg-descr b/sysutils/beats/pkg-descr similarity index 72% rename from sysutils/beats8/pkg-descr rename to sysutils/beats/pkg-descr index aa24fdd2a..f84f52a3b 100644 --- a/sysutils/beats8/pkg-descr +++ b/sysutils/beats/pkg-descr @@ -1,13 +1,10 @@ Beats is the platform for building lightweight, open source data shippers for many types of operational data you want to enrich with -Logstash, search and analyze in Elasticsearch, and visualize in Kibana. +Logstash, search and analyze in Elasticsearch. Filebeat is a lightweight, open source shipper for log file data. As the next-generation Logstash Forwarder, Filebeat tails logs and quickly sends this information to Logstash for further parsing and enrichment or to Elasticsearch for centralized storage and analysis. -The OPNsense Beats plugin only initializes Elasticsearch; -It doesn't load Kibana dashboards. - WWW: https://www.elastic.co/guide/en/beats diff --git a/sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/ServiceController.php b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/ServiceController.php similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/ServiceController.php rename to sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/ServiceController.php diff --git a/sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/SettingsController.php b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/SettingsController.php similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/SettingsController.php rename to sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/Api/SettingsController.php diff --git a/sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/IndexController.php b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/IndexController.php similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/IndexController.php rename to sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/IndexController.php diff --git a/sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/forms/filebeat.xml b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/forms/filebeat.xml similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/forms/filebeat.xml rename to sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Filebeat/forms/filebeat.xml diff --git a/sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/ACL/ACL.xml b/sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/ACL/ACL.xml similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/ACL/ACL.xml rename to sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/ACL/ACL.xml diff --git a/sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.php b/sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.php similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.php rename to sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.php diff --git a/sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.xml b/sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.xml similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.xml rename to sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Filebeat.xml diff --git a/sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Menu/Menu.xml b/sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Menu/Menu.xml similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/models/OPNsense/Beats8/Menu/Menu.xml rename to sysutils/beats/src/opnsense/mvc/app/models/OPNsense/Beats8/Menu/Menu.xml diff --git a/sysutils/beats8/src/opnsense/mvc/app/views/OPNsense/Beats8/filebeat.volt b/sysutils/beats/src/opnsense/mvc/app/views/OPNsense/Beats8/filebeat.volt similarity index 100% rename from sysutils/beats8/src/opnsense/mvc/app/views/OPNsense/Beats8/filebeat.volt rename to sysutils/beats/src/opnsense/mvc/app/views/OPNsense/Beats8/filebeat.volt diff --git a/sysutils/beats8/src/opnsense/service/conf/actions.d/actions_filebeat.conf b/sysutils/beats/src/opnsense/service/conf/actions.d/actions_filebeat.conf similarity index 91% rename from sysutils/beats8/src/opnsense/service/conf/actions.d/actions_filebeat.conf rename to sysutils/beats/src/opnsense/service/conf/actions.d/actions_filebeat.conf index b7c8aa371..47a4226d3 100644 --- a/sysutils/beats8/src/opnsense/service/conf/actions.d/actions_filebeat.conf +++ b/sysutils/beats/src/opnsense/service/conf/actions.d/actions_filebeat.conf @@ -20,4 +20,4 @@ message:restarting Filebeat command:/usr/local/etc/rc.d/filebeat status; exit 0 parameters: type:script_output -message:requesting Filebeat status \ No newline at end of file +message:requesting Filebeat status diff --git a/sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS b/sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS similarity index 58% rename from sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS rename to sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS index 88dd74dea..408300f17 100644 --- a/sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS +++ b/sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/+TARGETS @@ -1,2 +1,2 @@ filebeat.yml:/usr/local/etc/beats/filebeat.yml -filebeat:/etc/rc.conf.d/filebeat \ No newline at end of file +filebeat:/etc/rc.conf.d/filebeat diff --git a/sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/filebeat b/sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat similarity index 71% rename from sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/filebeat rename to sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat index 7b65a5fa8..c3a61aa37 100755 --- a/sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/filebeat +++ b/sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat @@ -1 +1 @@ -filebeat_enable="{{ 'YES' if not helpers.empty('OPNsense.filebeat.enabled') else 'NO' }}" \ No newline at end of file +filebeat_enable="{{ 'YES' if not helpers.empty('OPNsense.filebeat.enabled') else 'NO' }}" diff --git a/sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/filebeat.yml b/sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat.yml similarity index 100% rename from sysutils/beats8/src/opnsense/service/templates/OPNsense/Filebeat/filebeat.yml rename to sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat.yml diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile deleted file mode 100644 index c4b8aac4d..000000000 --- a/sysutils/beats8/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -PLUGIN_NAME= beats8 -PLUGIN_VERSION= 1.0 -PLUGIN_COMMENT= Send logs, network, metrics and heartbeat to elasticsearch -PLUGIN_DEPENDS= beats8 -PLUGIN_MAINTAINER= 0xThiebaut - -.include "../../Mk/plugins.mk"