From 66fbc5ea41e78febdc863d738e86920cfa297efc Mon Sep 17 00:00:00 2001 From: nikhagra-akamai Date: Fri, 4 Jul 2025 16:09:15 +0530 Subject: [PATCH 1/4] upcoming: [DI-25634] - Added linode_id to label translation in cloudpulse graph --- .../features/CloudPulse/Utils/CloudPulseWidgetUtils.ts | 7 +++++++ .../CloudPulse/shared/CloudPulseResourcesSelect.tsx | 2 ++ packages/manager/src/mocks/serverHandlers.ts | 1 + packages/manager/src/queries/cloudpulse/resources.ts | 9 +++++++++ 4 files changed, 19 insertions(+) diff --git a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts index d66d88f316a..cacdff768b2 100644 --- a/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts +++ b/packages/manager/src/features/CloudPulse/Utils/CloudPulseWidgetUtils.ts @@ -323,6 +323,13 @@ export const getDimensionName = (props: DimensionNameProperties): string => { return mapResourceIdToName(value, resources); } + if (key === 'linode_id') { + return ( + resources.find((resource) => resource.entities?.[value] !== undefined) + ?.entities?.[value] ?? value + ); + } + if (key === 'metric_name' && hideMetricName) { return ''; } diff --git a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx index 4172ffec9e6..98fdd6499c7 100644 --- a/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx +++ b/packages/manager/src/features/CloudPulse/shared/CloudPulseResourcesSelect.tsx @@ -10,6 +10,8 @@ import { deepEqual } from '../Utils/FilterBuilder'; import type { Filter, FilterValue } from '@linode/api-v4'; export interface CloudPulseResources { + engineType?: string; + entities?: Record; id: string; label: string; region?: string; diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts index 4ed70cfb712..c4c1c455bac 100644 --- a/packages/manager/src/mocks/serverHandlers.ts +++ b/packages/manager/src/mocks/serverHandlers.ts @@ -3157,6 +3157,7 @@ export const handlers = [ metric: { entity_id: '123', metric_name: 'average_cpu_usage', + linode_id: '1', node_id: 'primary-1', }, values: [ diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts index ab4bbfbad7a..5539835b31c 100644 --- a/packages/manager/src/queries/cloudpulse/resources.ts +++ b/packages/manager/src/queries/cloudpulse/resources.ts @@ -16,6 +16,14 @@ export const useResourcesQuery = ( enabled, select: (resources) => { return resources.map((resource) => { + const entities: Record = {}; + resource.entities?.forEach( + (entity: { id: number; label: string; type: string }) => { + if (entity.type === 'linode') { + entities[String(entity.id)] = entity.label; + } + } + ); return { engineType: resource.engine, id: String(resource.id), @@ -23,6 +31,7 @@ export const useResourcesQuery = ( region: resource.region, regions: resource.regions ? resource.regions : [], tags: resource.tags, + entities, }; }); }, From 531d109180acf6f9db87601fcd757e4a9d6a249e Mon Sep 17 00:00:00 2001 From: nikhagra-akamai Date: Wed, 23 Jul 2025 18:00:12 +0530 Subject: [PATCH 2/4] upcoming: [DI-26181] - Added condition to map entities only in case of firewall --- .../manager/src/queries/cloudpulse/resources.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/manager/src/queries/cloudpulse/resources.ts b/packages/manager/src/queries/cloudpulse/resources.ts index 5539835b31c..2cd9b1d8164 100644 --- a/packages/manager/src/queries/cloudpulse/resources.ts +++ b/packages/manager/src/queries/cloudpulse/resources.ts @@ -17,13 +17,17 @@ export const useResourcesQuery = ( select: (resources) => { return resources.map((resource) => { const entities: Record = {}; - resource.entities?.forEach( - (entity: { id: number; label: string; type: string }) => { - if (entity.type === 'linode') { - entities[String(entity.id)] = entity.label; + + // handle separately for firewall resource type + if (resourceType === 'firewall') { + resource.entities?.forEach( + (entity: { id: number; label: string; type: string }) => { + if (entity.type === 'linode') { + entities[String(entity.id)] = entity.label; + } } - } - ); + ); + } return { engineType: resource.engine, id: String(resource.id), From 6dc6290d10a4279a67d716f8134a707629e4d11f Mon Sep 17 00:00:00 2001 From: nikhagra-akamai Date: Wed, 23 Jul 2025 19:23:10 +0530 Subject: [PATCH 3/4] changeset added --- .../manager/.changeset/pr-12558-changed-1753278593776.md | 5 +++++ .../.changeset/pr-12558-upcoming-features-1753278473938.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 packages/manager/.changeset/pr-12558-changed-1753278593776.md create mode 100644 packages/manager/.changeset/pr-12558-upcoming-features-1753278473938.md diff --git a/packages/manager/.changeset/pr-12558-changed-1753278593776.md b/packages/manager/.changeset/pr-12558-changed-1753278593776.md new file mode 100644 index 00000000000..eebf9a304d7 --- /dev/null +++ b/packages/manager/.changeset/pr-12558-changed-1753278593776.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Changed +--- + +ACLP: add `regionId` prop to `filter region scope` alerts, add `isLegacyAlertAvailable` to `show confirmation dialog on save of alerts`, add logic to `hide manage alert button` in `AlertReusableComponent` ([#12558](https://github.com/linode/manager/pull/12558)) diff --git a/packages/manager/.changeset/pr-12558-upcoming-features-1753278473938.md b/packages/manager/.changeset/pr-12558-upcoming-features-1753278473938.md new file mode 100644 index 00000000000..20c47c2514a --- /dev/null +++ b/packages/manager/.changeset/pr-12558-upcoming-features-1753278473938.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Upcoming Features +--- + +ACLP: add `linode id to label` translation logic for legend rows, add `entities` to `CloudPulseResouces` interface ([#12558](https://github.com/linode/manager/pull/12558)) From dd5d193750330e1bf63a48807b474e8a7a439da0 Mon Sep 17 00:00:00 2001 From: nikhagra-akamai Date: Fri, 25 Jul 2025 21:09:00 +0530 Subject: [PATCH 4/4] Removed changeset --- .../manager/.changeset/pr-12558-changed-1753278593776.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 packages/manager/.changeset/pr-12558-changed-1753278593776.md diff --git a/packages/manager/.changeset/pr-12558-changed-1753278593776.md b/packages/manager/.changeset/pr-12558-changed-1753278593776.md deleted file mode 100644 index eebf9a304d7..00000000000 --- a/packages/manager/.changeset/pr-12558-changed-1753278593776.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@linode/manager": Changed ---- - -ACLP: add `regionId` prop to `filter region scope` alerts, add `isLegacyAlertAvailable` to `show confirmation dialog on save of alerts`, add logic to `hide manage alert button` in `AlertReusableComponent` ([#12558](https://github.com/linode/manager/pull/12558))