Skip to content

Commit 31e6805

Browse files
authored
refactor: updated the FinOps tab (#95)
1 parent 0b803cf commit 31e6805

4 files changed

Lines changed: 19 additions & 6 deletions

chart/templates/collections.composition-tabpane-finops-panel-row-3-column-1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.finops.enabled }}
22
apiVersion: v1
33
data:
4-
width: "16"
4+
width: "12"
55
kind: ConfigMap
66
metadata:
77
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-1

chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2-panel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
namespace: {{ .Release.Namespace }}
1818
widgetsRefs:
1919
- apiVersion: templates.krateo.io/v1alpha1
20-
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-paragraph
20+
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
2121
namespace: {{ .Release.Namespace }}
2222
resource: widgets
2323
{{- end }}

chart/templates/collections.composition-tabpane-finops-panel-row-3-column-2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.finops.enabled }}
22
apiVersion: v1
33
data:
4-
width: "6"
4+
width: "10"
55
kind: ConfigMap
66
metadata:
77
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2
Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
{{- if .Values.finops.enabled }}
2+
kind: ConfigMap
3+
apiVersion: v1
4+
metadata:
5+
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
6+
namespace: {{ .Release.Namespace }}
7+
data:
8+
pageSize: "10"
9+
columns: "[{ \"key\": \"resourceid\", \"title\": \"Resource ID\"},{ \"key\": \"metricname\", \"title\": \"Metric Name\"},{\"key\": \"unit\", \"title\": \"Unit\"},{\"key\": \"optimizeFrom\", \"title\": \"Optimization Start (hh:mm) \"},{\"key\": \"optimizeTo\", \"title\": \"Optimization End (hh:mm)\"},{\"key\": \"resourceDelta\", \"title\": \"Optimize by (%)\"}]"
10+
---
211
apiVersion: templates.krateo.io/v1alpha1
312
kind: Widget
413
metadata:
5-
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-paragraph
14+
name: composition-{{ .Release.Name }}-tabpane-finops-panel-row-3-column-2-panel-tabledata
615
spec:
7-
type: paragraph
16+
type: tabledata
17+
propsRef:
18+
name: composition-aso-sample-tabpane-finops-panel-row-3-column-2-panel-paragraph
19+
namespace: azure-pricing-system
820
api:
921
- name: getComposition
1022
path: "/apis/{{ .Values.global.compositionApiVersion }}/namespaces/{{ .Release.Namespace }}/{{ .Values.global.compositionResource }}/{{ .Release.Name }}"
@@ -13,5 +25,6 @@ spec:
1325
- 'Accept: application/json'
1426
app:
1527
template:
16-
text: ${ .getComposition.spec.optimization // "Optimization request pending..." }
28+
data: >
29+
${ [.getComposition.spec.optimization | fromjson | .[] | { resourceid: (.resourceid | split("/") | .[-1]), metricname: .metricname, unit: .unit, optimizeFrom: .optimization.from, resourceDelta: .optimization.resourceDelta, optimizeTo: .optimization.to }] }
1730
{{- end }}

0 commit comments

Comments
 (0)