diff --git a/cypress/e2e/cloud/usage.test.ts b/cypress/e2e/cloud/usage.test.ts index f6636d44d5..34dbd5275a 100644 --- a/cypress/e2e/cloud/usage.test.ts +++ b/cypress/e2e/cloud/usage.test.ts @@ -2,7 +2,7 @@ import {Organization} from '../../../src/types' const statHeaders = [ 'Data In (MB)', - 'Query Count', + 'Query Count (Flux Only) ?', 'Storage (GB-hr)', 'Data Out (GB)', ] diff --git a/src/usage/UsageSingleStat.tsx b/src/usage/UsageSingleStat.tsx index a4a960e18a..252f759521 100644 --- a/src/usage/UsageSingleStat.tsx +++ b/src/usage/UsageSingleStat.tsx @@ -1,11 +1,19 @@ // Libraries import React, {FC, useContext} from 'react' -import {Panel, ComponentSize, InfluxColors} from '@influxdata/clockface' +import { + Panel, + ComponentSize, + InfluxColors, + QuestionMarkTooltip, +} from '@influxdata/clockface' // Components import {View} from 'src/visualization' import {UsageContext} from 'src/usage/context/usage' +// Constants +const QUERY_COUNT_VECTOR_NAME = 'Query Count' + // Types import { SingleStatViewProperties, @@ -39,6 +47,10 @@ const UsageSingleStat: FC = ({ decimalPlaces: {isEnforced: false, digits: 0}, } + // Adjusts table properties to warn user that only flux queries are included in the Query Count. + const isQueryCount: Boolean = usageVector.name === QUERY_COUNT_VECTOR_NAME + const vectorName = isQueryCount ? 'Query Count (Flux Only)' : usageVector.name + const error = fromFluxResult?.table?.columns?.error?.data?.[0] return ( @@ -51,9 +63,14 @@ const UsageSingleStat: FC = ({ size={ComponentSize.ExtraSmall} testID="usage-single-stat--header" > -
{`${usageVector.name} ${ - usageVector.unit !== '' ? `(${usageVector.unit})` : '' - }`}
+
+ {`${vectorName} ${ + usageVector.unit !== '' ? `(${usageVector.unit})` : '' + }`} + {isQueryCount && ( + + )} +
= ({ ) } +const queryCountWarning = ( +

SQL and InfluxQL query counts are not displayed.

+) + export default UsageSingleStat