From dd1c562209a395e08bc71f1e7d68850ae9477aa4 Mon Sep 17 00:00:00 2001
From: Harnish Chavda <118714680+harnish-elastic@users.noreply.github.com>
Date: Fri, 23 Aug 2024 10:26:51 +0530
Subject: [PATCH] [O11y][MYSQL] Add `schemaname` field in the performance data
 stream (#10749)

* Add `schemaname` field in the performance data stream

* update changelog.yml
---
 packages/mysql/changelog.yml                                 | 5 +++++
 .../performance/elasticsearch/ingest_pipeline/default.yml    | 4 +++-
 packages/mysql/data_stream/performance/fields/fields.yml     | 4 ++++
 packages/mysql/manifest.yml                                  | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/mysql/changelog.yml b/packages/mysql/changelog.yml
index 2959480a6eb..02bbe151663 100644
--- a/packages/mysql/changelog.yml
+++ b/packages/mysql/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: 1.25.0
+  changes:
+    - description: Add `schemaname` field in the performance data stream.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/10749
 - version: 1.24.0
   changes:
     - description: Add replica_status data stream.
diff --git a/packages/mysql/data_stream/performance/elasticsearch/ingest_pipeline/default.yml b/packages/mysql/data_stream/performance/elasticsearch/ingest_pipeline/default.yml
index 0b6605d7ea7..c9587f9f8fa 100644
--- a/packages/mysql/data_stream/performance/elasticsearch/ingest_pipeline/default.yml
+++ b/packages/mysql/data_stream/performance/elasticsearch/ingest_pipeline/default.yml
@@ -17,7 +17,9 @@ processors:
         ctx.mysql.performance.events_statements.query = digest.text;
 
 - fingerprint:
-    fields: ["mysql.performance.events_statements.query"]
+    fields: 
+      - mysql.performance.events_statements.query
+      - mysql.performance.events_statements.schemaname
     target_field: mysql.performance.events_statements.query_id
     ignore_failure: true
     ignore_missing: true
diff --git a/packages/mysql/data_stream/performance/fields/fields.yml b/packages/mysql/data_stream/performance/fields/fields.yml
index 9e3c110b980..50598e2ba0b 100644
--- a/packages/mysql/data_stream/performance/fields/fields.yml
+++ b/packages/mysql/data_stream/performance/fields/fields.yml
@@ -4,6 +4,10 @@
     - name: events_statements
       type: group
       fields:
+        - name: schemaname
+          type: keyword
+          dimension: true
+          description: Alias for the database name within certain SQL statements.
         - name: query_id
           type: keyword
           # Reason to add as a dimension field: shows results based on queries.
diff --git a/packages/mysql/manifest.yml b/packages/mysql/manifest.yml
index 0b4772b053b..0e7192f2d36 100644
--- a/packages/mysql/manifest.yml
+++ b/packages/mysql/manifest.yml
@@ -1,7 +1,7 @@
 format_version: "3.0.2"
 name: mysql
 title: MySQL
-version: "1.24.0"
+version: "1.25.0"
 description: Collect logs and metrics from MySQL servers with Elastic Agent.
 type: integration
 categories:
@@ -9,7 +9,7 @@ categories:
   - observability
 conditions:
   kibana:
-    version: "^8.14.0"
+    version: "^8.15.0"
   elastic:
     subscription: basic
 screenshots: