From 142883877a11a80e4a2b2455f591a578d034940c Mon Sep 17 00:00:00 2001
From: Aleksandr Malyshev <amalyshev@yugabyte.com>
Date: Thu, 25 Apr 2024 18:48:08 +0300
Subject: [PATCH] [PLAT-13626] Add both ASH graphs to each anomaly

Summary: Add both ASH graphs to each anomaly for better RCA

Test Plan: tested manually

Reviewers: rmadhavan

Reviewed By: rmadhavan

Subscribers: yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D34543
---
 .../resources/anomaly/anomalies_metadata.json | 19 +++++++++++++++++++
 .../query_lock_contention/anomalies.json      | 11 +++++++++++
 2 files changed, 30 insertions(+)

diff --git a/troubleshoot/backend/src/main/resources/anomaly/anomalies_metadata.json b/troubleshoot/backend/src/main/resources/anomaly/anomalies_metadata.json
index c91df657342..2f6aebed330 100644
--- a/troubleshoot/backend/src/main/resources/anomaly/anomalies_metadata.json
+++ b/troubleshoot/backend/src/main/resources/anomaly/anomalies_metadata.json
@@ -278,6 +278,13 @@
                   "universeUuid": [],
                   "queryId": []
                 }
+              },
+              {
+                "name": "active_session_history_ysql",
+                "filters": {
+                  "universeUuid": [],
+                  "queryId": []
+                }
               }
             ]
           }
@@ -408,6 +415,12 @@
                 "filters": {
                   "universeUuid": []
                 }
+              },
+              {
+                "name": "active_session_history_ysql",
+                "filters": {
+                  "universeUuid": []
+                }
               }
             ]
           }
@@ -469,6 +482,12 @@
           {
             "recommendation": "Check ASH graph per query/client",
             "supportingGraphs": [
+              {
+                "name": "active_session_history_tserver",
+                "filters": {
+                  "universeUuid": []
+                }
+              },
               {
                 "name": "active_session_history_ysql",
                 "filters": {
diff --git a/troubleshoot/backend/src/test/resources/anomaly/query_lock_contention/anomalies.json b/troubleshoot/backend/src/test/resources/anomaly/query_lock_contention/anomalies.json
index 36764b9d82f..03e3a68a604 100644
--- a/troubleshoot/backend/src/test/resources/anomaly/query_lock_contention/anomalies.json
+++ b/troubleshoot/backend/src/test/resources/anomaly/query_lock_contention/anomalies.json
@@ -115,6 +115,17 @@
                   ]
                 },
                 "name": "active_session_history_tserver"
+              },
+              {
+                "filters": {
+                  "queryId": [
+                    "100"
+                  ],
+                  "universeUuid": [
+                    "9ad06d1f-0355-4e3c-a42c-d052b38af7bc"
+                  ]
+                },
+                "name": "active_session_history_ysql"
               }
             ]
           }