From 0606c0a454c3fa0474dfc774dec48b3b503b9772 Mon Sep 17 00:00:00 2001
From: reyesj2 <94730068+reyesj2@users.noreply.github.com>
Date: Fri, 12 Sep 2025 14:26:22 -0500
Subject: [PATCH] agent monitor template & dataset name update

---
 .../grid-nodes_general/elastic-agent-monitor.json         | 2 +-
 salt/elasticsearch/defaults.yaml                          | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json b/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
index 344d7b3bc..0be40a3d3 100644
--- a/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
+++ b/salt/elasticfleet/files/integrations/grid-nodes_general/elastic-agent-monitor.json
@@ -21,7 +21,7 @@
             "paths": [
               "/opt/so/log/agents/agent-monitor.log"
             ],
-            "data_stream.dataset": "agent-monitor",
+            "data_stream.dataset": "agentmonitor",
             "pipeline": "elasticagent.monitor",
             "parsers": "",
             "exclude_files": [
diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index 1200701c9..d5e6fc216 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -1243,7 +1243,7 @@ elasticsearch:
               set_priority:
                 priority: 50
             min_age: 30d
-    so-logs-agent-monitor:
+    so-elastic-agent-monitor:
       index_sorting: false
       index_template:
         composed_of:
@@ -1255,10 +1255,8 @@ elasticsearch:
         data_stream:
           allow_custom_routing: false
           hidden: false
-        ignore_missing_component_templates:
-        - logs-agent-monitor@custom
         index_patterns:
-        - logs-agent-monitor-*
+        - logs-agentmonitor-*
         priority: 501
         template:
           mappings:
@@ -1270,7 +1268,7 @@ elasticsearch:
           settings:
             index:
               lifecycle:
-                name: so-logs-agent-monitor-logs
+                name: so-elastic-agent-monitor-logs
               mapping:
                 total_fields:
                   limit: 5000