Final pre-release touches

* Add more of the cost dimensions to our graphs
pluralsh · Dec 20, 2024 · 6237e88 · 6237e88
1 parent ce29cf2
commit 6237e88
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 24 deletions.
diff --git a/assets/src/components/cost-management/ClusterUsagesTableCols.tsx b/assets/src/components/cost-management/ClusterUsagesTableCols.tsx
@@ -15,6 +15,8 @@ const columnHelper = createColumnHelper<
   ClusterUsageTinyFragment | ClusterNamespaceUsageFragment
 >()
 
+const dollarize = (cost) => (cost ? `$${cost.toFixed(3)}` : '--')
+
 export const ColCluster = (
   columnHelper as ColumnHelper<ClusterUsageTinyFragment>
 ).accessor(({ cluster }) => cluster?.name, {
@@ -82,6 +84,49 @@ export const ColCpuCost = columnHelper.accessor(({ cpuCost }) => cpuCost, {
   },
 })
 
+export const ColStorageCost = columnHelper.accessor(({ storage }) => storage, {
+  id: 'storageCost',
+  header: 'Storage cost',
+  cell: function Cell({ getValue }) {
+    const storage = getValue()
+
+    return <SimpleTextWrapperSC>{dollarize(storage)}</SimpleTextWrapperSC>
+  },
+})
+
+export const ColLoadBalancerCost = columnHelper.accessor(
+  ({ loadBalancerCost }) => loadBalancerCost,
+  {
+    id: 'loadBalancerCost',
+    header: 'Load balancer cost',
+    cell: function Cell({ getValue }) {
+      const loadBalancerCost = getValue()
+
+      return (
+        <SimpleTextWrapperSC>{dollarize(loadBalancerCost)}</SimpleTextWrapperSC>
+      )
+    },
+  }
+)
+
+export const ColNetworkCost = columnHelper.accessor(
+  ({ ingressCost, egressCost }) =>
+    (ingressCost || egressCost) && { ingressCost, egressCost },
+  {
+    id: 'networkCost',
+    header: 'Network cost',
+    cell: function Cell({ row: { original } }) {
+      const { ingressCost, egressCost } = original
+
+      return (
+        <SimpleTextWrapperSC>
+          {dollarize(ingressCost)} / {dollarize(egressCost)}
+        </SimpleTextWrapperSC>
+      )
+    },
+  }
+)
+
 export const ColCpuEfficiency = columnHelper.accessor(
   (usage) => {
     const efficiency = (usage.cpuUtil ?? NaN) / (usage.cpu ?? NaN)

diff --git a/assets/src/components/cost-management/CostManagement.tsx b/assets/src/components/cost-management/CostManagement.tsx
@@ -31,9 +31,10 @@ import {
   ColCluster,
   ColCpuCost,
   ColCpuEfficiency,
+  ColLoadBalancerCost,
   ColMemoryCost,
   ColMemoryEfficiency,
-  ColNodeCost,
+  ColNetworkCost,
 } from './ClusterUsagesTableCols'
 import {
   CostManagementTreeMap,
@@ -183,10 +184,12 @@ const WrapperSC = styled.div(({ theme }) => ({
 
 const cols = [
   ColCluster,
-  ColNodeCost,
   ColCpuCost,
-  ColCpuEfficiency,
   ColMemoryCost,
+  // ColStorageCost,
+  ColLoadBalancerCost,
+  ColNetworkCost,
   ColMemoryEfficiency,
+  ColCpuEfficiency,
   ColActions,
 ]
diff --git a/assets/src/components/cost-management/details/CostManagementDetailsNamespaces.tsx b/assets/src/components/cost-management/details/CostManagementDetailsNamespaces.tsx
@@ -21,9 +21,11 @@ import { useTheme } from 'styled-components'
 import {
   ColCpuCost,
   ColCpuEfficiency,
+  ColLoadBalancerCost,
   ColMemoryCost,
   ColMemoryEfficiency,
   ColNamespace,
+  ColNetworkCost,
 } from '../ClusterUsagesTableCols'
 import { CM_TREE_MAP_CARD_HEIGHT } from '../CostManagement'
 import {
@@ -157,7 +159,10 @@ export function CostManagementDetailsNamespaces() {
 const cols = [
   ColNamespace,
   ColCpuCost,
-  ColCpuEfficiency,
   ColMemoryCost,
+  // ColStorageCost,
+  ColLoadBalancerCost,
+  ColNetworkCost,
+  ColCpuEfficiency,
   ColMemoryEfficiency,
 ]
diff --git a/assets/src/generated/graphql.ts b/assets/src/generated/graphql.ts
@@ -1391,6 +1391,8 @@ export type ClusterNamespaceUsage = {
   memory?: Maybe<Scalars['Float']['output']>;
   memoryCost?: Maybe<Scalars['Float']['output']>;
   namespace?: Maybe<Scalars['String']['output']>;
+  /** the amount of storage used by this namespace */
+  storage?: Maybe<Scalars['Float']['output']>;
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };
 
@@ -1669,6 +1671,8 @@ export type ClusterUsage = {
   namespaces?: Maybe<ClusterNamespaceUsageConnection>;
   nodeCost?: Maybe<Scalars['Float']['output']>;
   recommendations?: Maybe<ClusterScalingRecommendationConnection>;
+  /** the amount of storage used by this cluster */
+  storage?: Maybe<Scalars['Float']['output']>;
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };
 
@@ -11412,9 +11416,9 @@ export type ComponentTreeQueryVariables = Exact<{
 
 export type ComponentTreeQuery = { __typename?: 'RootQueryType', componentTree?: { __typename?: 'ComponentTree', root?: { __typename?: 'KubernetesUnstructured', raw?: Record<string, unknown> | null, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null, edges?: Array<{ __typename?: 'ResourceEdge', from: string, to: string } | null> | null, certificates?: Array<{ __typename?: 'Certificate', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, configmaps?: Array<{ __typename?: 'ConfigMap', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, cronjobs?: Array<{ __typename?: 'CronJob', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, daemonsets?: Array<{ __typename?: 'DaemonSet', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, deployments?: Array<{ __typename?: 'Deployment', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, ingresses?: Array<{ __typename?: 'Ingress', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, secrets?: Array<{ __typename?: 'Secret', metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, services?: Array<{ __typename?: 'Service', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null, statefulsets?: Array<{ __typename?: 'StatefulSet', raw: string, metadata: { __typename?: 'Metadata', uid?: string | null, name: string, namespace?: string | null, creationTimestamp?: string | null, labels?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null, annotations?: Array<{ __typename?: 'LabelPair', name?: string | null, value?: string | null } | null> | null } } | null> | null } | null };
 
-export type ClusterUsageTinyFragment = { __typename?: 'ClusterUsage', id: string, cpu?: number | null, memory?: number | null, gpu?: number | null, cpuUtil?: number | null, memUtil?: number | null, cpuCost?: number | null, memoryCost?: number | null, nodeCost?: number | null, controlPlaneCost?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null, cluster?: { __typename?: 'Cluster', self?: boolean | null, virtual?: boolean | null, id: string, name: string, distro?: ClusterDistro | null, project?: { __typename?: 'Project', id: string, name: string } | null, upgradePlan?: { __typename?: 'ClusterUpgradePlan', compatibilities?: boolean | null, deprecations?: boolean | null, incompatibilities?: boolean | null } | null, provider?: { __typename?: 'ClusterProvider', cloud: string } | null } | null };
+export type ClusterUsageTinyFragment = { __typename?: 'ClusterUsage', id: string, cpu?: number | null, memory?: number | null, gpu?: number | null, storage?: number | null, cpuUtil?: number | null, memUtil?: number | null, cpuCost?: number | null, memoryCost?: number | null, nodeCost?: number | null, controlPlaneCost?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null, cluster?: { __typename?: 'Cluster', self?: boolean | null, virtual?: boolean | null, id: string, name: string, distro?: ClusterDistro | null, project?: { __typename?: 'Project', id: string, name: string } | null, upgradePlan?: { __typename?: 'ClusterUpgradePlan', compatibilities?: boolean | null, deprecations?: boolean | null, incompatibilities?: boolean | null } | null, provider?: { __typename?: 'ClusterProvider', cloud: string } | null } | null };
 
-export type ClusterNamespaceUsageFragment = { __typename?: 'ClusterNamespaceUsage', id: string, namespace?: string | null, cpuCost?: number | null, cpuUtil?: number | null, cpu?: number | null, memoryCost?: number | null, memUtil?: number | null, memory?: number | null };
+export type ClusterNamespaceUsageFragment = { __typename?: 'ClusterNamespaceUsage', id: string, namespace?: string | null, storage?: number | null, cpuCost?: number | null, cpuUtil?: number | null, cpu?: number | null, memoryCost?: number | null, memUtil?: number | null, memory?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null };
 
 export type ClusterScalingRecommendationFragment = { __typename?: 'ClusterScalingRecommendation', id: string, namespace?: string | null, name?: string | null, container?: string | null, cpuCost?: number | null, cpuRequest?: number | null, cpuRecommendation?: number | null, memoryCost?: number | null, memoryRequest?: number | null, memoryRecommendation?: number | null, type?: ScalingRecommendationType | null };
 
@@ -11429,7 +11433,7 @@ export type ClusterUsagesQueryVariables = Exact<{
 }>;
 
 
-export type ClusterUsagesQuery = { __typename?: 'RootQueryType', clusterUsages?: { __typename?: 'ClusterUsageConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null, hasPreviousPage: boolean, startCursor?: string | null }, edges?: Array<{ __typename?: 'ClusterUsageEdge', node?: { __typename?: 'ClusterUsage', id: string, cpu?: number | null, memory?: number | null, gpu?: number | null, cpuUtil?: number | null, memUtil?: number | null, cpuCost?: number | null, memoryCost?: number | null, nodeCost?: number | null, controlPlaneCost?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null, cluster?: { __typename?: 'Cluster', self?: boolean | null, virtual?: boolean | null, id: string, name: string, distro?: ClusterDistro | null, project?: { __typename?: 'Project', id: string, name: string } | null, upgradePlan?: { __typename?: 'ClusterUpgradePlan', compatibilities?: boolean | null, deprecations?: boolean | null, incompatibilities?: boolean | null } | null, provider?: { __typename?: 'ClusterProvider', cloud: string } | null } | null } | null } | null> | null } | null };
+export type ClusterUsagesQuery = { __typename?: 'RootQueryType', clusterUsages?: { __typename?: 'ClusterUsageConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null, hasPreviousPage: boolean, startCursor?: string | null }, edges?: Array<{ __typename?: 'ClusterUsageEdge', node?: { __typename?: 'ClusterUsage', id: string, cpu?: number | null, memory?: number | null, gpu?: number | null, storage?: number | null, cpuUtil?: number | null, memUtil?: number | null, cpuCost?: number | null, memoryCost?: number | null, nodeCost?: number | null, controlPlaneCost?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null, cluster?: { __typename?: 'Cluster', self?: boolean | null, virtual?: boolean | null, id: string, name: string, distro?: ClusterDistro | null, project?: { __typename?: 'Project', id: string, name: string } | null, upgradePlan?: { __typename?: 'ClusterUpgradePlan', compatibilities?: boolean | null, deprecations?: boolean | null, incompatibilities?: boolean | null } | null, provider?: { __typename?: 'ClusterProvider', cloud: string } | null } | null } | null } | null> | null } | null };
 
 export type ClusterUsageNamespacesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -11441,7 +11445,7 @@ export type ClusterUsageNamespacesQueryVariables = Exact<{
 }>;
 
 
-export type ClusterUsageNamespacesQuery = { __typename?: 'RootQueryType', clusterUsage?: { __typename?: 'ClusterUsage', id: string, cluster?: { __typename?: 'Cluster', id: string, name: string } | null, namespaces?: { __typename?: 'ClusterNamespaceUsageConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null, hasPreviousPage: boolean, startCursor?: string | null }, edges?: Array<{ __typename?: 'ClusterNamespaceUsageEdge', node?: { __typename?: 'ClusterNamespaceUsage', id: string, namespace?: string | null, cpuCost?: number | null, cpuUtil?: number | null, cpu?: number | null, memoryCost?: number | null, memUtil?: number | null, memory?: number | null } | null } | null> | null } | null } | null };
+export type ClusterUsageNamespacesQuery = { __typename?: 'RootQueryType', clusterUsage?: { __typename?: 'ClusterUsage', id: string, cluster?: { __typename?: 'Cluster', id: string, name: string } | null, namespaces?: { __typename?: 'ClusterNamespaceUsageConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, endCursor?: string | null, hasPreviousPage: boolean, startCursor?: string | null }, edges?: Array<{ __typename?: 'ClusterNamespaceUsageEdge', node?: { __typename?: 'ClusterNamespaceUsage', id: string, namespace?: string | null, storage?: number | null, cpuCost?: number | null, cpuUtil?: number | null, cpu?: number | null, memoryCost?: number | null, memUtil?: number | null, memory?: number | null, ingressCost?: number | null, loadBalancerCost?: number | null, egressCost?: number | null } | null } | null> | null } | null } | null };
 
 export type ClusterUsageScalingRecommendationsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -14206,6 +14210,7 @@ export const ClusterUsageTinyFragmentDoc = gql`
   cpu
   memory
   gpu
+  storage
   cpuUtil
   memUtil
   cpuCost
@@ -14228,12 +14233,16 @@ export const ClusterNamespaceUsageFragmentDoc = gql`
     fragment ClusterNamespaceUsage on ClusterNamespaceUsage {
   id
   namespace
+  storage
   cpuCost
   cpuUtil
   cpu
   memoryCost
   memUtil
   memory
+  ingressCost
+  loadBalancerCost
+  egressCost
 }
     `;
 export const ClusterScalingRecommendationFragmentDoc = gql`

diff --git a/assets/src/graph/costManagement.graphql b/assets/src/graph/costManagement.graphql
@@ -3,6 +3,7 @@ fragment ClusterUsageTiny on ClusterUsage {
   cpu
   memory
   gpu
+  storage
   cpuUtil
   memUtil
   cpuCost
@@ -24,12 +25,16 @@ fragment ClusterUsageTiny on ClusterUsage {
 fragment ClusterNamespaceUsage on ClusterNamespaceUsage {
   id
   namespace
+  storage
   cpuCost
   cpuUtil
   cpu
   memoryCost
   memUtil
   memory
+  ingressCost
+  loadBalancerCost
+  egressCost
 }
 
 fragment ClusterScalingRecommendation on ClusterScalingRecommendation {

diff --git a/go/client/models_gen.go b/go/client/models_gen.go