mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-24 08:01:07 +02:00
* Client Count Routing Updates (#24733) * updates client count routing for sync and future additions * adds copyright header to clients sync template * adds missing copyright headers * UI: Adds secret_syncs to mirage /activity endpoint (#24846) * add secret_syncs to mirage endpoint * import clients handler * UI: Set up client charts for incoming sync data (#24852) * sum stacked bar values for tooltip total * make tooltip dynamic based on chartLegend * remove redundant helper * add secret_syncs to client count utils * move sum function to helper * update horizontal bar chart to include sync_clients * calculate sum of bars in tooltip * rename color palette const, define chart legends in each parent component instead of token.js * update tooltips * update mirage handler to add sys/ namespace * update mirage handler to add sys/ namespace * use pushObject * update test * UI: Secret sync bar chart (#24926) * install lineal * add ember-style-modifier dep * Add client count types for serialized data * Add sync bar chart component with tests * Chart is responsive * address comments * Clients Counts Parent Route (#24899) * adds interfaces for clients models * moves date formatting logic from clients activity adapter to utils file * adds clients counts route * updates links to clients route to point to top level and updates redirect to counts overview route * removes clients base route and moves overview and sync routes under counts * adds clients counts page component * converts clients route to ts * adds billing start timestamp to clients config mirage response and updates counts route to always attempt to fetch activity * fixes issue with updating namespace and auth mount query params always triggering client counts route model hook * adds tests for clients counts page component * adds missing copyright header to client-counts type file * Update ui/app/components/clients/page/counts.hbs Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * fixes bad import in sync-bar-chart * updates clients counts route to bypass query if there is not start_time * pins d3-shape to 1.3.7 for now -- makes lineal play nice with old charts * fixes sync bar chart tooltip assertion --------- Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * UI: convert line-chart to lineal (#24961) * lineal chart alongside svg * Add version-history to sync handler for testing * line chart is TS, test updated * remove d3-shape resolution * fix clients/token-test * use chartHeight in running-total template * use M/yy key instead of timestamp, chart is responsive * Add test for swapping datasets * add more edge case tests * more test * remove untrue assertion * fix weird decimal when between 1.1k and 2k * address feedback * Update line-chart to use timestamp instead of month key * Add timestamp to all places where month is on the clients activity response * Client Counts Overview (#24969) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * renames counts component to activity * removes unused selectedAuthMethod arg from running-total component * adds timestamp back to running-total component * Secrets sync UI: add sync page component (#24982) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * move sync-bar-chart to charts/ folder * update types and rename chart * rename template file * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * fix 0 values erroring charts * separate timestamp again * address merge conflicts * finish building sync chart component WIP css * renames counts component to activity * update import * revert name to dataKey * update styling for charts without legends * use monthly stat chart component for layout * use monthly chart stats in monthly new * implement stat wrapper; * remove extra grid div * rename component * fix legend css; * update test[ * remove arbitrarily setting max * add single month view * use stat text * update line chart tests * rename line chart * update tests --------- Co-authored-by: Jordan Reimer <zofskeez@gmail.com> * update selectors * add sync page tests * Secrets Sync UI: Add secrets syncs to csv export (#25056) * update mirage and add sync clients to export csv * fix sync legend label * remove word * update copy in modal * update mirage * fix attribution tooltip text * Clients Counts Token Route (#25019) * renames token route and page component back to dashboard * adds client counts token route and page component * updates charts in token page to use ChartContainer component * adds tests for clients token page component * restore clients dashboard test * use var for chart title sync page * updates clients token page to show usage stats when querying single month * updates token page clients averages to only include entity and non-entity clients in calculation * fixes monthly total counts lower than new clients in mirage handler * fixes token test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> * Clients Usage Stats/Running Total Updates (#25094) * updates clients usage counts and running totals * updates usage stats total copy * fixes client counts overview tests * Secrets sync UI: cleanup and consolidation of components (#25090) * rename authMethod to mountPath * generalize count template copy * add todo to delete monthly new component * rename to tokenTab * wrap filters in conditional checking for start timestamp * some users may not have access to /config endpoint * fix querying when user has no billing date permissions and clicks current billing period * extend activity component from counts page * Revert "extend activity component from counts page" This reverts commit 1d0e85c82faf88c4385a04b1a5841cdde7fd00e0. * rename to startTimestampISO * remove timestamp from route and just use activity model responseTimestamp * fix chart y domain max * fix typos in usage stat and running totals component * delete backing class for display only template; * updates tests * adds comment for fetching license to get start date for billing * cleans up unused client counts files (#25157) * adds changelog * fix assertion copy * adds changelog description * updates enterprise sidebar nav test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
199 lines
6.7 KiB
TypeScript
199 lines
6.7 KiB
TypeScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
// base component for counts child routes that can be extended as needed
|
|
// contains getters that filter and extract data from activity model for use in charts
|
|
|
|
import Component from '@glimmer/component';
|
|
import { isAfter, isBefore, isSameMonth, fromUnixTime } from 'date-fns';
|
|
import { parseAPITimestamp } from 'core/utils/date-formatters';
|
|
import { calculateAverage } from 'vault/utils/chart-helpers';
|
|
|
|
import type ClientsActivityModel from 'vault/models/clients/activity';
|
|
import type {
|
|
ClientActivityNewClients,
|
|
ClientActivityMonthly,
|
|
ClientActivityResourceByKey,
|
|
} from 'vault/models/clients/activity';
|
|
import type ClientsVersionHistoryModel from 'vault/models/clients/version-history';
|
|
|
|
interface Args {
|
|
activity: ClientsActivityModel;
|
|
versionHistory: ClientsVersionHistoryModel[];
|
|
startTimestamp: number;
|
|
endTimestamp: number;
|
|
namespace: string;
|
|
mountPath: string;
|
|
}
|
|
|
|
export default class ClientsActivityComponent extends Component<Args> {
|
|
average = (
|
|
data:
|
|
| ClientActivityMonthly[]
|
|
| (ClientActivityResourceByKey | undefined)[]
|
|
| (ClientActivityNewClients | undefined)[]
|
|
| undefined,
|
|
key: string
|
|
) => {
|
|
return calculateAverage(data, key);
|
|
};
|
|
|
|
get startTimeISO() {
|
|
return fromUnixTime(this.args.startTimestamp).toISOString();
|
|
}
|
|
|
|
get endTimeISO() {
|
|
return fromUnixTime(this.args.endTimestamp).toISOString();
|
|
}
|
|
|
|
get byMonthActivityData() {
|
|
const { activity, namespace } = this.args;
|
|
return namespace ? this.filteredActivityByMonth : activity.byMonth;
|
|
}
|
|
|
|
get byMonthNewClients() {
|
|
return this.byMonthActivityData ? this.byMonthActivityData?.map((m) => m?.new_clients) : [];
|
|
}
|
|
|
|
get filteredActivityByMonth() {
|
|
const { namespace, mountPath, activity } = this.args;
|
|
if (!namespace && !mountPath) {
|
|
return activity.byMonth;
|
|
}
|
|
const namespaceData = activity.byMonth
|
|
.map((m) => m.namespaces_by_key[namespace as keyof typeof m.namespaces_by_key])
|
|
.filter((d) => d !== undefined);
|
|
|
|
if (!mountPath) {
|
|
return namespaceData.length === 0 ? undefined : namespaceData;
|
|
}
|
|
|
|
const mountData = mountPath
|
|
? namespaceData.map((namespace) => namespace?.mounts_by_key[mountPath]).filter((d) => d !== undefined)
|
|
: namespaceData;
|
|
|
|
return mountData.length === 0 ? undefined : mountData;
|
|
}
|
|
|
|
get filteredActivityByNamespace() {
|
|
const { namespace, activity } = this.args;
|
|
return activity.byNamespace.find((ns) => ns.label === namespace);
|
|
}
|
|
|
|
get filteredActivityByAuthMount() {
|
|
return this.filteredActivityByNamespace?.mounts?.find((mount) => mount.label === this.args.mountPath);
|
|
}
|
|
|
|
get filteredActivity() {
|
|
return this.args.mountPath ? this.filteredActivityByAuthMount : this.filteredActivityByNamespace;
|
|
}
|
|
|
|
get isCurrentMonth() {
|
|
const { activity } = this.args;
|
|
const current = parseAPITimestamp(activity.responseTimestamp) as Date;
|
|
const start = parseAPITimestamp(activity.startTime) as Date;
|
|
const end = parseAPITimestamp(activity.endTime) as Date;
|
|
return isSameMonth(start, current) && isSameMonth(end, current);
|
|
}
|
|
|
|
get isDateRange() {
|
|
const { activity } = this.args;
|
|
return !isSameMonth(
|
|
parseAPITimestamp(activity.startTime) as Date,
|
|
parseAPITimestamp(activity.endTime) as Date
|
|
);
|
|
}
|
|
|
|
// (object) top level TOTAL client counts for given date range
|
|
get totalUsageCounts() {
|
|
const { namespace, activity } = this.args;
|
|
return namespace ? this.filteredActivity : activity.total;
|
|
}
|
|
|
|
get upgradeDuringActivity() {
|
|
const { versionHistory, activity } = this.args;
|
|
if (versionHistory) {
|
|
// filter for upgrade data of noteworthy upgrades (1.9 and/or 1.10)
|
|
const upgradeVersionHistory = versionHistory.filter(
|
|
({ version }) => version.match('1.9') || version.match('1.10')
|
|
);
|
|
if (upgradeVersionHistory.length) {
|
|
const activityStart = parseAPITimestamp(activity.startTime) as Date;
|
|
const activityEnd = parseAPITimestamp(activity.endTime) as Date;
|
|
// filter and return all upgrades that happened within date range of queried activity
|
|
const upgradesWithinData = upgradeVersionHistory.filter(({ timestampInstalled }) => {
|
|
const upgradeDate = parseAPITimestamp(timestampInstalled) as Date;
|
|
return isAfter(upgradeDate, activityStart) && isBefore(upgradeDate, activityEnd);
|
|
});
|
|
return upgradesWithinData.length === 0 ? null : upgradesWithinData;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// (object) single month new client data with total counts + array of namespace breakdown
|
|
get newClientCounts() {
|
|
if (this.isDateRange || !this.byMonthActivityData) {
|
|
return null;
|
|
}
|
|
return this.byMonthActivityData[0]?.new_clients;
|
|
}
|
|
|
|
// total client data for horizontal bar chart in attribution component
|
|
get totalClientAttribution() {
|
|
const { namespace, activity } = this.args;
|
|
if (namespace) {
|
|
return this.filteredActivityByNamespace?.mounts || null;
|
|
} else {
|
|
return activity.byNamespace || null;
|
|
}
|
|
}
|
|
|
|
// new client data for horizontal bar chart
|
|
get newClientAttribution() {
|
|
// new client attribution only available in a single, historical month (not a date range or current month)
|
|
if (this.isDateRange || this.isCurrentMonth) return null;
|
|
|
|
if (this.args.namespace) {
|
|
return this.newClientCounts?.mounts || null;
|
|
} else {
|
|
return this.newClientCounts?.namespaces || null;
|
|
}
|
|
}
|
|
|
|
get hasAttributionData() {
|
|
const { mountPath, namespace } = this.args;
|
|
if (!mountPath) {
|
|
if (namespace) {
|
|
const mounts = this.filteredActivityByNamespace?.mounts?.map((mount) => ({
|
|
id: mount.label,
|
|
name: mount.label,
|
|
}));
|
|
return mounts && mounts.length > 0;
|
|
}
|
|
return !!this.totalClientAttribution && this.totalUsageCounts && this.totalUsageCounts.clients !== 0;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
get upgradeExplanation() {
|
|
if (this.upgradeDuringActivity) {
|
|
if (this.upgradeDuringActivity.length === 1) {
|
|
const version = this.upgradeDuringActivity[0]?.version || '';
|
|
if (version.match('1.9')) {
|
|
return ' How we count clients changed in 1.9, so keep that in mind when looking at the data.';
|
|
}
|
|
if (version.match('1.10')) {
|
|
return ' We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data.';
|
|
}
|
|
}
|
|
// return combined explanation if spans multiple upgrades
|
|
return ' How we count clients changed in 1.9 and we added monthly breakdowns and mount level attribution starting in 1.10. Keep this in mind when looking at the data.';
|
|
}
|
|
return null;
|
|
}
|
|
}
|