Merge remote-tracking branch 'origin/2.4/dev' into 2.4/heavyrc2

2025-12-29 12:23:38 +01:00 · 2023-08-01 08:53:07 -04:00
parent 64bad0a9cf ba3660d0da
commit 63b4bdcebe
17 changed files with 18 additions and 17 deletions
--- a/salt/elasticfleet/defaults.yaml
+++ b/salt/elasticfleet/defaults.yaml
@@ -32,4 +32,5 @@ elasticfleet:
    - fim
    - github
    - google_workspace
+    - log
    - 1password
--- a/salt/elasticfleet/files/integrations-dynamic/grid-nodes_general/import-zeek-logs.json
+++ b/salt/elasticfleet/files/integrations-dynamic/grid-nodes_general/import-zeek-logs.json
@@ -13,7 +13,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations-dynamic/grid-nodes_general/zeek-logs.json
+++ b/salt/elasticfleet/files/integrations-dynamic/grid-nodes_general/zeek-logs.json
@@ -14,7 +14,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/idh-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/idh-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/import-evtx-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/import-evtx-logs.json
@@ -12,7 +12,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/import-suricata-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/import-suricata-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/kratos-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/kratos-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/soc-auth-sync-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/soc-auth-sync-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/soc-salt-relay-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/soc-salt-relay-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/soc-sensoroni-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/soc-sensoroni-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/soc-server-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/soc-server-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/strelka-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/strelka-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/suricata-logs.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/suricata-logs.json
@@ -11,7 +11,7 @@
    "logs-logfile": {
      "enabled": true,
      "streams": {
-        "log.log": {
+        "log.logs": {
          "enabled": true,
          "vars": {
            "paths": [