diff --git a/public/locales/en-US.json b/public/locales/en-US.json index 235886358..1e9e260e0 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -16,6 +16,7 @@ "cardHeading_sockets": "CPU socket usage", "cardHeading_Instance-hours": "Instance hours", "cardHeading_Storage-gibibytes": "Data storage", + "cardHeading_Storage-gibibyte-months": "Data storage", "cardHeading_Transfer-gibibytes": "Data transfer", "cardHeading_OpenShift Container Platform": "Annual subscriptions", "cardHeading_OpenShift-metrics": "On-Demand subscriptions", @@ -30,7 +31,8 @@ "cardHeading_Satellite Server": "CPU socket usage", "cardHeadingDescription": "...", "cardHeadingDescription_Instance-hours": "Instance hours usage in hours", - "cardHeadingDescription_Storage-gibibytes": "Data storage usage in binary gigabyte months", + "cardHeadingDescription_Storage-gibibytes": "Data storage usage in binary gigabyte hours", + "cardHeadingDescription_Storage-gibibyte-months": "Data storage usage in binary gigabyte months", "cardHeadingDescription_Transfer-gibibytes": "Data transfer usage in binary gigabytes", "cardHeadingDescription_OpenShift Container Platform": "A pre-paid subscription model that offers a designated maximum quota of units within a set time frame.", "cardHeadingDescription_OpenShift-metrics": "A subscription model that offers purchasing options to match your usage patterns.", @@ -38,19 +40,23 @@ "cardHeadingMetric_dailyTotal": "Daily total", "cardHeadingMetric_dailyTotal_Instance-hours": "Daily instance hours", "cardHeadingMetric_dailyTotal_Storage-gibibytes": "Daily data storage", + "cardHeadingMetric_dailyTotal_Storage-gibibyte-months": "Daily data storage", "cardHeadingMetric_dailyTotal_Transfer-gibibytes": "Daily data transfer", "cardHeadingMetric_monthlyTotal": "Monthly total", "cardHeadingMetric_monthlyTotal_Instance-hours": "Monthly instance hours", "cardHeadingMetric_monthlyTotal_Storage-gibibytes": "Monthly data storage", + "cardHeadingMetric_monthlyTotal_Storage-gibibyte-months": "Monthly data storage", "cardHeadingMetric_monthlyTotal_Transfer-gibibytes": "Monthly data transfer", "cardBodyMetric_total": "No data", "cardBodyMetric_total_Instance-hours": "<0>{{total}} Instance hours", - "cardBodyMetric_total_Storage-gibibytes": "<0>{{total}} Binary gigabyte months", + "cardBodyMetric_total_Storage-gibibytes": "<0>{{total}} Binary gigabyte hours", + "cardBodyMetric_total_Storage-gibibyte-months": "<0>{{total}} Binary gigabyte months", "cardBodyMetric_total_Transfer-gibibytes": "<0>{{total}} Binary gigabytes", "cardFooterMetric": "Last update {{date}}", "label_axisX_Daily": "Day of the month", "label_axisY_Instance-hours": "Instance hours", - "label_axisY_Storage-gibibytes": "Binary gigabyte months", + "label_axisY_Storage-gibibytes": "Binary gigabyte hours", + "label_axisY_Storage-gibibyte-months": "Binary gigabyte months", "label_axisY_Transfer-gibibytes": "Binary gigabytes", "label_cores": "Cores", "label_coreHours": "Core hours", @@ -66,6 +72,7 @@ "label_noData": "no data", "label_noData_error": "No data", "label_Storage-gibibytes": "Data storage", + "label_Storage-gibibyte-months": "Data storage", "label_threshold": "Subscription threshold", "label_threshold_infinite": "unlimited", "label_Transfer-gibibytes": "Data transfer", @@ -84,6 +91,7 @@ "legendTooltip_physicalSockets_RHEL": "Physical {{product}} CPU usage, per socket pair. Each system's socket count is rounded upwards to the next even number.", "legendTooltip_sockets": "{{product}} CPU usage, per CPU socket pair.", "legendTooltip_Storage-gibibytes": "Data storage usage", + "legendTooltip_Storage-gibibyte-months": "Data storage usage", "legendTooltip_threshold_thresholdSockets": "Maximum capacity, based on total {{product}} subscriptions in this account.", "legendTooltip_threshold_thresholdSockets_RHEL": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.", "legendTooltip_threshold_thresholdCores_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} Annual subscriptions in this account.", @@ -150,12 +158,14 @@ "header_quantity": "Quantity", "header_serviceLevel": "Service level", "header_Storage-gibibytes": "Data storage", + "header_Storage-gibibyte-months": "Data storage", "header_subscriptions": "Sockets", "header_subscriptions_cores": "Cores", "header_subscriptions_sockets": "Sockets", "header_subscriptionType": "Subscription type", "header_Transfer-gibibytes": "Data transfer", - "header_tooltip_Storage-gibibytes": "Measurements in binary gigabyte months", + "header_tooltip_Storage-gibibytes": "Measurements in binary gigabyte hours", + "header_tooltip_Storage-gibibyte-months": "Measurements in binary gigabyte months", "header_tooltip_Transfer-gibibytes": "Measurements in binary gigabytes", "measurement_billing_provider": "Unknown", "measurement_billing_provider_aws": "AWS", @@ -165,7 +175,8 @@ "measurement_billing_provider_oracle": "Oracle", "measurement_billing_provider_red hat": "Red Hat", "measurement_Instance-hours": "{{total}} hours", - "measurement_Storage-gibibytes": "{{total}} GB months", + "measurement_Storage-gibibytes": "{{total}} GB hours", + "measurement_Storage-gibibyte-months": "{{total}} GB months", "measurement_Transfer-gibibytes": "{{total}} GB", "measurementType": "{{context}}", "measurementType_cloud": "Public cloud", diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap index 9212ca83a..2c3435828 100644 --- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap +++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap @@ -664,11 +664,11 @@ Array [ }, Object { "key": "curiosity-inventory.header", - "match": "translate('curiosity-inventory.header', { context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES] })", + "match": "translate('curiosity-inventory.header', { context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS] })", }, Object { "key": "curiosity-inventory.measurement", - "match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, total: helpers.numberDisplay(total?.value)", + "match": "translate('curiosity-inventory.measurement', { context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS, total: helpers.numberDisplay(total?.value)", }, Object { "key": "curiosity-inventory.measurement", diff --git a/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap index 1a740b3df..875683cc4 100644 --- a/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap +++ b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap @@ -10,6 +10,7 @@ Object { "NAME": "display_name", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", } `; diff --git a/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap b/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap index d38746cdb..c478a9a4e 100644 --- a/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap +++ b/src/config/__tests__/__snapshots__/product.rhosak.test.js.snap @@ -13,7 +13,7 @@ Object { "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Transfer-gibibytes\\",\\"total\\":\\"0.00035\\"})", }, Object { - "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Storage-gibibytes\\",\\"total\\":\\"1000.00123\\"})", + "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Storage-gibibyte-months\\",\\"total\\":0})", }, Object { "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Instance-hours\\",\\"total\\":\\"200\\"})", @@ -53,7 +53,7 @@ Object { }, Object { "title": - t(curiosity-inventory.header, {"context":"Storage-gibibytes"}) + t(curiosity-inventory.header, {"context":"Storage-gibibyte-months"}) , "transforms": Array [ [Function], @@ -125,7 +125,7 @@ Object { "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Transfer-gibibytes\\",\\"total\\":\\"0.00035\\"})", }, Object { - "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Storage-gibibytes\\",\\"total\\":\\"1000.00123\\"})", + "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Storage-gibibyte-months\\",\\"total\\":0})", }, Object { "title": "t(curiosity-inventory.measurement, {\\"context\\":\\"Instance-hours\\",\\"total\\":\\"200\\"})", @@ -165,7 +165,7 @@ Object { }, Object { "title": - t(curiosity-inventory.header, {"context":"Storage-gibibytes"}) + t(curiosity-inventory.header, {"context":"Storage-gibibyte-months"}) , "transforms": Array [ [Function], @@ -241,7 +241,7 @@ Object { "chartType": "line", "color": "#5752d1", "fill": "#b2b0ea", - "id": "Storage-gibibytes", + "id": "Storage-gibibyte-months", "isStacked": false, "isStandalone": true, "isThreshold": false, diff --git a/src/config/product.rhosak.js b/src/config/product.rhosak.js index 5c530d617..6b762c633 100644 --- a/src/config/product.rhosak.js +++ b/src/config/product.rhosak.js @@ -70,7 +70,7 @@ const config = { yAxisChartLabel: ({ id }) => translate('curiosity-graph.label_axisY', { context: id }) }, { - id: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, + id: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS, fill: chartColorPurpleLight.value, stroke: chartColorPurpleDark.value, color: chartColorPurpleDark.value, @@ -166,19 +166,19 @@ const config = { cellWidth: 15 }, { - id: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, + id: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS, header: { tooltip: () => translate('curiosity-inventory.header', { - context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES] + context: ['tooltip', RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS] }) }, - cell: ({ [RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES]: total }) => + cell: ({ [RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS]: total }) => translate('curiosity-inventory.measurement', { - context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTES, + context: RHSM_API_PATH_METRIC_TYPES.STORAGE_GIBIBYTE_MONTHS, total: helpers.numberDisplay(total?.value)?.format({ mantissa: 5, trimMantissa: true }) || 0 }), - isSortable: true, + isSortable: false, isWrappable: true, cellWidth: 15 }, diff --git a/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap b/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap index 978f5004f..d560f3959 100644 --- a/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap +++ b/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap @@ -8,6 +8,7 @@ Object { "INSTANCE_HOURS": "Instance-hours", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_PATH_PRODUCT_TYPES": Object { @@ -52,6 +53,7 @@ Object { "NAME": "display_name", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES": Object { @@ -200,6 +202,7 @@ Object { "INSTANCE_HOURS": "Instance-hours", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_PATH_PRODUCT_TYPES": Object { @@ -244,6 +247,7 @@ Object { "NAME": "display_name", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES": Object { @@ -393,6 +397,7 @@ Object { "INSTANCE_HOURS": "Instance-hours", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_PATH_PRODUCT_TYPES": Object { @@ -437,6 +442,7 @@ Object { "NAME": "display_name", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES": Object { @@ -590,6 +596,7 @@ Object { "INSTANCE_HOURS": "Instance-hours", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_PATH_PRODUCT_TYPES": Object { @@ -634,6 +641,7 @@ Object { "NAME": "display_name", "SOCKETS": "Sockets", "STORAGE_GIBIBYTES": "Storage-gibibytes", + "STORAGE_GIBIBYTE_MONTHS": "Storage-gibibyte-months", "TRANSFER_GIBIBYTES": "Transfer-gibibytes", }, "RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES": Object { diff --git a/src/services/rhsm/rhsmConstants.js b/src/services/rhsm/rhsmConstants.js index 08492a5f4..a61b83d54 100644 --- a/src/services/rhsm/rhsmConstants.js +++ b/src/services/rhsm/rhsmConstants.js @@ -33,7 +33,7 @@ const RHSM_API_PATH_PRODUCT_TYPES = { /** * RHSM path IDs for metrics. * - * @type {{CORES: string, STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, + * @type {{CORES: string, STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, STORAGE_GIBIBYTE_MONTHS: string, * TRANSFER_GIBIBYTES: string, CORE_SECONDS: string}} */ const RHSM_API_PATH_METRIC_TYPES = { @@ -42,6 +42,7 @@ const RHSM_API_PATH_METRIC_TYPES = { CORE_SECONDS: 'Core-seconds', INSTANCE_HOURS: 'Instance-hours', STORAGE_GIBIBYTES: 'Storage-gibibytes', + STORAGE_GIBIBYTE_MONTHS: 'Storage-gibibyte-months', TRANSFER_GIBIBYTES: 'Transfer-gibibytes' }; @@ -337,37 +338,36 @@ const RHSM_API_QUERY_SET_TYPES = { * * @type {{RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string, SLA: string, * START_DATE: string, BILLING_PROVIDER: string}, RHSM_API_RESPONSE_DATA: string, RHSM_API_PATH_METRIC_TYPES: {CORES: string, - * STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, TRANSFER_GIBIBYTES: string, CORE_SECONDS: string}, - * RHSM_API_RESPONSE_TALLY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string}, + * STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, STORAGE_GIBIBYTE_MONTHS: string, TRANSFER_GIBIBYTES: string, + * CORE_SECONDS: string}, RHSM_API_RESPONSE_TALLY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string}, * RHSM_API_RESPONSE_INSTANCES_META_TYPES: {MEASUREMENTS: string, PRODUCT: string, COUNT: string}, * RHSM_API_RESPONSE_INSTANCES_DATA_TYPES: {MEASUREMENTS: string, BILLING_ACCOUNT_ID: string, SUBSCRIPTION_MANAGER_ID: string, * INVENTORY_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string, DISPLAY_NAME: string, LAST_SEEN: string}, * RHSM_API_RESPONSE_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string}, - * RHSM_API_RESPONSE_META_TYPES: {PRODUCT: string, COUNT: string}, RHSM_API_RESPONSE_ERRORS_CODE_TYPES: {GENERIC: string, - * OPTIN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, MONTHLY: string}, + * RHSM_API_RESPONSE_META_TYPES: {PRODUCT: string, COUNT: string}, RHSM_API_RESPONSE_ERRORS_CODE_TYPES: {GENERIC: string, OPTIN: string}, + * RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, MONTHLY: string}, * RHSM_API_RESPONSE_UOM_TYPES: {CORES: string, SOCKETS: string}, RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES: {ASCENDING: string, * DESCENDING: string}, RHSM_API_RESPONSE_SUBSCRIPTION_TYPES: {ANNUAL: string, ON_DEMAND: string}, * RHSM_API_QUERY_INVENTORY_SORT_TYPES: {CORES: string, STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, * TRANSFER_GIBIBYTES: string, BILLING_PROVIDER: string, CORE_SECONDS: string, LAST_SEEN: string, NAME: string}, - * RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM: string, OPENSHIFT_METRICS: string, SATELLITE: string, RHEL_WORKSTATION: string, - * RHOSAK: string, RHEL_COMPUTE_NODE: string, RHEL_X86: string, OPENSHIFT: string, SATELLITE_SERVER: string, - * OPENSHIFT_DEDICATED_METRICS: string, RHEL_DESKTOP: string, RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string, - * RHEL_IBM_Z: string, RHEL_IBM_POWER: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, - * RED_HAT: string, NONE: string, AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string}, - * RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS: string, ORACLE: string}, - * RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string}, - * RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string}, + * RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM: string, OPENSHIFT_METRICS: string, SATELLITE: string, RHEL_WORKSTATION: string, RHOSAK: string, + * RHEL_COMPUTE_NODE: string, RHEL_X86: string, OPENSHIFT: string, SATELLITE_SERVER: string, OPENSHIFT_DEDICATED_METRICS: string, + * RHEL_DESKTOP: string, RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string}, + * RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS: string, ORACLE: string}, + * RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string}, RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, + * NONE: string, AWS: string, ORACLE: string}, RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, + * PRODUCTION: string}, RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string}, * RHSM_API_QUERY_SET_INVENTORY_TYPES: {UOM: string, BILLING_ACCOUNT_ID: string, USAGE: string, DIRECTION: string, SORT: string, - * END_DATE: string, OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, BILLING_PROVIDER: string, - * DISPLAY_NAME: string}, RHSM_API_RESPONSE_ERRORS: string, RHSM_API_RESPONSE_TALLY_META_TYPES: {TOTAL_MONTHLY: string, - * DATE: string, PRODUCT: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, - * METRIC_ID: string, COUNT: string, VALUE: string}, RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string}, - * RHSM_API_RESPONSE_META: string, RHSM_API_RESPONSE_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, - * MONTHLY: string}, RHSM_API_QUERY_SET_TYPES: {UOM: string, GRANULARITY: string, USAGE: string, DIRECTION: string, SORT: string, - * END_DATE: string, OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, DISPLAY_NAME: string}, - * RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES: {QUANTITY: string, USAGE: string, NEXT_EVENT_TYPE: string, - * NEXT_EVENT_DATE: string, TOTAL_CAPACITY: string, PRODUCT_NAME: string, SKU: string, SERVICE_LEVEL: string}, - * RHSM_API_RESPONSE_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string}}} + * END_DATE: string, OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, BILLING_PROVIDER: string, DISPLAY_NAME: string}, + * RHSM_API_RESPONSE_ERRORS: string, RHSM_API_RESPONSE_TALLY_META_TYPES: {TOTAL_MONTHLY: string, DATE: string, PRODUCT: string, + * HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, METRIC_ID: string, COUNT: string, VALUE: string}, + * RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string}, RHSM_API_RESPONSE_META: string, + * RHSM_API_RESPONSE_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, MONTHLY: string}, + * RHSM_API_QUERY_SET_TYPES: {UOM: string, GRANULARITY: string, USAGE: string, DIRECTION: string, SORT: string, END_DATE: string, + * OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, DISPLAY_NAME: string}, + * RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES: {QUANTITY: string, USAGE: string, NEXT_EVENT_TYPE: string, NEXT_EVENT_DATE: string, + * TOTAL_CAPACITY: string, PRODUCT_NAME: string, SKU: string, SERVICE_LEVEL: string}, RHSM_API_RESPONSE_USAGE_TYPES: {UNSPECIFIED: string, + * DISASTER: string, DEVELOPMENT: string, PRODUCTION: string}}} */ const rhsmConstants = { RHSM_API_PATH_PRODUCT_TYPES, diff --git a/src/services/rhsm/rhsmServices.js b/src/services/rhsm/rhsmServices.js index fc1d90071..98e992b97 100644 --- a/src/services/rhsm/rhsmServices.js +++ b/src/services/rhsm/rhsmServices.js @@ -1290,7 +1290,7 @@ const getGraphReports = (id, params = {}, options = {}) => { * "granularity": "daily", * "has_cloudigrade_data": true, * "has_cloudigrade_mismatch": true, - * "metric_id": "Storage-gibibytes", + * "metric_id": "Storage-gibibyte-months", * "product": "RHEL", * "service_level": "", * "total_monthly": { @@ -2227,7 +2227,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => { * "count": 3, * "measurements": [ * "Instance-hours", - * "Storage-gibibytes", + * "Storage-gibibyte-months", * "Transfer-gibibytes" * ], * "product": "RHEL",