From 410d8ecd6e7ba6e7667e690ca6ab53bbdb30761d Mon Sep 17 00:00:00 2001
From: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com>
Date: Mon, 3 Feb 2025 15:50:44 -0600
Subject: [PATCH] [cisco_asa] Fix issue with linking time zone mapping to agent
 config (#12579)

- Fixed missing tz_map reference in agent files
---
 packages/cisco_asa/changelog.yml                            | 5 +++++
 .../cisco_asa/data_stream/log/agent/stream/stream.yml.hbs   | 6 +++++-
 packages/cisco_asa/data_stream/log/agent/stream/tcp.yml.hbs | 6 +++++-
 packages/cisco_asa/data_stream/log/agent/stream/udp.yml.hbs | 6 +++++-
 packages/cisco_asa/manifest.yml                             | 2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/cisco_asa/changelog.yml b/packages/cisco_asa/changelog.yml
index 7fb93e51ddf..4a2db24831a 100644
--- a/packages/cisco_asa/changelog.yml
+++ b/packages/cisco_asa/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.41.1"
+  changes:
+    - description: "Fix issue with linking time zone mapping to agent config."
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/12579
 - version: "2.41.0"
   changes:
     - description: "Add advanced option for time zone mapping and support parsing extra timestamp in header."
diff --git a/packages/cisco_asa/data_stream/log/agent/stream/stream.yml.hbs b/packages/cisco_asa/data_stream/log/agent/stream/stream.yml.hbs
index 9b200a708fc..5926cd60ff6 100644
--- a/packages/cisco_asa/data_stream/log/agent/stream/stream.yml.hbs
+++ b/packages/cisco_asa/data_stream/log/agent/stream/stream.yml.hbs
@@ -16,12 +16,16 @@ tags:
 {{#contains "forwarded" tags}}
 publisher_pipeline.disable_host: true
 {{/contains}}
-{{#if tz_offset}}
 fields_under_root: true
 fields:
   _conf:
+{{#if tz_offset}}
     tz_offset: "{{tz_offset}}"
 {{/if}}
+{{#if tz_map}}
+    tz_map:
+      {{tz_map}}
+{{/if}}
 processors:
 - add_locale: ~
 {{#if processors}}
diff --git a/packages/cisco_asa/data_stream/log/agent/stream/tcp.yml.hbs b/packages/cisco_asa/data_stream/log/agent/stream/tcp.yml.hbs
index 03e13c69e75..5a09be9de6e 100644
--- a/packages/cisco_asa/data_stream/log/agent/stream/tcp.yml.hbs
+++ b/packages/cisco_asa/data_stream/log/agent/stream/tcp.yml.hbs
@@ -15,12 +15,16 @@ publisher_pipeline.disable_host: true
 {{#if ssl}}
 ssl: {{ssl}}
 {{/if}}
-{{#if tz_offset}}
 fields_under_root: true
 fields:
   _conf:
+{{#if tz_offset}}
     tz_offset: "{{tz_offset}}"
 {{/if}}
+{{#if tz_map}}
+    tz_map:
+      {{tz_map}}
+{{/if}}
 processors:
 - add_locale: ~
 {{#if processors}}
diff --git a/packages/cisco_asa/data_stream/log/agent/stream/udp.yml.hbs b/packages/cisco_asa/data_stream/log/agent/stream/udp.yml.hbs
index 38a9ec93312..eef0ddc88f6 100644
--- a/packages/cisco_asa/data_stream/log/agent/stream/udp.yml.hbs
+++ b/packages/cisco_asa/data_stream/log/agent/stream/udp.yml.hbs
@@ -15,12 +15,16 @@ tags:
 {{#contains "forwarded" tags}}
 publisher_pipeline.disable_host: true
 {{/contains}}
-{{#if tz_offset}}
 fields_under_root: true
 fields:
   _conf:
+{{#if tz_offset}}
     tz_offset: "{{tz_offset}}"
 {{/if}}
+{{#if tz_map}}
+    tz_map:
+      {{tz_map}}
+{{/if}}
 processors:
 - add_locale: ~
 {{#if processors}}
diff --git a/packages/cisco_asa/manifest.yml b/packages/cisco_asa/manifest.yml
index c0c8c1adb27..204ccda1a3b 100644
--- a/packages/cisco_asa/manifest.yml
+++ b/packages/cisco_asa/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.3"
 name: cisco_asa
 title: Cisco ASA
-version: "2.41.0"
+version: "2.41.1"
 description: Collect logs from Cisco ASA with Elastic Agent.
 type: integration
 categories: