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))
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(
-
- );
-
- 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..2372b3be992 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 = {
label: 'Region',
sortingKey: 'region',
},
- {
- accessor: ({ tags }) =>
- React.createElement>(TextWithExtraInfo, {
- values: tags ?? [],
- }),
- label: 'Tags',
- sortingKey: 'tags',
- },
],
};
@@ -78,10 +65,7 @@ export const serviceToFiltersMap: Record<
{ component: AlertsEngineTypeFilter, filterKey: 'engineType' },
{ component: AlertsRegionFilter, filterKey: 'region' },
],
- linode: [
- { component: AlertsRegionFilter, filterKey: 'region' },
- { component: AlertsTagFilter, filterKey: 'tags' },
- ],
+ linode: [{ component: AlertsRegionFilter, filterKey: 'region' }],
};
export const applicableAdditionalFilterKeys: AlertAdditionalFilterKey[] = [
'engineType', // Extendable in future for filter keys like 'tags', 'plan', etc.