Vault client counts
-- The total billable clients in the specified date range. This includes entity, non-entity, and Secret sync - clients. The total client count number is an important consideration for Vault billing. -
-{{@title}}
-{{or @description "These totals are within this namespace and all its children."}}
-
diff --git a/ui/tests/acceptance/clients/counts/overview-test.js b/ui/tests/acceptance/clients/counts/overview-test.js
index 237a937f6f..3f4afab8cf 100644
--- a/ui/tests/acceptance/clients/counts/overview-test.js
+++ b/ui/tests/acceptance/clients/counts/overview-test.js
@@ -74,7 +74,7 @@ module('Acceptance | clients | overview', function (hooks) {
await click('[data-test-previous-year]');
await click(`[data-test-calendar-month=${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}]`);
assert
- .dom(CLIENT_COUNT.runningTotalMonthStats)
+ .dom(CLIENT_COUNT.usageStats('Vault client counts'))
.doesNotExist('running total single month stat boxes do not show');
assert
.dom(CLIENT_COUNT.chartContainer('Vault client counts'))
@@ -118,7 +118,9 @@ module('Acceptance | clients | overview', function (hooks) {
assert.dom('[data-test-display-year]').hasText('2024');
await click('[data-test-previous-year]');
await click('[data-test-calendar-month="September"]');
- assert.dom(CLIENT_COUNT.runningTotalMonthStats).exists('running total single month stat boxes show');
+ assert
+ .dom(CLIENT_COUNT.usageStats('Vault client counts'))
+ .exists('running total single month usage stats show');
assert
.dom(CLIENT_COUNT.chartContainer('Vault client counts'))
.doesNotExist('running total month over month charts do not show');
diff --git a/ui/tests/helpers/clients/client-count-selectors.ts b/ui/tests/helpers/clients/client-count-selectors.ts
index 3b65f36b59..dba0d85895 100644
--- a/ui/tests/helpers/clients/client-count-selectors.ts
+++ b/ui/tests/helpers/clients/client-count-selectors.ts
@@ -39,7 +39,7 @@ export const CLIENT_COUNT = {
plotPoint: '[data-test-line-chart="plot-point"]',
},
},
- usageStats: '[data-test-usage-stats]',
+ usageStats: (title: string) => `[data-test-usage-stats="${title}"]`,
dateDisplay: '[data-test-date-display]',
attributionBlock: '[data-test-clients-attribution]',
filterBar: '[data-test-clients-filter-bar]',
@@ -63,8 +63,6 @@ export const CLIENT_COUNT = {
nextYear: '[data-test-next-year]',
calendarMonth: (month: string) => `[data-test-calendar-month="${month}"]`,
},
- runningTotalMonthStats: '[data-test-running-total="single-month-stats"]',
- runningTotalMonthlyCharts: '[data-test-running-total="monthly-charts"]',
selectedAuthMount: 'div#mounts-search-select [data-test-selected-option] div',
selectedNs: 'div#namespace-search-select [data-test-selected-option] div',
upgradeWarning: '[data-test-clients-upgrade-warning]',
diff --git a/ui/tests/integration/components/clients/page/acme-test.js b/ui/tests/integration/components/clients/page/acme-test.js
index 9306c98e83..daa0566d4a 100644
--- a/ui/tests/integration/components/clients/page/acme-test.js
+++ b/ui/tests/integration/components/clients/page/acme-test.js
@@ -100,9 +100,9 @@ module('Integration | Component | clients | Clients::Page::Acme', function (hook
assert.dom(statText('Average ACME clients per month')).doesNotExist();
assert.dom(statText('Average new ACME clients per month')).doesNotExist();
assert
- .dom(usageStats)
+ .dom(usageStats('ACME usage'))
.hasText(
- `ACME usage This data can be used to understand how many ACME clients have been used for the queried month. Each ACME request is counted as one client. Total ACME clients ${expectedTotal}`,
+ `ACME usage Usage metrics tutorial This data can be used to understand how many ACME clients have been used for the queried month. Each ACME request is counted as one client. Total ACME clients ${expectedTotal}`,
'it renders usage stats with single month copy'
);
});
@@ -127,7 +127,7 @@ module('Integration | Component | clients | Clients::Page::Acme', function (hook
assert.dom(statText('Total ACME clients')).doesNotExist();
assert.dom(statText('Average ACME clients per month')).doesNotExist();
assert.dom(statText('Average new ACME clients per month')).doesNotExist();
- assert.dom(usageStats).doesNotExist();
+ assert.dom(usageStats('ACME usage')).doesNotExist();
});
test('it should render empty state when ACME data does not exist for a single month', async function (assert) {
diff --git a/ui/tests/integration/components/clients/page/sync-test.js b/ui/tests/integration/components/clients/page/sync-test.js
index bf64df84cd..ab9318db4d 100644
--- a/ui/tests/integration/components/clients/page/sync-test.js
+++ b/ui/tests/integration/components/clients/page/sync-test.js
@@ -119,9 +119,9 @@ module('Integration | Component | clients | Clients::Page::Sync', function (hook
assert.dom(charts.chart('Secrets sync usage')).doesNotExist('vertical bar chart does not render');
assert
- .dom(usageStats)
+ .dom(usageStats('Secrets sync usage'))
.hasText(
- `Secrets sync usage This data can be used to understand how many secrets sync clients have been used for this date range. Each Vault secret that is synced to at least one destination counts as one Vault client. Total sync clients ${total}`,
+ `Secrets sync usage Usage metrics tutorial This data can be used to understand how many secrets sync clients have been used for this date range. Each Vault secret that is synced to at least one destination counts as one Vault client. Total sync clients ${total}`,
'renders sync stats instead of chart'
);
assert.dom(statText('Average total clients per month')).doesNotExist('total sync counts does not exist');
diff --git a/ui/tests/integration/components/clients/usage-stats-test.js b/ui/tests/integration/components/clients/usage-stats-test.js
index 15943a8523..c06166acf6 100644
--- a/ui/tests/integration/components/clients/usage-stats-test.js
+++ b/ui/tests/integration/components/clients/usage-stats-test.js
@@ -11,80 +11,22 @@ import { hbs } from 'ember-cli-htmlbars';
module('Integration | Component | clients/usage-stats', function (hooks) {
setupRenderingTest(hooks);
- hooks.beforeEach(function () {
- this.showSecretSyncs = false;
- this.counts = {};
+ test('it renders', async function (assert) {
+ await render(
+ hbs`
+