Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final pre-release touches #1705

Merged
merged 1 commit into from
Dec 21, 2024
Merged

Final pre-release touches #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions assets/src/components/cost-management/ClusterUsagesTableCols.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 6 additions & 3 deletions assets/src/components/cost-management/CostManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ import {
ColCluster,
ColCpuCost,
ColCpuEfficiency,
ColLoadBalancerCost,
ColMemoryCost,
ColMemoryEfficiency,
ColNodeCost,
ColNetworkCost,
} from './ClusterUsagesTableCols'
import {
CostManagementTreeMap,
Expand Down Expand Up @@ -183,10 +184,12 @@ const WrapperSC = styled.div(({ theme }) => ({

const cols = [
ColCluster,
ColNodeCost,
ColCpuCost,
ColCpuEfficiency,
ColMemoryCost,
// ColStorageCost,
ColLoadBalancerCost,
ColNetworkCost,
ColMemoryEfficiency,
ColCpuEfficiency,
ColActions,
]
7 changes: 6 additions & 1 deletion assets/src/components/cost-management/details/CostManagementDetailsNamespaces.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -157,7 +159,10 @@ export function CostManagementDetailsNamespaces() {
const cols = [
ColNamespace,
ColCpuCost,
ColCpuEfficiency,
ColMemoryCost,
// ColStorageCost,
ColLoadBalancerCost,
ColNetworkCost,
ColCpuEfficiency,
ColMemoryEfficiency,
]
59 changes: 55 additions & 4 deletions assets/src/generated/graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,9 @@ 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']>;
storageCost?: Maybe<Scalars['Float']['output']>;
updatedAt?: Maybe<Scalars['DateTime']['output']>;
};

Expand Down Expand Up @@ -1658,6 +1661,7 @@ export type ClusterUsage = {
egressCost?: Maybe<Scalars['Float']['output']>;
gpu?: Maybe<Scalars['Float']['output']>;
gpuCost?: Maybe<Scalars['Float']['output']>;
history?: Maybe<ClusterUsageHistoryConnection>;
id: Scalars['ID']['output'];
ingressCost?: Maybe<Scalars['Float']['output']>;
insertedAt?: Maybe<Scalars['DateTime']['output']>;
Expand All @@ -1669,10 +1673,21 @@ 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']>;
storageCost?: Maybe<Scalars['Float']['output']>;
updatedAt?: Maybe<Scalars['DateTime']['output']>;
};


export type ClusterUsageHistoryArgs = {
after?: InputMaybe<Scalars['String']['input']>;
before?: InputMaybe<Scalars['String']['input']>;
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
};


export type ClusterUsageNamespacesArgs = {
after?: InputMaybe<Scalars['String']['input']>;
before?: InputMaybe<Scalars['String']['input']>;
Expand Down Expand Up @@ -1703,6 +1718,36 @@ export type ClusterUsageEdge = {
node?: Maybe<ClusterUsage>;
};

export type ClusterUsageHistory = {
__typename?: 'ClusterUsageHistory';
cluster?: Maybe<Cluster>;
controlPlaneCost?: Maybe<Scalars['Float']['output']>;
cpuCost?: Maybe<Scalars['Float']['output']>;
egressCost?: Maybe<Scalars['Float']['output']>;
gpuCost?: Maybe<Scalars['Float']['output']>;
id: Scalars['ID']['output'];
ingressCost?: Maybe<Scalars['Float']['output']>;
insertedAt?: Maybe<Scalars['DateTime']['output']>;
loadBalancerCost?: Maybe<Scalars['Float']['output']>;
memoryCost?: Maybe<Scalars['Float']['output']>;
nodeCost?: Maybe<Scalars['Float']['output']>;
storageCost?: Maybe<Scalars['Float']['output']>;
timestamp: Scalars['DateTime']['output'];
updatedAt?: Maybe<Scalars['DateTime']['output']>;
};

export type ClusterUsageHistoryConnection = {
__typename?: 'ClusterUsageHistoryConnection';
edges?: Maybe<Array<Maybe<ClusterUsageHistoryEdge>>>;
pageInfo: PageInfo;
};

export type ClusterUsageHistoryEdge = {
__typename?: 'ClusterUsageHistoryEdge';
cursor?: Maybe<Scalars['String']['output']>;
node?: Maybe<ClusterUsageHistory>;
};

export type Command = {
__typename?: 'Command';
build?: Maybe<Build>;
Expand Down Expand Up @@ -2070,6 +2115,7 @@ export type CostAttributes = {
namespace?: InputMaybe<Scalars['String']['input']>;
nodeCost?: InputMaybe<Scalars['Float']['input']>;
storage?: InputMaybe<Scalars['Float']['input']>;
storageCost?: InputMaybe<Scalars['Float']['input']>;
};

export type CostIngestAttributes = {
Expand Down Expand Up @@ -11412,9 +11458,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 };

Expand All @@ -11429,7 +11475,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'];
Expand All @@ -11441,7 +11487,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'];
Expand Down Expand Up @@ -14206,6 +14252,7 @@ export const ClusterUsageTinyFragmentDoc = gql`
cpu
memory
gpu
storage
cpuUtil
memUtil
cpuCost
Expand All @@ -14228,12 +14275,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`
Expand Down
5 changes: 5 additions & 0 deletions assets/src/graph/costManagement.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ fragment ClusterUsageTiny on ClusterUsage {
cpu
memory
gpu
storage
cpuUtil
memUtil
cpuCost
Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions config/prod.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ config :console, Console.Cron.Scheduler,
{"@daily", {Console.Cron.Jobs, :prune_alerts, []}},
{"@daily", {Console.AI.Cron, :trim, []}},
{"@daily", {Console.AI.Cron, :trim_threads, []}},
{"@daily", {Console.Cost.Cron, :history, []}},
{"@daily", {Console.Cost.Cron, :prune, []}},
{"0 0 * * 0", {Console.AI.Cron, :chats, []}}
]

Expand Down
Loading
Loading