merge with 2.4.120, fix merge conflicts

This commit is contained in:
m0duspwnens
2024-10-25 15:09:38 -04:00
520 changed files with 12109 additions and 250 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
telegraf:
enabled:
description: You can enable or disable Telegraf.
description: Enables the grid metrics collection process. WARNING - Security Onion grid health monitoring requires this process to remain enabled. Disabling it will cause unexpected and unsupported results.
advanced: True
helpLink: influxdb.html
config:
interval: