Skip to content

Commit 54e79d1

Browse files
dlabrecqdlabrecq
authored
Merge pull request #3822 from dlabrecq/next
AWS EC2 instances
2 parents 2187fd4 + 7ce4786 commit 54e79d1

File tree

42 files changed

+1733
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1733
-448
lines changed

‎locales/data.json

+336-72
Large diffs are not rendered by default.

‎locales/translations.json

+31-30
Large diffs are not rendered by default.

‎src/api/reports/report.ts

+22
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,27 @@ export interface ReportAwsItem extends ReportItem {
3838
service?: string;
3939
}
4040

41+
export interface ReportAwsInstancesItem {
42+
account?: string;
43+
account_alias?: string;
44+
cost?: ReportValue;
45+
instance_name?: string;
46+
instance_type?: string;
47+
memory?: ReportValue;
48+
operating_system?: string;
49+
region?: string;
50+
resource_id?: string;
51+
tags: [
52+
{
53+
key?: string;
54+
values?: string[];
55+
enabled?: boolean;
56+
},
57+
];
58+
usage?: ReportValue;
59+
vcpu?: ReportValue;
60+
}
61+
4162
export interface ReportGcpItem extends ReportItem {
4263
account?: string;
4364
project?: string;
@@ -95,6 +116,7 @@ export interface ReportData extends ReportOrgData {
95116
date?: string;
96117
values?:
97118
| ReportAwsItem[]
119+
| ReportAwsInstancesItem[]
98120
| ReportAzureItem[]
99121
| ReportGcpItem[]
100122
| ReportOcpItem[]

‎src/locales/messages.ts

+28-12
Original file line numberDiff line numberDiff line change
@@ -1312,11 +1312,17 @@ export default defineMessages({
13121312
'account {Account names} ' +
13131313
'aws_category {Cost category names} ' +
13141314
'cluster {Cluster names} ' +
1315+
'cpu {CPU} ' +
13151316
'gcp_project {GCP project names} ' +
13161317
'group {Group} ' +
1318+
'instance {Instance names} ' +
1319+
'instance_type {Instance type} ' +
1320+
'memory {Memory} ' +
13171321
'name {Name} ' +
13181322
'node {Node names} ' +
13191323
'org_unit_id {Organizational unit names} ' +
1324+
'os {OS} ' +
1325+
'operating_system {Operating system} ' +
13201326
'payer_tenant_id {Account names} ' +
13211327
'product_service {Service names} ' +
13221328
'project {Project names} ' +
@@ -1328,6 +1334,7 @@ export default defineMessages({
13281334
'subscription_guid {Account names} ' +
13291335
'source_type {Integration} ' +
13301336
'tag {Tag names} ' +
1337+
'tags {Tags} ' +
13311338
'tag_key {Tag keys} ' +
13321339
'other {}}',
13331340
description: 'Details table resource names',
@@ -1734,6 +1741,7 @@ export default defineMessages({
17341741
'aws_category {{resolution, select, daily {{provider}_cost_category_daily_{startDate}_{endDate}} monthly {{provider}_cost_category_monthly_{startDate}_{endDate}} other {}}} ' +
17351742
'cluster {{resolution, select, daily {{provider}_clusters_daily_{startDate}_{endDate}} monthly {{provider}_clusters_monthly_{startDate}_{endDate}} other {}}} ' +
17361743
'gcp_project {{resolution, select, daily {{provider}_gcp-projects_daily_{startDate}_{endDate}} monthly {{provider}_gcp-projects_monthly_{startDate}_{endDate}} other {}}} ' +
1744+
'instance {{resolution, select, daily {{provider}_instances_daily_{startDate}_{endDate}} monthly {{provider}_instances_monthly_{startDate}_{endDate}} other {}}} ' +
17371745
'node {{resolution, select, daily {{provider}_node_daily_{startDate}_{endDate}} monthly {{provider}_node_monthly_{startDate}_{endDate}} other {}}} ' +
17381746
'org_unit_id {{resolution, select, daily {{provider}_orgs_daily_{startDate}_{endDate}} monthly {{provider}_orgs_monthly_{startDate}_{endDate}} other {}}} ' +
17391747
'payer_tenant_id {{resolution, select, daily {{provider}_accounts_daily_{startDate}_{endDate}} monthly {{provider}_accounts_monthly_{startDate}_{endDate}} other {}}} ' +
@@ -1771,6 +1779,7 @@ export default defineMessages({
17711779
'aws_category {Aggregates of the following cost categories will be exported to a .csv file.} ' +
17721780
'cluster {Aggregates of the following clusters will be exported to a .csv file.} ' +
17731781
'gcp_project {Aggregates of the following GCP projects will be exported to a .csv file.} ' +
1782+
'instance {Aggregates of the following instances will be exported to a .csv file.} ' +
17741783
'node {Aggregates of the following nodes will be exported to a .csv file.} ' +
17751784
'org_unit_id {Aggregates of the following organizational units will be exported to a .csv file.} ' +
17761785
'payer_tenant_id {Aggregates of the following accounts will be exported to a .csv file.} ' +
@@ -1793,6 +1802,7 @@ export default defineMessages({
17931802
'aws_category {{provider, select, aws {Amazon Web Services grouped by Cost category} aws_ocp {Amazon Web Services filtered by OpenShift grouped by Cost category} azure {Microsoft Azure grouped by Cost category} oci {Oracle Cloud Infrastructure grouped by Cost category} azure_ocp {Microsoft Azure filtered by OpenShift grouped by Cost category} gcp {Google Cloud Platform grouped by Cost category} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by Cost category} ibm {IBM Cloud grouped by Cost category} ibm_ocp {IBM Cloud filtered by OpenShift grouped by Cost category} ocp {OpenShift grouped by Cost category} ocp_cloud {All cloud filtered by OpenShift grouped by Cost category} other {}}} ' +
17941803
'cluster {{provider, select, aws {Amazon Web Services grouped by Cluster} aws_ocp {Amazon Web Services filtered by OpenShift grouped by Cluster} azure {Microsoft Azure grouped by Cluster} oci {Oracle Cloud Infrastructure grouped by Cluster} azure_ocp {Microsoft Azure filtered by OpenShift grouped by Cluster} gcp {Google Cloud Platform grouped by Cluster} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by Cluster} ibm {IBM Cloud grouped by Cluster} ibm_ocp {IBM Cloud filtered by OpenShift grouped by Cluster} ocp {OpenShift grouped by Cluster} ocp_cloud {All cloud filtered by OpenShift grouped by Cluster} other {}}} ' +
17951804
'gcp_project {{provider, select, aws {Amazon Web Services grouped by GCP Project} aws_ocp {Amazon Web Services filtered by OpenShift grouped by GCP Project} azure {Microsoft Azure grouped by GCP Project} oci {Oracle Cloud Infrastructure grouped by GCP Project} azure_ocp {Microsoft Azure filtered by OpenShift grouped by GCP Project} gcp {Google Cloud Platform grouped by GCP Project} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by GCP Project} ibm {IBM Cloud grouped by GCP Project} ibm_ocp {IBM Cloud filtered by OpenShift grouped by GCP Project} ocp {OpenShift grouped by GCP Project} ocp_cloud {All cloud filtered by OpenShift grouped by GCP Project} other {}}} ' +
1805+
'instance {{provider, select, aws {Amazon Web Services grouped by instance} aws_ocp {Amazon Web Services filtered by OpenShift grouped by instance} azure {Microsoft Azure grouped by instance} oci {Oracle Cloud Infrastructure grouped by instance} azure_ocp {Microsoft Azure filtered by OpenShift grouped by instance} gcp {Google Cloud Platform grouped by instance} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by instance} ibm {IBM Cloud grouped by instance} ibm_ocp {IBM Cloud filtered by OpenShift grouped by instance} ocp {OpenShift grouped by instance} ocp_cloud {All cloud filtered by OpenShift grouped by instance} other {}}} ' +
17961806
'node {{provider, select, aws {Amazon Web Services grouped by Node} aws_ocp {Amazon Web Services filtered by OpenShift grouped by Node} azure {Microsoft Azure grouped by Node} oci {Oracle Cloud Infrastructure grouped by Node} azure_ocp {Microsoft Azure filtered by OpenShift grouped by Node} gcp {Google Cloud Platform grouped by Node} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by Node} ibm {IBM Cloud grouped by Node} ibm_ocp {IBM Cloud filtered by OpenShift grouped by Node} ocp {OpenShift grouped by Node} ocp_cloud {All cloud filtered by OpenShift grouped by Node} other {}}} ' +
17971807
'org_unit_id {{provider, select, aws {Amazon Web Services grouped by Organizational unit} aws_ocp {Amazon Web Services filtered by OpenShift grouped by Organizational unit} azure {Microsoft Azure grouped by Organizational unit} oci {Oracle Cloud Infrastructure grouped by Organizational unit} azure_ocp {Microsoft Azure filtered by OpenShift grouped by Organizational unit} gcp {Google Cloud Platform grouped by Organizational unit} gcp_ocp {Google Cloud Platform filtered by OpenShift grouped by Organizational unit} ibm {IBM Cloud grouped by Organizational unit} ibm_ocp {IBM Cloud filtered by OpenShift grouped by Organizational unit} ocp {OpenShift grouped by Organizational unit} ocp_cloud {All cloud filtered by OpenShift grouped by Organizational unit} other {}}} ' +
17981808
'payer_tenant_id {{provider, select, oci {Oracle Cloud Infrastructure grouped by Account} other {}}}' +
@@ -1830,6 +1840,7 @@ export default defineMessages({
18301840
'aws_category {Selected cost categories ({count})} ' +
18311841
'cluster {Selected clusters ({count})} ' +
18321842
'gcp_project {Selected GCP projects ({count})} ' +
1843+
'instance {Selected instances ({count})} ' +
18331844
'node {Selected nodes ({count})} ' +
18341845
'org_unit_id {Selected organizational units ({count})} ' +
18351846
'payer_tenant_id {Selected accounts ({count})} ' +
@@ -2049,9 +2060,11 @@ export default defineMessages({
20492060
'default {Default} ' +
20502061
'gcp_project {GCP project} ' +
20512062
'group {Group} ' +
2063+
'instance {Instance} ' +
20522064
'name {Name} ' +
20532065
'node {Node} ' +
20542066
'org_unit_id {Organizational unit} ' +
2067+
'operating_system {Operating system} ' +
20552068
'payer_tenant_id {Account} ' +
20562069
'persistent_volume_claim {Persistent volume claim} ' +
20572070
'product_service {Service} ' +
@@ -2319,6 +2332,11 @@ export default defineMessages({
23192332
description: 'Infrastructure',
23202333
id: 'infrastructure',
23212334
},
2335+
instances: {
2336+
defaultMessage: 'Instances',
2337+
description: 'Instances',
2338+
id: 'instances',
2339+
},
23222340
lastProcessed: {
23232341
defaultMessage: 'Last processed',
23242342
description: 'Last processed',
@@ -2541,6 +2559,16 @@ export default defineMessages({
25412559
description: 'There are no export files available',
25422560
id: 'noExportsStateTitle',
25432561
},
2562+
noInstancesDesc: {
2563+
defaultMessage: 'Add an Amazon EC2 instance to see a total cost breakdown of your spend by instances.',
2564+
description: 'Add an Amazon EC2 instance to see a total cost breakdown of your spend by instances.',
2565+
id: 'noInstancesDesc',
2566+
},
2567+
noInstancesTitle: {
2568+
defaultMessage: 'No instances available',
2569+
description: 'No instances available',
2570+
id: 'noInstancesTitle',
2571+
},
25442572
noMappedTags: {
25452573
defaultMessage: 'No mapped tags',
25462574
description: 'No mapped tags',
@@ -2558,18 +2586,6 @@ export default defineMessages({
25582586
description: 'Tags must be enabled to be mapped.',
25592587
id: 'noMappedTagsWarning',
25602588
},
2561-
noOptimizationsDesc: {
2562-
defaultMessage:
2563-
'Resource Optimization is now available in preview for select customers. If your organization wants to participate, tell us through the Feedback button, which is purple and located on the right. Otherwise, there is not enough data available to generate an optimization.',
2564-
description:
2565-
'Resource Optimization is now available in preview for select customers. If your organization wants to participate, tell us through the Feedback button, which is purple and located on the right. Otherwise, there is not enough data available to generate an optimization.',
2566-
id: 'noOptimizationsDesc',
2567-
},
2568-
noOptimizationsTitle: {
2569-
defaultMessage: 'No optimizations available',
2570-
description: 'No optimizations available',
2571-
id: 'noOptimizationsTitle',
2572-
},
25732589
noProvidersStateAwsDesc: {
25742590
defaultMessage:
25752591
'Add an Amazon Web Services account to see a total cost breakdown of your spend by accounts, organizational units, services, regions, or tags.',

‎src/routes/components/charts/historicalTrendChart/__snapshots__/historicalTrendChart.test.tsx.snap

+32-11
Original file line numberDiff line numberDiff line change
@@ -424,13 +424,13 @@ exports[`reports are formatted to datums 1`] = `
424424
</defs>
425425
<g>
426426
<path
427-
d="M8,25L8,25Z"
427+
d="M8,16.5L8,25Z"
428428
role="presentation"
429429
shape-rendering="auto"
430430
style="fill: none; stroke: none; fill-opacity: 0.3; stroke-width: 2;"
431431
/>
432432
<path
433-
d="M8,25Z"
433+
d="M8,16.5Z"
434434
role="presentation"
435435
shape-rendering="auto"
436436
style="fill: none; stroke: #8bc1f7; fill-opacity: 0.3; stroke-width: 2;"
@@ -456,13 +456,13 @@ exports[`reports are formatted to datums 1`] = `
456456
</defs>
457457
<g>
458458
<path
459-
d="M8,25L8,25Z"
459+
d="M8,16.5L8,25Z"
460460
role="presentation"
461461
shape-rendering="auto"
462462
style="fill: none; stroke: none; fill-opacity: 0.3; stroke-width: 2;"
463463
/>
464464
<path
465-
d="M8,25Z"
465+
d="M8,16.5Z"
466466
role="presentation"
467467
shape-rendering="auto"
468468
style="fill: none; stroke: #4cb140; fill-opacity: 0.3; stroke-width: 2;"
@@ -567,7 +567,7 @@ exports[`reports are formatted to datums 1`] = `
567567
dx="0"
568568
id="exampleTrendChart-ChartAxis-3-ChartLabel-0"
569569
x="-7"
570-
y="20.75"
570+
y="25"
571571
>
572572
<tspan
573573
dx="0"
@@ -576,7 +576,7 @@ exports[`reports are formatted to datums 1`] = `
576576
text-anchor="end"
577577
x="-7"
578578
>
579-
0.00000000005
579+
1.0
580580
</tspan>
581581
</text>
582582
</g>
@@ -588,7 +588,7 @@ exports[`reports are formatted to datums 1`] = `
588588
dx="0"
589589
id="exampleTrendChart-ChartAxis-3-ChartLabel-1"
590590
x="-7"
591-
y="16.5"
591+
y="20.75"
592592
>
593593
<tspan
594594
dx="0"
@@ -597,7 +597,7 @@ exports[`reports are formatted to datums 1`] = `
597597
text-anchor="end"
598598
x="-7"
599599
>
600-
0.00000000010
600+
1.5
601601
</tspan>
602602
</text>
603603
</g>
@@ -609,7 +609,7 @@ exports[`reports are formatted to datums 1`] = `
609609
dx="0"
610610
id="exampleTrendChart-ChartAxis-3-ChartLabel-2"
611611
x="-7"
612-
y="12.25"
612+
y="16.5"
613613
>
614614
<tspan
615615
dx="0"
@@ -618,7 +618,7 @@ exports[`reports are formatted to datums 1`] = `
618618
text-anchor="end"
619619
x="-7"
620620
>
621-
0.00000000015
621+
2.0
622622
</tspan>
623623
</text>
624624
</g>
@@ -630,6 +630,27 @@ exports[`reports are formatted to datums 1`] = `
630630
dx="0"
631631
id="exampleTrendChart-ChartAxis-3-ChartLabel-3"
632632
x="-7"
633+
y="12.25"
634+
>
635+
<tspan
636+
dx="0"
637+
dy="0"
638+
style="font-size: 0px; font-family: "RedHatText",helvetica,arial,sans-serif; letter-spacing: normal; padding: 10px; stroke: var(--pf-v5-chart-global--label--stroke, transparent); fill: var(--pf-v5-chart-axis--tick-label--Fill, #4f5255); text-anchor: end;"
639+
text-anchor="end"
640+
x="-7"
641+
>
642+
2.5
643+
</tspan>
644+
</text>
645+
</g>
646+
<g
647+
role="presentation"
648+
>
649+
<text
650+
direction="inherit"
651+
dx="0"
652+
id="exampleTrendChart-ChartAxis-3-ChartLabel-4"
653+
x="-7"
633654
y="8"
634655
>
635656
<tspan
@@ -639,7 +660,7 @@ exports[`reports are formatted to datums 1`] = `
639660
text-anchor="end"
640661
x="-7"
641662
>
642-
0.00000000020
663+
3.0
643664
</tspan>
644665
</text>
645666
</g>

‎src/routes/components/charts/trendChart/__snapshots__/trendChart.test.tsx.snap

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ exports[`reports are formatted to datums 1`] = `
5353
</defs>
5454
<g>
5555
<path
56-
d="M0.5333333333333332,50L0.5333333333333332,50Z"
56+
d="M0.5333333333333332,29L0.5333333333333332,50Z"
5757
role="presentation"
5858
shape-rendering="auto"
5959
style="fill: none; stroke: none; fill-opacity: 0.3; stroke-width: 2;"
6060
/>
6161
<path
62-
d="M0.5333333333333332,50Z"
62+
d="M0.5333333333333332,29Z"
6363
role="presentation"
6464
shape-rendering="auto"
6565
style="fill: none; stroke: #d2d2d2; fill-opacity: 0.3; stroke-width: 2;"
@@ -85,13 +85,13 @@ exports[`reports are formatted to datums 1`] = `
8585
</defs>
8686
<g>
8787
<path
88-
d="M0.5333333333333332,50L0.5333333333333332,50Z"
88+
d="M0.5333333333333332,29L0.5333333333333332,50Z"
8989
role="presentation"
9090
shape-rendering="auto"
9191
style="fill: none; stroke: none; fill-opacity: 0.3; stroke-width: 2;"
9292
/>
9393
<path
94-
d="M0.5333333333333332,50Z"
94+
d="M0.5333333333333332,29Z"
9595
role="presentation"
9696
shape-rendering="auto"
9797
style="fill: none; stroke: #38812f; fill-opacity: 0.3; stroke-width: 2;"
@@ -205,7 +205,7 @@ exports[`reports are formatted to datums 1`] = `
205205
text-anchor="end"
206206
x="-7"
207207
>
208-
0.00000000005
208+
0.5
209209
</tspan>
210210
</text>
211211
</g>
@@ -226,7 +226,7 @@ exports[`reports are formatted to datums 1`] = `
226226
text-anchor="end"
227227
x="-7"
228228
>
229-
0.00000000010
229+
1.0
230230
</tspan>
231231
</text>
232232
</g>
@@ -247,7 +247,7 @@ exports[`reports are formatted to datums 1`] = `
247247
text-anchor="end"
248248
x="-7"
249249
>
250-
0.00000000015
250+
1.5
251251
</tspan>
252252
</text>
253253
</g>
@@ -268,7 +268,7 @@ exports[`reports are formatted to datums 1`] = `
268268
text-anchor="end"
269269
x="-7"
270270
>
271-
0.00000000020
271+
2.0
272272
</tspan>
273273
</text>
274274
</g>

‎src/routes/components/export/exportModal.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ export class ExportModalBase extends React.Component<ExportModalProps, ExportMod
167167
}
168168

169169
let selectedLabel = intl.formatMessage(messages.exportSelected, { groupBy, count });
170-
if (groupBy && groupBy.indexOf(tagPrefix) !== -1) {
170+
if (groupBy?.indexOf(tagPrefix) !== -1) {
171171
selectedLabel = intl.formatMessage(messages.exportSelected, { groupBy: 'tag', count });
172172
}
173173

@@ -181,7 +181,7 @@ export class ExportModalBase extends React.Component<ExportModalProps, ExportMod
181181
? name
182182
: intl.formatMessage(messages.exportName, {
183183
provider: reportPathsType,
184-
groupBy: groupBy && groupBy.indexOf(tagPrefix) !== -1 ? 'tag' : groupBy,
184+
groupBy: groupBy?.indexOf(tagPrefix) !== -1 ? 'tag' : groupBy,
185185
});
186186

187187
const helpText = isExportsToggleEnabled ? this.nameValidator(defaultName) : undefined;

0 commit comments

Comments
 (0)