From fdbe2129b57851958df02cbdc62bb8f543da57da Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Wed, 28 May 2025 16:38:12 +0530
Subject: [PATCH 1/3] upcoming: [DI-25149] - Removing tags filter for linode
 flow

---
 .../AlertsResourcesFilterRenderer.test.tsx    | 21 -------------------
 .../Alerts/AlertsResources/constants.ts       | 14 -------------
 2 files changed, 35 deletions(-)

diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
index c678a09540b..e1f70538790 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesFilterRenderer.test.tsx
@@ -52,26 +52,5 @@ describe('AlertsResourcesFilterRenderer', () => {
     );
 
     expect(getByPlaceholderText('Select Regions')).toBeInTheDocument();
-
-    const tagProps = getAlertResourceFilterProps({
-      filterKey: 'tags',
-      handleFilterChange: handleFilterChangeMock,
-      handleFilteredRegionsChange: handleFilterChangeMock,
-      regionOptions: [],
-      tagOptions: ['tag1', 'tag2'],
-    });
-    const tagPropKeys = Object.keys(tagProps);
-    expect(tagPropKeys.includes('handleFilterChange')).toBeTruthy();
-    expect(tagPropKeys.includes('handleSelectionChange')).toBeFalsy();
-
-    // Check for region filter
-    renderWithTheme(
-      <AlertResourcesFilterRenderer
-        component={serviceToFiltersMap['linode'][1].component}
-        componentProps={tagProps}
-      />
-    );
-
-    expect(getByPlaceholderText('Select Tags')).toBeInTheDocument();
   });
 });
diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
index 44ba741f2d1..4d24beb7931 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
@@ -1,13 +1,8 @@
-import React from 'react';
-
 import { engineTypeMap } from '../constants';
 import { AlertsEngineTypeFilter } from './AlertsEngineTypeFilter';
 import { AlertsRegionFilter } from './AlertsRegionFilter';
-import { AlertsTagFilter } from './AlertsTagsFilter';
-import { TextWithExtraInfo } from './TextWithExtraInfo';
 
 import type { AlertInstance } from './DisplayAlertResources';
-import type { TextWithInfoProp } from './TextWithExtraInfo';
 import type {
   AlertAdditionalFilterKey,
   ServiceColumns,
@@ -58,14 +53,6 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
       label: 'Region',
       sortingKey: 'region',
     },
-    {
-      accessor: ({ tags }) =>
-        React.createElement<Required<TextWithInfoProp>>(TextWithExtraInfo, {
-          values: tags ?? [],
-        }),
-      label: 'Tags',
-      sortingKey: 'tags',
-    },
   ],
 };
 
@@ -80,7 +67,6 @@ export const serviceToFiltersMap: Record<
   ],
   linode: [
     { component: AlertsRegionFilter, filterKey: 'region' },
-    { component: AlertsTagFilter, filterKey: 'tags' },
   ],
 };
 export const applicableAdditionalFilterKeys: AlertAdditionalFilterKey[] = [

From eca76a078de8617f3b3fb25593e240448feb3be2 Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Thu, 5 Jun 2025 12:01:39 +0530
Subject: [PATCH 2/3] upcoming: [DI-25149] - Fixing linting

---
 .../features/CloudPulse/Alerts/AlertsResources/constants.ts   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
index 4d24beb7931..2372b3be992 100644
--- a/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
+++ b/packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts
@@ -65,9 +65,7 @@ export const serviceToFiltersMap: Record<
     { component: AlertsEngineTypeFilter, filterKey: 'engineType' },
     { component: AlertsRegionFilter, filterKey: 'region' },
   ],
-  linode: [
-    { component: AlertsRegionFilter, filterKey: 'region' },
-  ],
+  linode: [{ component: AlertsRegionFilter, filterKey: 'region' }],
 };
 export const applicableAdditionalFilterKeys: AlertAdditionalFilterKey[] = [
   'engineType', // Extendable in future for filter keys like 'tags', 'plan', etc.

From dd6751d2db8587f626aa762def45573524fc5868 Mon Sep 17 00:00:00 2001
From: santoshp210-akamai
 <159890961+santoshp210-akamai@users.noreply.github.com>
Date: Thu, 5 Jun 2025 12:29:32 +0530
Subject: [PATCH 3/3] upcoming: [DI-25149] - Add changeset

---
 .../.changeset/pr-12335-upcoming-features-1749106731336.md   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-12335-upcoming-features-1749106731336.md

diff --git a/packages/manager/.changeset/pr-12335-upcoming-features-1749106731336.md b/packages/manager/.changeset/pr-12335-upcoming-features-1749106731336.md
new file mode 100644
index 00000000000..c9302681900
--- /dev/null
+++ b/packages/manager/.changeset/pr-12335-upcoming-features-1749106731336.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Exclude tags column and filter from entity table for Linode-based Alerts in Cloudpulse Alerting ([#12335](https://github.com/linode/manager/pull/12335))