sysultils/beats: align with our directory structure

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"

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

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
+message:requesting Filebeat status

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
+filebeat:/etc/rc.conf.d/filebeat

sysutils/beats/src/opnsense/service/templates/OPNsense/Filebeat/filebeat

@@ -1 +1 @@
-filebeat_enable="{{ 'YES' if not helpers.empty('OPNsense.filebeat.enabled') else 'NO' }}"
+filebeat_enable="{{ 'YES' if not helpers.empty('OPNsense.filebeat.enabled') else 'NO' }}"

sysutils/beats8/Makefile

@@ -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"