From 84904b71aa529ee1ed0d7fd1494c96aeeaf882bd Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 14 May 2025 08:52:06 +0200
Subject: [PATCH] sysutils/beats: final changes before release

---
 README.md                                                      | 2 +-
 sysutils/beats/Makefile                                        | 3 +--
 .../app/controllers/OPNsense/Beats/Api/ServiceController.php   | 1 +
 .../src/opnsense/service/conf/actions.d/actions_beats.conf     | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 775f70a03..fd94485a8 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ security/tor -- The Onion Router
 security/wazuh-agent -- Agent for the open source security platform Wazuh
 sysutils/apcupsd -- APCUPSD - APC UPS daemon
 sysutils/apuled -- PC Engine APU LED control (development only)
-sysutils/beats -- Send logs, network, metrics and heartbeat to Elasticsearch (development only)
+sysutils/beats -- Send logs, network, metrics and heartbeat to Elasticsearch
 sysutils/cpu-microcode -- CPU microcode updates
 sysutils/dec-hw -- Deciso hardware specific information
 sysutils/dmidecode -- Display hardware information on the dashboard
diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile
index cf63c1365..1c44aecf4 100644
--- a/sysutils/beats/Makefile
+++ b/sysutils/beats/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		beats
-PLUGIN_VERSION=		0.1
-PLUGIN_DEVEL=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_COMMENT=		Send logs, network, metrics and heartbeat to Elasticsearch
 PLUGIN_DEPENDS=		beats8
 PLUGIN_MAINTAINER=	0xThiebaut
diff --git a/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Beats/Api/ServiceController.php b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Beats/Api/ServiceController.php
index 25187e3f5..f0526d7be 100755
--- a/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Beats/Api/ServiceController.php
+++ b/sysutils/beats/src/opnsense/mvc/app/controllers/OPNsense/Beats/Api/ServiceController.php
@@ -40,6 +40,7 @@ class ServiceController extends ApiMutableServiceControllerBase
     protected static $internalServiceTemplate = 'OPNsense/Beats';
     protected static $internalServiceEnabled = 'enabled';
     protected static $internalServiceName = 'beats';
+
     protected function reconfigureForceRestart()
     {
         return 0;
diff --git a/sysutils/beats/src/opnsense/service/conf/actions.d/actions_beats.conf b/sysutils/beats/src/opnsense/service/conf/actions.d/actions_beats.conf
index 47a4226d3..4fb0ea897 100644
--- a/sysutils/beats/src/opnsense/service/conf/actions.d/actions_beats.conf
+++ b/sysutils/beats/src/opnsense/service/conf/actions.d/actions_beats.conf
@@ -17,7 +17,8 @@ type:script
 message:restarting Filebeat
 
 [status]
-command:/usr/local/etc/rc.d/filebeat status; exit 0
+command:/usr/local/etc/rc.d/filebeat status
 parameters:
+errors:no
 type:script_output
 message:requesting Filebeat status