Skip to content

feat: add v10dev with default-aggregation and per-metric aggregation control #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k-rister merged 5 commits into from
Jul 30, 2026
Merged

feat: add v10dev with default-aggregation and per-metric aggregation control #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
017ba59
feat: add v10dev and default-aggregation support
k-rister Jul 30, 2026
9aefc47
refactor: consolidate version validation into cdm.js
k-rister Jul 30, 2026
34539bb
feat: add --aggregation override to get-metric queries
k-rister Jul 30, 2026
aeab274
fix: address review feedback — stale callsite and dead code
k-rister Jul 30, 2026
94dcb00
fix: address atheurer review feedback
k-rister Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8dev
v10dev
4 changes: 3 additions & 1 deletion queries/cdmq/add-run-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ module.exports = async ({ instance, filePath, docTypes, mode }) => {
// "run":{"run-uuid":"c0e04edb-ddbc-4081-8bbc-9b9e84e6538d"}}
if (Object.keys(action).includes('index') && Object.keys(action['index']).includes('_index')) {
const indexName = action['index']['_index'];
const regExp = /^cdm-*(v7dev|v8dev|v9dev)-([^@]+)(@\d\d\d\d\.\d\d)*$/;
const regExp = new RegExp(
'^cdm-*(' + cdm.supportedCdmVersions.join('|') + ')-([^@]+)(@\\d\\d\\d\\d\\.\\d\\d)*$'
);
const matches = regExp.exec(indexName);
if (matches) {
const cdmVer = matches[1];
Expand Down
6 changes: 3 additions & 3 deletions queries/cdmq/add-run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ function save_ver(ver) {
console.log('You must specify a --host before a --ver');
process.exit(1);
}
if (/^v[789]dev$/.exec(ver)) {
if (cdm.isValidCdmVersion(ver)) {
instances[instances.length - 1]['ver'] = ver;
} else {
console.log('The version must be v7dev, v8dev, or v9dev, not: ' + ver);
console.log('The version must be one of: ' + cdm.supportedCdmVersions.join(', ') + ', not: ' + ver);
process.exit(1);
}
}
Expand Down Expand Up @@ -119,7 +119,7 @@ async function main() {
.option('--dir <a directory with ndjson files to index>')
.option('--host <host[:port]>', 'The host and optional port of the OpenSearch instance', save_host)
.option('--userpass <user:pass>', 'The user and password for the most recent --host', save_userpass)
.option('--ver <v7dev|v8dev|v9dev>', 'The Common Data Model version to use for the most recent --host', save_ver)
.option(cdm.cdmVersionOptionDesc(), 'The Common Data Model version to use for the most recent --host', save_ver)
.parse(process.argv);

// If the user does not specify any hosts, assume localhost:9200 is used
Expand Down
Loading
Loading