mirror of
https://github.com/hashicorp/vault.git
synced 2026-02-03 20:40:45 -05: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 1d0e85c82f.
* 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>
279 lines
8.2 KiB
JavaScript
279 lines
8.2 KiB
JavaScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import { parseAPITimestamp } from 'core/utils/date-formatters';
|
|
import { compareAsc, getUnixTime } from 'date-fns';
|
|
|
|
export const formatDateObject = (dateObj, isEnd) => {
|
|
if (dateObj) {
|
|
const { year, monthIdx } = dateObj;
|
|
// day=0 for Date.UTC() returns the last day of the month before
|
|
// increase monthIdx by one to get last day of queried month
|
|
const utc = isEnd ? Date.UTC(year, monthIdx + 1, 0) : Date.UTC(year, monthIdx, 1);
|
|
return getUnixTime(utc);
|
|
}
|
|
};
|
|
|
|
export const formatByMonths = (monthsArray) => {
|
|
// the monthsArray will always include a timestamp of the month and either new/total client data or counts = null
|
|
if (!Array.isArray(monthsArray)) return monthsArray;
|
|
|
|
const sortedPayload = sortMonthsByTimestamp(monthsArray);
|
|
return sortedPayload?.map((m) => {
|
|
const month = parseAPITimestamp(m.timestamp, 'M/yy');
|
|
const totalClientsByNamespace = formatByNamespace(m.namespaces);
|
|
const newClientsByNamespace = formatByNamespace(m.new_clients?.namespaces);
|
|
if (Object.keys(m).includes('counts')) {
|
|
const totalCounts = flattenDataset(m);
|
|
const newCounts = m.new_clients ? flattenDataset(m.new_clients) : {};
|
|
return {
|
|
month,
|
|
timestamp: m.timestamp,
|
|
...totalCounts,
|
|
namespaces: formatByNamespace(m.namespaces) || [],
|
|
namespaces_by_key: namespaceArrayToObject(
|
|
totalClientsByNamespace,
|
|
newClientsByNamespace,
|
|
month,
|
|
m.timestamp
|
|
),
|
|
new_clients: {
|
|
month,
|
|
timestamp: m.timestamp,
|
|
...newCounts,
|
|
namespaces: formatByNamespace(m.new_clients?.namespaces) || [],
|
|
},
|
|
};
|
|
}
|
|
});
|
|
};
|
|
|
|
export const formatByNamespace = (namespaceArray) => {
|
|
if (!Array.isArray(namespaceArray)) return namespaceArray;
|
|
return namespaceArray?.map((ns) => {
|
|
// 'namespace_path' is an empty string for root
|
|
if (ns['namespace_id'] === 'root') ns['namespace_path'] = 'root';
|
|
const label = ns['namespace_path'];
|
|
const flattenedNs = flattenDataset(ns);
|
|
// if no mounts, mounts will be an empty array
|
|
flattenedNs.mounts = [];
|
|
if (ns?.mounts && ns.mounts.length > 0) {
|
|
flattenedNs.mounts = ns.mounts.map((mount) => {
|
|
return {
|
|
label: mount['mount_path'],
|
|
...flattenDataset(mount),
|
|
};
|
|
});
|
|
}
|
|
return {
|
|
label,
|
|
...flattenedNs,
|
|
};
|
|
});
|
|
};
|
|
|
|
// In 1.10 'distinct_entities' changed to 'entity_clients' and
|
|
// 'non_entity_tokens' to 'non_entity_clients'
|
|
export const homogenizeClientNaming = (object) => {
|
|
// if new key names exist, only return those key/value pairs
|
|
if (Object.keys(object).includes('entity_clients')) {
|
|
const { clients, entity_clients, non_entity_clients, secret_syncs } = object;
|
|
return {
|
|
clients,
|
|
entity_clients,
|
|
non_entity_clients,
|
|
secret_syncs,
|
|
};
|
|
}
|
|
// if object only has outdated key names, update naming
|
|
if (Object.keys(object).includes('distinct_entities')) {
|
|
const { clients, distinct_entities, non_entity_tokens } = object;
|
|
return {
|
|
clients,
|
|
entity_clients: distinct_entities,
|
|
non_entity_clients: non_entity_tokens,
|
|
};
|
|
}
|
|
return object;
|
|
};
|
|
|
|
export const flattenDataset = (object) => {
|
|
if (object?.counts) {
|
|
const flattenedObject = {};
|
|
Object.keys(object['counts']).forEach((key) => (flattenedObject[key] = object['counts'][key]));
|
|
return homogenizeClientNaming(flattenedObject);
|
|
}
|
|
return object;
|
|
};
|
|
|
|
export const sortMonthsByTimestamp = (monthsArray) => {
|
|
const sortedPayload = [...monthsArray];
|
|
return sortedPayload.sort((a, b) =>
|
|
compareAsc(parseAPITimestamp(a.timestamp), parseAPITimestamp(b.timestamp))
|
|
);
|
|
};
|
|
|
|
export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByNamespace, month, timestamp) => {
|
|
if (!totalClientsByNamespace) return {}; // return if no data for that month
|
|
// all 'new_client' data resides within a separate key of each month (see data structure below)
|
|
// FIRST: iterate and nest respective 'new_clients' data within each namespace and mount object
|
|
// note: this is happening within the month object
|
|
const nestNewClientsWithinNamespace = totalClientsByNamespace?.map((ns) => {
|
|
const newNamespaceCounts = newClientsByNamespace?.find((n) => n.label === ns.label);
|
|
if (newNamespaceCounts) {
|
|
const { label, clients, entity_clients, non_entity_clients, secret_syncs } = newNamespaceCounts;
|
|
const newClientsByMount = [...newNamespaceCounts.mounts];
|
|
const nestNewClientsWithinMounts = ns.mounts?.map((mount) => {
|
|
const new_clients = newClientsByMount?.find((m) => m.label === mount.label) || {};
|
|
return {
|
|
...mount,
|
|
new_clients,
|
|
};
|
|
});
|
|
return {
|
|
...ns,
|
|
new_clients: {
|
|
label,
|
|
clients,
|
|
entity_clients,
|
|
non_entity_clients,
|
|
secret_syncs,
|
|
mounts: newClientsByMount,
|
|
},
|
|
mounts: [...nestNewClientsWithinMounts],
|
|
};
|
|
}
|
|
return {
|
|
...ns,
|
|
new_clients: {},
|
|
};
|
|
});
|
|
// SECOND: create a new object (namespace_by_key) in which each namespace label is a key
|
|
const namespaces_by_key = {};
|
|
nestNewClientsWithinNamespace?.forEach((namespaceObject) => {
|
|
// THIRD: make another object within the namespace where each mount label is a key
|
|
const mounts_by_key = {};
|
|
namespaceObject.mounts.forEach((mountObject) => {
|
|
mounts_by_key[mountObject.label] = {
|
|
month,
|
|
timestamp,
|
|
...mountObject,
|
|
new_clients: { month, ...mountObject.new_clients },
|
|
};
|
|
});
|
|
|
|
const { label, clients, entity_clients, non_entity_clients, secret_syncs, new_clients } = namespaceObject;
|
|
namespaces_by_key[label] = {
|
|
month,
|
|
timestamp,
|
|
clients,
|
|
entity_clients,
|
|
non_entity_clients,
|
|
secret_syncs,
|
|
new_clients: { month, ...new_clients },
|
|
mounts_by_key,
|
|
};
|
|
});
|
|
return namespaces_by_key;
|
|
/*
|
|
structure of object returned
|
|
namespace_by_key: {
|
|
"namespace_label": {
|
|
month: "3/22",
|
|
clients: 32,
|
|
entity_clients: 16,
|
|
non_entity_clients: 16,
|
|
new_clients: {
|
|
month: "3/22",
|
|
clients: 5,
|
|
entity_clients: 2,
|
|
non_entity_clients: 3,
|
|
mounts: [...array of this namespace's mounts and their new client counts],
|
|
},
|
|
mounts_by_key: {
|
|
"mount_label": {
|
|
month: "3/22",
|
|
clients: 3,
|
|
entity_clients: 2,
|
|
non_entity_clients: 1,
|
|
new_clients: {
|
|
month: "3/22",
|
|
clients: 5,
|
|
entity_clients: 2,
|
|
non_entity_clients: 3,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
*/
|
|
};
|
|
|
|
/*
|
|
API RESPONSE STRUCTURE:
|
|
data: {
|
|
** by_namespace organized in descending order of client count number **
|
|
by_namespace: [
|
|
{
|
|
namespace_id: '96OwG',
|
|
namespace_path: 'test-ns/',
|
|
counts: {},
|
|
mounts: [{ mount_path: 'path-1', counts: {} }],
|
|
},
|
|
],
|
|
** months organized in ascending order of timestamps, oldest to most recent
|
|
months: [
|
|
{
|
|
timestamp: '2022-03-01T00:00:00Z',
|
|
counts: {},
|
|
namespaces: [
|
|
{
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
counts: {},
|
|
mounts: [{ mount_path: 'auth/up2/', counts: {} }],
|
|
},
|
|
],
|
|
new_clients: {
|
|
counts: {},
|
|
namespaces: [
|
|
{
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
counts: {},
|
|
mounts: [{ mount_path: 'auth/up2/', counts: {} }],
|
|
},
|
|
],
|
|
},
|
|
},
|
|
{
|
|
timestamp: '2022-04-01T00:00:00Z',
|
|
counts: {},
|
|
namespaces: [
|
|
{
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
counts: {},
|
|
mounts: [{ mount_path: 'auth/up2/', counts: {} }],
|
|
},
|
|
],
|
|
new_clients: {
|
|
counts: {},
|
|
namespaces: [
|
|
{
|
|
namespace_id: 'root',
|
|
namespace_path: '',
|
|
counts: {},
|
|
mounts: [{ mount_path: 'auth/up2/', counts: {} }],
|
|
},
|
|
],
|
|
},
|
|
},
|
|
],
|
|
start_time: 'start timestamp string',
|
|
end_time: 'end timestamp string',
|
|
total: { clients: 300, non_entity_clients: 100, entity_clients: 400} ,
|
|
}
|
|
*/
|