From 66803f55c6351b2d57bef5645a0d6e6c5f9f6e7c Mon Sep 17 00:00:00 2001 From: David Rusnak <106361125+david-rusnak@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:01:49 -0400 Subject: [PATCH] chore: revert messaging regarding query count sources (#6941) retrigger ci --- cypress/e2e/cloud/usage.test.ts | 2 +- src/usage/UsageSingleStat.tsx | 29 ++++------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/cypress/e2e/cloud/usage.test.ts b/cypress/e2e/cloud/usage.test.ts index 34dbd5275a..f6636d44d5 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 (Flux Only) ?', + 'Query Count', 'Storage (GB-hr)', 'Data Out (GB)', ] diff --git a/src/usage/UsageSingleStat.tsx b/src/usage/UsageSingleStat.tsx index 252f759521..a4a960e18a 100644 --- a/src/usage/UsageSingleStat.tsx +++ b/src/usage/UsageSingleStat.tsx @@ -1,19 +1,11 @@ // Libraries import React, {FC, useContext} from 'react' -import { - Panel, - ComponentSize, - InfluxColors, - QuestionMarkTooltip, -} from '@influxdata/clockface' +import {Panel, ComponentSize, InfluxColors} 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, @@ -47,10 +39,6 @@ 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 ( @@ -63,14 +51,9 @@ const UsageSingleStat: FC = ({ size={ComponentSize.ExtraSmall} testID="usage-single-stat--header" > -
- {`${vectorName} ${ - usageVector.unit !== '' ? `(${usageVector.unit})` : '' - }`} - {isQueryCount && ( - - )} -
+
{`${usageVector.name} ${ + usageVector.unit !== '' ? `(${usageVector.unit})` : '' + }`}
= ({ ) } -const queryCountWarning = ( -

SQL and InfluxQL query counts are not displayed.

-) - export default UsageSingleStat