From 3db6705ddc3a5b40a7530c1e3da150ada3342978 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Thu, 12 Nov 2020 16:28:54 -0500
Subject: [PATCH] feat(appMessagesSelectors): issues/502 cloud meter messaging
 (#503)

* build, dotenv flag for recommendations link
* locale, cloud meter related banner message strings
* appMessagesSelectors, apply tally cloud meter data, mismatch
* bannerMessages, cloud meter mismatch message
* graphCardSelectors, expose cloud meter flags
* helpers, ui link for recommendations
* rhsmApiTypes, cloud meter data and mismatch flags
* rhsmServices, mock update for cloud meter data
---
 .env                                          |   1 +
 public/locales/en-US.json                     |   5 +
 .../__snapshots__/helpers.test.js.snap        |   3 +
 src/common/helpers.js                         |   8 +
 .../bannerMessages/bannerMessages.js          |  30 +-
 .../__tests__/__snapshots__/i18n.test.js.snap |  13 +
 .../appMessagesSelectors.test.js.snap         |  48 ++-
 .../graphCardSelectors.test.js.snap           | 278 ++++++++++++++++++
 .../__tests__/appMessagesSelectors.test.js    | 195 +++++++++++-
 .../__tests__/graphCardSelectors.test.js      |  20 +-
 src/redux/selectors/appMessagesSelectors.js   |  27 +-
 src/redux/selectors/graphCardSelectors.js     |   4 +-
 src/services/rhsmServices.js                  |   2 +
 .../__snapshots__/index.test.js.snap          |   8 +
 src/types/rhsmApiTypes.js                     |  33 ++-
 15 files changed, 644 insertions(+), 31 deletions(-)

diff --git a/.env b/.env
index 3d232a414..15d74a91b 100644
--- a/.env
+++ b/.env
@@ -8,6 +8,7 @@ PUBLIC_URL=${UI_DEPLOY_PATH_PREFIX}/apps/subscriptions/
 
 REACT_APP_UI_LINK_CONTACT_US=https://access.redhat.com/account-team
 REACT_APP_UI_LINK_LEARN_MORE=https://access.redhat.com/documentation/en-us/subscription_central/2020-10/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/
+REACT_APP_UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS=
 
 REACT_APP_UI_DISABLED=false
 REACT_APP_UI_DISABLED_TOOLBAR=false
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
index e841109d2..cfd36ad64 100644
--- a/public/locales/en-US.json
+++ b/public/locales/en-US.json
@@ -3,6 +3,11 @@
     "pending": "Authenticating...",
     "maintenanceCopy": "We are currently undergoing scheduled maintenance and will be back shortly. Thank you for your patience."
   },
