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.

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

feat(config): sw-2822 activate ansible aap managed #1389

Merged
merged 9 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 23 additions & 1 deletion public/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"cardHeading_Cores_OpenShift-metrics": "Core hours",
"cardHeading_Cores_rosa": "vCPU hour usage",
"cardHeading_Instance-hours": "Instance hours",
"cardHeading_Instance-hours_ansible-aap-managed": "Infrastructure hours",
"cardHeading_Instance-hours_rosa": "Control plane hour usage",
"cardHeading_Managed-nodes": "Managed nodes",
"cardHeading_Storage-gibibytes": "Data storage",
"cardHeading_Storage-gibibyte-months": "Data storage",
"cardHeading_Transfer-gibibytes": "Data transfer",
Expand All @@ -27,7 +29,9 @@
"cardHeadingDescription_Cores_OpenShift-dedicated-metrics": "$t(curiosity-graph.cardHeadingDescription_Cores_OpenShift-metrics)",
"cardHeadingDescription_Cores_OpenShift-metrics": "A subscription model that offers purchasing options to match your usage patterns.",
"cardHeadingDescription_Instance-hours": "Instance hours usage in hours",
"cardHeadingDescription_Instance-hours_ansible-aap-managed": "Infrastructure hours usage in hours",
"cardHeadingDescription_Instance-hours_rosa": "Control plane hours usage in hours",
"cardHeadingDescription_Managed-nodes": "Managed nodes usage",
"cardHeadingDescription_Sockets_OpenShift Container Platform": "$t(curiosity-graph.cardHeadingDescription_Cores_OpenShift Container Platform)",
"cardHeadingDescription_Storage-gibibytes": "Data storage usage in binary gigabyte hours",
"cardHeadingDescription_Storage-gibibyte-months": "Data storage usage in binary gigabyte months",
Expand Down Expand Up @@ -56,14 +60,17 @@
"cardHeadingMetric_monthlyTotal_vCPUs": "$t(curiosity-graph.cardHeadingMetric_monthlyTotal_Cores)",
"cardHeadingMetric_remainingCapacity_Cores_prepaid": "Remaining capacity",
"cardHeadingMetric_remainingCapacity_Instance-hours_prepaid": "Remaining capacity",
"cardHeadingMetric_remainingCapacity_Managed-nodes_prepaid": "Remaining capacity",
"cardBodyMetric": "{{context}}",
"cardBodyMetric_total": "No data",
"cardBodyMetric_total_Cores": "<0>{{total}}</0> vCPU hours",
"cardBodyMetric_total_Cores_OpenShift-dedicated-metrics": "$t(curiosity-graph.cardBodyMetric_total_Cores_OpenShift-metrics)",
"cardBodyMetric_total_Cores_OpenShift-metrics": "<0>{{total}}</0> Core hours",
"cardBodyMetric_total_Cores_prepaid_rosa": "$t(curiosity-graph.cardBodyMetric_total_Cores)",
"cardBodyMetric_total_Instance-hours": "<0>{{total}}</0> Instance hours",
"cardBodyMetric_total_Instance-hours_prepaid_ansible-aap-managed": "<0>{{total}}</0> Infrastructure hours",
"cardBodyMetric_total_Instance-hours_prepaid_rosa": "<0>{{total}}</0> Control plane hours",
"cardBodyMetric_total_Managed-nodes_prepaid_ansible-aap-managed": "<0>{{total}}</0> Managed nodes",
"cardBodyMetric_total_Storage-gibibytes": "<0>{{total}}</0> Binary gigabyte hours",
"cardBodyMetric_total_Storage-gibibyte-months": "<0>{{total}}</0> Binary gigabyte months",
"cardBodyMetric_total_Transfer-gibibytes": "<0>{{total}}</0> Binary gigabytes",
Expand Down Expand Up @@ -92,6 +99,9 @@
"label_Instance-hours": "Instance hours",
"label_Instance-hours_on-demand": "$t(curiosity-graph.label_Cores_on-demand)",
"label_Instance-hours_prepaid": "$t(curiosity-graph.label_Cores_prepaid)",
"label_Instance-hours_prepaid_ansible-aap-managed": "Infrastructure hours",
"label_Managed-nodes_on-demand": "Monthly On-Demand",
"label_Managed-nodes_prepaid": "Managed nodes",
"label_Sockets": "Sockets",
"label_Sockets_cloud": "Public cloud",
"label_Sockets_hypervisor": "Hypervisor",
Expand All @@ -106,7 +116,8 @@
"label_threshold_infinite": "<0>unlimited</0>",
"label_threshold_Cores": "Subscription threshold",
"label_threshold_Cores_rosa": "Pre-paid subscription threshold",
"label_threshold_Instance-hours_rosa": "$t(curiosity-graph.label_threshold_Cores_rosa)",
"label_threshold_Instance-hours": "$t(curiosity-graph.label_threshold_Cores_rosa)",
"label_threshold_Managed-nodes": "$t(curiosity-graph.label_threshold_Cores_rosa)",
"label_threshold_Sockets": "Subscription threshold",
"label_Transfer-gibibytes": "Data transfer",
"label_vCPUs": "$t(curiosity-graph.label_Cores)",
Expand All @@ -121,6 +132,8 @@
"legendTooltip_Instance-hours_OpenShift-dedicated-metrics": "OpenShift Dedicated <0>On-Demand</0> instance hour usage.",
"legendTooltip_Instance-hours_on-demand": "Monthly <0>On-Demand</0> control plane hour usage.",
"legendTooltip_Instance-hours_prepaid": "Monthly <0>pre-paid</0> control plane hour usage.",
"legendTooltip_Instance-hours_prepaid_ansible-aap-managed": "Monthly <0>pre-paid</0> infrastructure hour usage.",
"legendTooltip_Managed-nodes_prepaid": "Monthly <0>pre-paid</0> managed nodes usage.",
"legendTooltip_Sockets": "{{product}} CPU usage, per CPU socket pair.",
"legendTooltip_Sockets_cloud": "Public cloud {{product}} CPU usage, per socket. Each instance is considered a single socket.",
"legendTooltip_Sockets_hypervisor": "{{product}} CPU socket usage, per socket pair.",
Expand Down Expand Up @@ -163,6 +176,8 @@
"legendTooltip_Storage-gibibyte-months": "Data storage usage",
"legendTooltip_threshold_Cores_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} Annual subscriptions in this account.",
"legendTooltip_threshold_Cores_rosa": "Maximum capacity, as vCPU hours, based on total ROSA Hosted Control Planes pre-paid subscriptions in this account.",
"legendTooltip_threshold_Managed-nodes": "Maximum capacity, as managed nodes, based on the amount of pre-paid managed nodes purchased in all subscriptions in this account.",
"legendTooltip_threshold_Instance-hours_ansible-aap-managed": "Maximum capacity, as infrastructure hours, derived from the amount of managed nodes purchased in all subscriptions in this account.",
"legendTooltip_threshold_Instance-hours_rosa": "Maximum capacity, as control plane hours, based on total ROSA Hosted Control Planes pre-paid subscriptions in this account.",
"legendTooltip_threshold_Sockets": "Maximum capacity, based on total {{product}} subscriptions in this account.",
"legendTooltip_threshold_Sockets_OpenShift Container Platform": "Maximum capacity, as CPU sockets, based on total {{product}} Annual subscriptions in this account.",
Expand All @@ -186,6 +201,7 @@
"tabHeading": "Inventory tabs",
"tabSubHeading": "Tab {{count}}",
"tabInstances": "Current monthly instances",
"tabInstances_ansible-aap-managed": "Current nodes",
"tabInstances_RHEL": "Current instances",
"tabInstances_RHEL for ARM": "$t(curiosity-inventory.tabInstances_RHEL)",
"tabInstances_RHEL for IBM Power": "$t(curiosity-inventory.tabInstances_RHEL)",
Expand Down Expand Up @@ -250,9 +266,12 @@
"header_Cores_OpenShift-metrics": "$t(curiosity-inventory.header_Cores_OpenShift Container Platform)",
"header_Cores_OpenShift-dedicated-metrics": "Core hours",
"header_display_name": "Name",
"header_display_name_ansible-aap-managed": "Host name",
"header_display_name_rosa": "Name (control plane)",
"header_Instance-hours": "Instance hours",
"header_Instance-hours_ansible-aap-managed": "Infrastructure hours",
"header_Instance-hours_rosa": "Control plane hours",
"header_Managed-nodes": "Managed nodes",
"header_measurement_type": "Type",
"header_number_of_guests": "Guests",
"header_Sockets": "Sockets",
Expand Down Expand Up @@ -443,6 +462,9 @@
"title": "{{appName}}",
"subtitle": "Monitor your usage based on your subscription terms. <0>Learn more about {{appName}} reporting</0>",
"description": "Monitor your usage based on your subscription terms.",
"title_ansible-aap-managed": "Red Hat Ansible",
"subtitle_ansible-aap-managed": "Monitor your Ansible subscription and contract usage. <0>Learn more about {{appName}} reporting</0>",
"description_ansible-aap-managed": "Monitor your Ansible subscription and contract usage",
"title_openshift": "Red Hat OpenShift",
"subtitle_openshift": "Monitor your OpenShift usage for both Annual and On-Demand subscriptions. <0>Learn more about {{appName}} reporting</0>",
"description_openshift": "Monitor your OpenShift usage for both Annual and On-Demand subscriptions.",
Expand Down
45 changes: 45 additions & 0 deletions src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,43 @@ exports[`I18n Component should generate a predictable locale key output snapshot
},
],
},
{
"file": "src/config/product.ansible.js",
"keys": [
{
"key": "curiosity-graph.cardHeadingMetric",
"match": "translate('curiosity-graph.cardHeadingMetric', { context: ['remainingCapacity', dataSets?.[0]?.display?.chartId], testId: 'graphRemainingCapacityCard-header' })",
},
{
"key": "curiosity-graph.cardBodyMetric",
"match": "translate( 'curiosity-graph.cardBodyMetric', { context: ['total', dataSets?.[0]?.display?.remainingCapacityHasData && dataSets?.[0]?.display?.chartId], testId: 'graphRemainingCapacityCard-body', total: helpers .numberDisplay(dataSets?.[0]?.display?.remainingCapacity)",
},
{
"key": "curiosity-graph.cardFooterMetric",
"match": "translate('curiosity-graph.cardFooterMetric', { date: moment .utc(dataSets?.[0]?.display?.dailyDate)",
},
{
"key": "curiosity-graph.label_axisX",
"match": "translate('curiosity-graph.label_axisX', { context: GRANULARITY_TYPES.DAILY })",
},
{
"key": "curiosity-inventory.guestsHeader",
"match": "translate('curiosity-inventory.guestsHeader', { context: [INVENTORY_TYPES.DISPLAY_NAME] })",
},
{
"key": "curiosity-inventory.measurement",
"match": "translate('curiosity-inventory.measurement', { context: (total && 'value')",
},
{
"key": "curiosity-inventory.measurement",
"match": "translate('curiosity-inventory.measurement', { context: (total && 'value')",
},
{
"key": "curiosity-inventory.measurement",
"match": "translate('curiosity-inventory.measurement', { context: (total && 'value')",
},
],
},
{
"file": "src/config/product.openshiftContainer.js",
"keys": [
Expand Down Expand Up @@ -1132,6 +1169,14 @@ exports[`I18n Component should have locale keys that exist in the default langua
"file": "src/components/toolbar/toolbarFieldUsage.js",
"key": "curiosity-toolbar.label",
},
{
"file": "src/config/product.ansible.js",
"key": "curiosity-graph.label_axisX",
},
{
"file": "src/config/product.ansible.js",
"key": "curiosity-inventory.guestsHeader",
},
{
"file": "src/config/product.openshiftContainer.js",
"key": "curiosity-inventory.guestsHeader",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ exports[`InventoryCardInstancesContext should expect specific sort properties: s
"CORE_SECONDS": "Core-seconds",
"INSTANCE_HOURS": "Instance-hours",
"LAST_SEEN": "last_seen",
"MANAGED_NODES": "Managed-nodes",
"NAME": "display_name",
"NUMBER_OF_GUESTS": "number_of_guests",
"SOCKETS": "Sockets",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ exports[`RouterHelpers should return product configuration details from a url, p

exports[`RouterHelpers should return product configuration details from a url, path, or path-like id, or alias: detail: closest match 1`] = `
{
"productId": "RHEL for x86",
"productId": "ansible-aap-managed",
}
`;

Expand Down
39 changes: 39 additions & 0 deletions src/config/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
## Modules

<dl>
<dt><a href="#Products.module_Ansible">Ansible</a></dt>
<dd><p>Ansible</p>
</dd>
<dt><a href="#Products.module_OpenShiftContainer">OpenShiftContainer</a></dt>
<dd><p>OpenShift Container</p>
</dd>
Expand Down Expand Up @@ -36,6 +39,42 @@
</dd>
</dl>

<a name="Products.module_Ansible"></a>

## Ansible
Ansible


* [Ansible](#Products.module_Ansible)
* [~productGroup](#Products.module_Ansible..productGroup) : <code>string</code>
* [~productId](#Products.module_Ansible..productId) : <code>string</code>
* [~productLabel](#Products.module_Ansible..productLabel) : <code>string</code>
* [~config](#Products.module_Ansible..config) : <code>Object</code>

<a name="Products.module_Ansible..productGroup"></a>

### Ansible~productGroup : <code>string</code>
Product group. A variant and dissimilar product configuration grouping identifier.

**Kind**: inner constant of [<code>Ansible</code>](#Products.module_Ansible)
<a name="Products.module_Ansible..productId"></a>

### Ansible~productId : <code>string</code>
Product ID. The identifier used when querying the API.

**Kind**: inner constant of [<code>Ansible</code>](#Products.module_Ansible)
<a name="Products.module_Ansible..productLabel"></a>

### Ansible~productLabel : <code>string</code>
Product label. An identifier used for display strings.

**Kind**: inner constant of [<code>Ansible</code>](#Products.module_Ansible)
<a name="Products.module_Ansible..config"></a>

### Ansible~config : <code>Object</code>
Product configuration

**Kind**: inner constant of [<code>Ansible</code>](#Products.module_Ansible)
<a name="Products.module_OpenShiftContainer"></a>

## OpenShiftContainer
Expand Down
Loading