+  "curiosity-banner": {
+    "dataMismatchTitle": "Improve reporting accuracy",
+    "dataMismatchMessage": "Action required in order to improve {{appName}} reporting.",
+    "dataMismatchMessage_cloudigradeMismatch": "<0>View recommmend actions</0> to take in order to improve {{appName}} reporting."
+  },
   "curiosity-graph": {
     "cardHeading": "CPU usage",
     "coresHeading": "CPU core usage",
diff --git a/src/common/__tests__/__snapshots__/helpers.test.js.snap b/src/common/__tests__/__snapshots__/helpers.test.js.snap
index bdf19c59e..c938059c8 100644
--- a/src/common/__tests__/__snapshots__/helpers.test.js.snap
+++ b/src/common/__tests__/__snapshots__/helpers.test.js.snap
@@ -16,6 +16,7 @@ Object {
   "UI_DISPLAY_START_NAME": "Subscription Watch",
   "UI_LINK_CONTACT_US": "https://access.redhat.com/account-team",
   "UI_LINK_LEARN_MORE": "https://access.redhat.com/documentation/en-us/subscription_central/2020-10/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/",
+  "UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS": "",
   "UI_LOCALE_DEFAULT": "en-US",
   "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
@@ -50,6 +51,7 @@ Object {
   "UI_DISPLAY_START_NAME": "Subscription Watch",
   "UI_LINK_CONTACT_US": "https://access.redhat.com/account-team",
   "UI_LINK_LEARN_MORE": "https://access.redhat.com/documentation/en-us/subscription_central/2020-10/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/",
+  "UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS": "",
   "UI_LOCALE_DEFAULT": "en-US",
   "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
@@ -84,6 +86,7 @@ Object {
   "UI_DISPLAY_START_NAME": "Subscription Watch",
   "UI_LINK_CONTACT_US": "https://access.redhat.com/account-team",
   "UI_LINK_LEARN_MORE": "https://access.redhat.com/documentation/en-us/subscription_central/2020-10/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/",
+  "UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS": "",
   "UI_LOCALE_DEFAULT": "en-US",
   "UI_LOCALE_DEFAULT_DESC": "English",
   "UI_LOGGER_ID": "curiosity",
diff --git a/src/common/helpers.js b/src/common/helpers.js
index e278467b9..981fb44f2 100644
--- a/src/common/helpers.js
+++ b/src/common/helpers.js
@@ -161,6 +161,13 @@ const UI_LINK_CONTACT_US = process.env.REACT_APP_UI_LINK_CONTACT_US;
  */
 const UI_LINK_LEARN_MORE = process.env.REACT_APP_UI_LINK_LEARN_MORE;
 
+/**
+ * A url, or uri, for "recommend actions"
+ *
+ * @type {string}
+ */
+const UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS = process.env.REACT_APP_UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS;
+
 /**
  * UI locale default.
  *
@@ -252,6 +259,7 @@ const helpers = {
   UI_DISPLAY_START_NAME,
   UI_LINK_CONTACT_US,
   UI_LINK_LEARN_MORE,
+  UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS,
   UI_LOCALE_DEFAULT,
   UI_LOCALE_DEFAULT_DESC,
   UI_LOGGER_ID,
diff --git a/src/components/bannerMessages/bannerMessages.js b/src/components/bannerMessages/bannerMessages.js
index 1af3f2bdc..90e19cb3a 100644
--- a/src/components/bannerMessages/bannerMessages.js
+++ b/src/components/bannerMessages/bannerMessages.js
@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Alert, AlertActionCloseButton, AlertVariant } from '@patternfly/react-core';
+import { Alert, AlertActionCloseButton, AlertVariant, Button } from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { connect, reduxSelectors } from '../../redux';
+import { translate } from '../i18n/i18n';
+import { helpers } from '../../common';
 
 /**
  * Render banner messages.
@@ -86,7 +89,30 @@ BannerMessages.propTypes = {
  * @type {{messages: Array}}
  */
 BannerMessages.defaultProps = {
-  messages: []
+  messages: [
+    {
+      id: 'cloudigradeMismatch',
+      title: translate('curiosity-banner.dataMismatchTitle'),
+      message: translate(
+        'curiosity-banner.dataMismatchMessage',
+        {
+          context: helpers.UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS !== '' && 'cloudigradeMismatch',
+          appName: helpers.UI_DISPLAY_NAME
+        },
+        [
+          <Button
+            isInline
+            component="a"
+            variant="link"
+            icon={<ExternalLinkAltIcon />}
+            iconPosition="right"
+            target="_blank"
+            href={helpers.UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS}
+          />
+        ]
+      )
+    }
+  ]
 };
 
 /**
diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
index 349fa2bbf..a98ab42ff 100644
--- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
+++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -26,6 +26,19 @@ Array [
       },
     ],
   },
+  Object {
+    "file": "./src/components/bannerMessages/bannerMessages.js",
+    "keys": Array [
+      Object {
+        "key": "curiosity-banner.dataMismatchTitle",
+        "match": "translate('curiosity-banner.dataMismatchTitle')",
+      },
+      Object {
+        "key": "curiosity-banner.dataMismatchMessage",
+        "match": "translate( 'curiosity-banner.dataMismatchMessage', { context: helpers.UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS !== '' && 'cloudigradeMismatch', appName: helpers.UI_DISPLAY_NAME }, [ <Button isInline component=\\"a\\" variant=\\"link\\" icon={<ExternalLinkAltIcon />} iconPosition=\\"right\\" target=\\"_blank\\" href={helpers.UI_LINK_REPORT_ACCURACY_RECOMMENDATIONS} /> ] )",
+      },
+    ],
+  },
   Object {
     "file": "./src/components/c3GraphCard/c3GraphCard.js",
     "keys": Array [
diff --git a/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap b/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
index 2a5f42abb..c861fa358 100644
--- a/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
+++ b/src/redux/selectors/__tests__/__snapshots__/appMessagesSelectors.test.js.snap
@@ -1,14 +1,58 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AppMessagesSelectors should map a fulfilled product ID response to an aggregated output: fulfilled 1`] = `
+Object {
+  "appMessages": Object {
+    "cloudigradeMismatch": true,
+  },
+}
+`;
+
 exports[`AppMessagesSelectors should pass minimal data on a product ID without a product ID provided: no product id error 1`] = `
 Object {
-  "appMessages": Object {},
+  "appMessages": Object {
+    "cloudigradeMismatch": false,
+  },
 }
 `;
 
 exports[`AppMessagesSelectors should pass minimal data on missing a reducer response: missing reducer error 1`] = `
 Object {
-  "appMessages": Object {},
+  "appMessages": Object {
+    "cloudigradeMismatch": false,
+  },
+}
+`;
+
+exports[`AppMessagesSelectors should populate data from the in memory cache: cached data: cache used and pending 1`] = `
+Object {
+  "appMessages": Object {
+    "cloudigradeMismatch": true,
+  },
+}
+`;
+
+exports[`AppMessagesSelectors should populate data from the in memory cache: cached data: initial fulfilled 1`] = `
+Object {
+  "appMessages": Object {
+    "cloudigradeMismatch": true,
+  },
+}
+`;
+
+exports[`AppMessagesSelectors should populate data from the in memory cache: cached data: update and fulfilled 1`] = `
+Object {
+  "appMessages": Object {
+    "cloudigradeMismatch": true,
+  },
+}
+`;
+
+exports[`AppMessagesSelectors should populate data on a product ID when the api response is missing expected properties: data populated, missing properties 1`] = `
+Object {
+  "appMessages": Object {
+    "cloudigradeMismatch": false,
+  },
 }
 `;
 
diff --git a/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap b/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap
index 25693bd14..7bc3332d5 100644
--- a/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap
+++ b/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap
@@ -21,18 +21,24 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 0,
@@ -41,18 +47,24 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 0,
@@ -61,18 +73,24 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 0,
@@ -81,18 +99,24 @@ Object {
     "cores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 2,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 4,
@@ -101,18 +125,24 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 1,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 2,
@@ -121,18 +151,24 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 1,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 2,
@@ -141,18 +177,24 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 1,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 2,
@@ -161,18 +203,24 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 1,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": null,
@@ -181,18 +229,24 @@ Object {
     "sockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 1,
         "y": 2,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 2,
         "y": 4,
@@ -430,6 +484,8 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -438,6 +494,8 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -446,6 +504,8 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -454,6 +514,8 @@ Object {
     "cores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -462,6 +524,8 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -470,6 +534,8 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -478,6 +544,8 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -486,6 +554,8 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -494,6 +564,8 @@ Object {
     "sockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -588,6 +660,8 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -596,6 +670,8 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -604,6 +680,8 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -612,6 +690,8 @@ Object {
     "cores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -620,6 +700,8 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -628,6 +710,8 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -636,6 +720,8 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -644,6 +730,8 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -652,6 +740,8 @@ Object {
     "sockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -746,6 +836,8 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -754,6 +846,8 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -762,6 +856,8 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -770,6 +866,8 @@ Object {
     "cores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -778,6 +876,8 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -786,6 +886,8 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -794,6 +896,8 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -802,6 +906,8 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -810,6 +916,8 @@ Object {
     "sockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -904,6 +1012,8 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -912,6 +1022,8 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -920,6 +1032,8 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 0,
@@ -928,6 +1042,8 @@ Object {
     "cores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -936,6 +1052,8 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -944,6 +1062,8 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -952,6 +1072,8 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -960,6 +1082,8 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 1,
@@ -968,6 +1092,8 @@ Object {
     "sockets": Array [
       Object {
         "date": 2018-07-04T00:00:00.000Z,
+        "hasCloudigradeData": true,
+        "hasCloudigradeMismatch": true,
         "hasData": true,
         "x": 0,
         "y": 2,
@@ -1062,18 +1188,24 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1082,18 +1214,24 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1102,18 +1240,24 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1122,18 +1266,76 @@ Object {
     "cores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 2,
+        "y": 0,
+      },
+    ],
+    "hasCloudigradeData": Array [
+      Object {
+        "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 0,
+        "y": 0,
+      },
+      Object {
+        "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 1,
+        "y": 0,
+      },
+      Object {
+        "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 2,
+        "y": 0,
+      },
+    ],
+    "hasCloudigradeMismatch": Array [
+      Object {
+        "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 0,
+        "y": 0,
+      },
+      Object {
+        "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 1,
+        "y": 0,
+      },
+      Object {
+        "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1142,18 +1344,24 @@ Object {
     "hasData": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1162,18 +1370,24 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1182,18 +1396,24 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 1,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1202,18 +1422,24 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 0,
@@ -1222,18 +1448,24 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 1,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 0,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 2,
@@ -1242,18 +1474,24 @@ Object {
     "sockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 2,
       },
       Object {
         "date": 2019-09-05T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 1,
         "y": 2,
       },
       Object {
         "date": 2019-09-06T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 2,
         "y": 4,
@@ -1476,6 +1714,8 @@ Object {
     "cloudCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
@@ -1484,6 +1724,8 @@ Object {
     "cloudInstanceCount": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
@@ -1492,6 +1734,8 @@ Object {
     "cloudSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
@@ -1500,14 +1744,38 @@ Object {
     "cores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 2,
       },
     ],
+    "hasCloudigradeData": Array [
+      Object {
+        "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 0,
+        "y": 0,
+      },
+    ],
+    "hasCloudigradeMismatch": Array [
+      Object {
+        "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
+        "hasData": undefined,
+        "x": 0,
+        "y": 0,
+      },
+    ],
     "hasData": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 0,
@@ -1516,6 +1784,8 @@ Object {
     "hypervisorCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 1,
@@ -1524,6 +1794,8 @@ Object {
     "hypervisorSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 1,
@@ -1532,6 +1804,8 @@ Object {
     "physicalCores": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 1,
@@ -1540,6 +1814,8 @@ Object {
     "physicalSockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 1,
@@ -1548,6 +1824,8 @@ Object {
     "sockets": Array [
       Object {
         "date": 2019-09-04T00:00:00.000Z,
+        "hasCloudigradeData": undefined,
+        "hasCloudigradeMismatch": undefined,
         "hasData": undefined,
         "x": 0,
         "y": 2,
diff --git a/src/redux/selectors/__tests__/appMessagesSelectors.test.js b/src/redux/selectors/__tests__/appMessagesSelectors.test.js
index 096539529..54bf5486b 100644
--- a/src/redux/selectors/__tests__/appMessagesSelectors.test.js
+++ b/src/redux/selectors/__tests__/appMessagesSelectors.test.js
@@ -1,4 +1,5 @@
 import appMessagesSelectors from '../appMessagesSelectors';
+import { rhsmApiTypes } from '../../../types/rhsmApiTypes';
 
 describe('AppMessagesSelectors', () => {
   it('should return specific selectors', () => {
@@ -15,8 +16,200 @@ describe('AppMessagesSelectors', () => {
       viewId: 'test',
       productId: undefined
     };
-    const state = {};
+    const state = {
+      graph: {
+        reportCapacity: {
+          fulfilled: true,
+          data: [{ [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: [] }]
+        }
+      }
+    };
 
     expect(appMessagesSelectors.appMessages(state, props)).toMatchSnapshot('no product id error');
   });
+
+  it('should populate data on a product ID when the api response is missing expected properties', () => {
+    const props = {
+      viewId: 'test',
+      productId: 'Lorem Ipsum missing expected properties'
+    };
+    const state = {
+      graph: {
+        reportCapacity: {
+          'Lorem Ipsum missing expected properties': {
+            fulfilled: true,
+            data: [
+              {
+                [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: [
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-04T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1
+                  },
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-05T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1
+                  },
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-06T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 4,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 2
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    };
+
+    expect(appMessagesSelectors.appMessages(state, props)).toMatchSnapshot('data populated, missing properties');
+  });
+
+  it('should map a fulfilled product ID response to an aggregated output', () => {
+    const props = {
+      viewId: 'test',
+      productId: 'Lorem Ipsum fulfilled aggregated output'
+    };
+    const state = {
+      graph: {
+        reportCapacity: {
+          'Lorem Ipsum fulfilled aggregated output': {
+            fulfilled: true,
+            data: [
+              {
+                [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: [
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-04T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
+                  },
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-05T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
+                  },
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-06T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.CORES]: 4,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 4,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: null,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    };
+
+    expect(appMessagesSelectors.appMessages(state, props)).toMatchSnapshot('fulfilled');
+  });
+
+  it('should populate data from the in memory cache', () => {
+    const props = {
+      viewId: 'cache-test',
+      productId: 'Lorem Ipsum ID cached'
+    };
+    const stateInitialFulfilled = {
+      graph: {
+        reportCapacity: {
+          'Lorem Ipsum ID cached': {
+            fulfilled: true,
+            data: [
+              {
+                [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: [
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-04T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    };
+
+    expect(appMessagesSelectors.appMessages(stateInitialFulfilled, props)).toMatchSnapshot(
+      'cached data: initial fulfilled'
+    );
+
+    const statePending = {
+      graph: {
+        reportCapacity: {
+          'Lorem Ipsum ID cached': {
+            ...stateInitialFulfilled.graph.reportCapacity['Lorem Ipsum ID cached'],
+            pending: true
+          }
+        }
+      }
+    };
+
+    expect(appMessagesSelectors.appMessages(statePending, props)).toMatchSnapshot(
+      'cached data: cache used and pending'
+    );
+
+    const stateFulfilled = {
+      graph: {
+        reportCapacity: {
+          'Lorem Ipsum ID cached': {
+            ...stateInitialFulfilled.graph.reportCapacity['Lorem Ipsum ID cached'],
+            fulfilled: true,
+            data: [
+              {
+                [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: [
+                  {
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2018-07-04T00:00:00.000Z',
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.CORES]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.SOCKETS]: 2,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: false
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    };
+
+    expect(appMessagesSelectors.appMessages(stateFulfilled, props)).toMatchSnapshot(
+      'cached data: update and fulfilled'
+    );
+  });
 });
diff --git a/src/redux/selectors/__tests__/graphCardSelectors.test.js b/src/redux/selectors/__tests__/graphCardSelectors.test.js
index 7f9314aa2..52f4f2986 100644
--- a/src/redux/selectors/__tests__/graphCardSelectors.test.js
+++ b/src/redux/selectors/__tests__/graphCardSelectors.test.js
@@ -220,7 +220,9 @@ describe('GraphCardSelectors', () => {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
-                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
                   },
                   {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-05T00:00:00.000Z',
@@ -230,7 +232,9 @@ describe('GraphCardSelectors', () => {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
-                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
                   },
                   {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.DATE]: '2019-09-06T00:00:00.000Z',
@@ -240,7 +244,9 @@ describe('GraphCardSelectors', () => {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 2,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 2,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: null,
-                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
                   }
                 ]
               },
@@ -304,7 +310,9 @@ describe('GraphCardSelectors', () => {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
-                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
                   }
                 ]
               },
@@ -359,7 +367,9 @@ describe('GraphCardSelectors', () => {
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HYPERVISOR_SOCKETS]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_CORES]: 1,
                     [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.PHYSICAL_SOCKETS]: 1,
-                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA]: true,
+                    [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: true
                   }
                 ]
               },
diff --git a/src/redux/selectors/appMessagesSelectors.js b/src/redux/selectors/appMessagesSelectors.js
index 9172f2509..a302fd42b 100644
--- a/src/redux/selectors/appMessagesSelectors.js
+++ b/src/redux/selectors/appMessagesSelectors.js
@@ -1,4 +1,5 @@
 import { createSelector } from 'reselect';
+import { rhsmApiTypes } from '../../types';
 /**
  * Selector cache.
  *
@@ -16,6 +17,7 @@ const selectorCache = { data: {} };
  * @returns {object}
  */
 const statePropsFilter = (state, props = {}) => ({
+  reportCapacity: state.graph?.reportCapacity?.[props.productId],
   viewId: props.viewId,
   productId: props.productId
 });
@@ -23,16 +25,33 @@ const statePropsFilter = (state, props = {}) => ({
 /**
  * Create selector, transform combined state, props into a consumable object.
  *
- * @type {{appMessages: object}}
+ * @type {{appMessages: {cloudigradeMismatch: boolean}}}
  */
 const selector = createSelector([statePropsFilter], data => {
-  const { viewId = null, productId = null } = data || {};
-  const appMessages = {};
+  const { viewId = null, productId = null, reportCapacity = {} } = data || {};
+  const appMessages = {
+    cloudigradeMismatch: false
+  };
 
   const cache = (viewId && productId && selectorCache.data[`${viewId}_${productId}`]) || undefined;
 
   Object.assign(appMessages, { ...cache });
 
+  // Scan Tally response for Cloud Meter flags
+  if (reportCapacity.fulfilled && appMessages.cloudigradeMismatch !== true) {
+    const [{ [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA]: reportData = [] }] = reportCapacity.data || {};
+
+    const cloudigradeMismatch = reportData.find(
+      ({ [rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]: mismatch }) => mismatch === true
+    );
+
+    appMessages.cloudigradeMismatch = cloudigradeMismatch !== undefined;
+
+    selectorCache.data[`${viewId}_${productId}`] = {
+      ...appMessages
+    };
+  }
+
   return { appMessages };
 });
 
@@ -40,7 +59,7 @@ const selector = createSelector([statePropsFilter], data => {
  * Expose selector instance. For scenarios where a selector is reused across component instances.
  *
  * @param {object} defaultProps
- * @returns {{appMessages: object}}
+ * @returns {{appMessages: {cloudigradeMismatch: boolean}}}
  */
 const makeSelector = defaultProps => (state, props) => ({
   ...selector(state, props, defaultProps)
diff --git a/src/redux/selectors/graphCardSelectors.js b/src/redux/selectors/graphCardSelectors.js
index 82c14e04d..a2e313a1c 100644
--- a/src/redux/selectors/graphCardSelectors.js
+++ b/src/redux/selectors/graphCardSelectors.js
@@ -101,7 +101,9 @@ const selector = createSelector([statePropsFilter, queryFilter], (response, quer
     // Apply "display logic" then return a custom value for Reporting graph entries
     const customReportValue = (data, key, presetData) => ({
       ...presetData,
-      hasData: data[rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA]
+      hasData: data[rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_DATA],
+      hasCloudigradeData: data[rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_DATA],
+      hasCloudigradeMismatch: data[rhsmApiTypes.RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES.HAS_CLOUDIGRADE_MISMATCH]
     });
 
     // Apply "display logic" then return a custom value for Capacity graph entries
diff --git a/src/services/rhsmServices.js b/src/services/rhsmServices.js
index 0ea1519d9..94e0cb77b 100644
--- a/src/services/rhsmServices.js
+++ b/src/services/rhsmServices.js
@@ -90,6 +90,8 @@ const getApiVersion = () =>
  *           "physical_sockets": 50,
  *           "hypervisor_sockets": 0,
  *           "has_data": true,
+ *           "has_cloudigrade_data": true,
+ *           "has_cloudigrade_mismatch": true,
  *           "cloud_sockets": 80
  *         },
  *         {
diff --git a/src/types/__tests__/__snapshots__/index.test.js.snap b/src/types/__tests__/__snapshots__/index.test.js.snap
index e77fa16cd..a771846f6 100644
--- a/src/types/__tests__/__snapshots__/index.test.js.snap
+++ b/src/types/__tests__/__snapshots__/index.test.js.snap
@@ -181,6 +181,8 @@ Object {
         "CLOUD_SOCKETS": "cloud_sockets",
         "CORES": "cores",
         "DATE": "date",
+        "HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
+        "HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
         "HAS_DATA": "has_data",
         "HYPERVISOR_CORES": "hypervisor_cores",
         "HYPERVISOR_SOCKETS": "hypervisor_sockets",
@@ -369,6 +371,8 @@ Object {
         "CLOUD_SOCKETS": "cloud_sockets",
         "CORES": "cores",
         "DATE": "date",
+        "HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
+        "HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
         "HAS_DATA": "has_data",
         "HYPERVISOR_CORES": "hypervisor_cores",
         "HYPERVISOR_SOCKETS": "hypervisor_sockets",
@@ -556,6 +560,8 @@ Object {
       "CLOUD_SOCKETS": "cloud_sockets",
       "CORES": "cores",
       "DATE": "date",
+      "HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
+      "HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
       "HAS_DATA": "has_data",
       "HYPERVISOR_CORES": "hypervisor_cores",
       "HYPERVISOR_SOCKETS": "hypervisor_sockets",
@@ -747,6 +753,8 @@ Object {
       "CLOUD_SOCKETS": "cloud_sockets",
       "CORES": "cores",
       "DATE": "date",
+      "HAS_CLOUDIGRADE_DATA": "has_cloudigrade_data",
+      "HAS_CLOUDIGRADE_MISMATCH": "has_cloudigrade_mismatch",
       "HAS_DATA": "has_data",
       "HYPERVISOR_CORES": "hypervisor_cores",
       "HYPERVISOR_SOCKETS": "hypervisor_sockets",
diff --git a/src/types/rhsmApiTypes.js b/src/types/rhsmApiTypes.js
index 8e0091e55..b737077c5 100644
--- a/src/types/rhsmApiTypes.js
+++ b/src/types/rhsmApiTypes.js
@@ -144,8 +144,9 @@ const RHSM_API_RESPONSE_PRODUCTS_DATA = 'data';
  * RHSM response Reporting/Tally DATA types.
  * Schema/map of expected Reporting/Tally DATA response properties.
  *
- * @type {{HYPERVISOR_SOCKETS: string, CORES: string, DATE: string, SOCKETS: string, HAS_DATA: string,
- *     PHYSICAL_SOCKETS: string, HYPERVISOR_CORES: string, PHYSICAL_CORES: string}}
+ * @type {{HYPERVISOR_SOCKETS: string, CORES: string, SOCKETS: string, CLOUD_CORES: string, HAS_DATA: string,
+ * PHYSICAL_SOCKETS: string, PHYSICAL_CORES: string, CLOUD_INSTANCES: string, DATE: string, CLOUD_SOCKETS: string,
+ * HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HYPERVISOR_CORES: string}}
  */
 const RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES = {
   CLOUD_CORES: 'cloud_cores',
@@ -158,6 +159,8 @@ const RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES = {
   PHYSICAL_CORES: 'physical_cores',
   PHYSICAL_SOCKETS: 'physical_sockets',
   SOCKETS: 'sockets',
+  HAS_CLOUDIGRADE_DATA: 'has_cloudigrade_data',
+  HAS_CLOUDIGRADE_MISMATCH: 'has_cloudigrade_mismatch',
   HAS_DATA: 'has_data'
 };
 
@@ -332,23 +335,21 @@ const RHSM_API_QUERY_TYPES = {
  *     TALLY_REPORT: string, USAGE: string, SORT: string, OFFSET: string, CONDUIT_SYNC: string},
  *     RHSM_API_RESPONSE_LINKS: string, RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES: {OFFSET: string, LIMIT: string},
  *     RHSM_API_PATH_ID_TYPES: {RHEL_ARM: string, RHEL_WORKSTATION: string, RHEL_DESKTOP: string, RHEL: string,
- *     RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_COMPUTE_NODE: string, RHEL_IBM_POWER: string, RHEL_X86: string
- *     OPENSHIFT: string}, RHSM_API_QUERY_SET_OPTIN_TYPES: {TALLY_SYNC: string, TALLY_REPORT: string,
- *     CONDUIT_SYNC: 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, USAGE: string,
- *     DIRECTION: string, SORT: string, OFFSET: string, SLA: string, LIMIT: string},
+ *     RHEL_SERVER: string, RHEL_IBM_Z: string, RHEL_COMPUTE_NODE: string, RHEL_IBM_POWER: string,
+ *     RHEL_X86: string, OPENSHIFT: string}, RHSM_API_QUERY_SET_OPTIN_TYPES: {TALLY_SYNC: string,
+ *     TALLY_REPORT: string, CONDUIT_SYNC: 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,
+ *     USAGE: string, DIRECTION: string, SORT: string, OFFSET: string, SLA: string, LIMIT: string},
  *     RHSM_API_QUERY_SORT_TYPES: {CORES: string, DATE: string, HARDWARE: string, SOCKETS: string,
  *     MEASUREMENT: string, NAME: string}, RHSM_API_RESPONSE_PRODUCTS_DATA_TYPES: {HYPERVISOR_SOCKETS: string,
  *     CORES: string, DATE: string, SOCKETS: string, HAS_DATA: string, PHYSICAL_SOCKETS: string,
- *     HYPERVISOR_CORES: string, PHYSICAL_CORES: string}, RHSM_API_QUERY_UOM_TYPES: {CORES: string,
- *     SOCKETS: string}, RHSM_API_RESPONSE_LINKS_TYPES: string,
- *     RHSM_API_RESPONSE_INVENTORY_GUESTS_DATA_TYPES: {SUBSCRIPTION_ID: string, ID: string, NAME: string,
- *     LAST_SEEN: string}, RHSM_API_RESPONSE_ERROR_DATA: string, RHSM_API_RESPONSE_META: string,
- *     RHSM_API_RESPONSE_INVENTORY_DATA_TYPES: {CORES: string, HARDWARE: string, SOCKETS: string,
- *     SUBSCRIPTION_ID: string, INVENTORY_ID: string, MEASUREMENT: string, ID: string, GUESTS: string,
- *     CLOUD_PROVIDER: string, LAST_SEEN: string, NAME: string},
- *     RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string,
+ *     HYPERVISOR_CORES: string, PHYSICAL_CORES: string}, RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string},
+ *     RHSM_API_RESPONSE_LINKS_TYPES: string, RHSM_API_RESPONSE_INVENTORY_GUESTS_DATA_TYPES: {SUBSCRIPTION_ID: string,
+ *     ID: string, NAME: string, LAST_SEEN: string}, RHSM_API_RESPONSE_ERROR_DATA: string, RHSM_API_RESPONSE_META: string,
+ *     RHSM_API_RESPONSE_INVENTORY_DATA_TYPES: {CORES: string, HARDWARE: string, SOCKETS: string, SUBSCRIPTION_ID: string,
+ *     INVENTORY_ID: string, MEASUREMENT: string, ID: string, GUESTS: string, CLOUD_PROVIDER: string, LAST_SEEN: string,
+ *     NAME: string}, RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, END_DATE: string,
  *     SLA: string, START_DATE: string}}}
  */
 const rhsmApiTypes = {