{{yield}}
-
+
\ No newline at end of file
diff --git a/ui/app/templates/components/page-size-select.hbs b/ui/app/templates/components/page-size-select.hbs
index f61c33295b6c..3b2efb3c28b8 100644
--- a/ui/app/templates/components/page-size-select.hbs
+++ b/ui/app/templates/components/page-size-select.hbs
@@ -1,15 +1,16 @@
-
-
Per page
+
+
+ Per page
+
+ @onChange={{action (queue (action (mut this.userSettings.pageSize)) (action this.onChange))
+ }} as |option|
+ >
{{option}}
-
+
\ No newline at end of file
diff --git a/ui/app/templates/evaluations.hbs b/ui/app/templates/evaluations.hbs
new file mode 100644
index 000000000000..cd930aba258f
--- /dev/null
+++ b/ui/app/templates/evaluations.hbs
@@ -0,0 +1,3 @@
+
+ {{outlet}}
+
\ No newline at end of file
diff --git a/ui/app/templates/evaluations/index.hbs b/ui/app/templates/evaluations/index.hbs
new file mode 100644
index 000000000000..b7e952ee99f4
--- /dev/null
+++ b/ui/app/templates/evaluations/index.hbs
@@ -0,0 +1,138 @@
+{{page-title "Evaluations"}}
+
+
+ {{#if @model.length}}
+
+
+
+ Evaluation ID
+ |
+
+ Resource
+ |
+
+ Priority
+ |
+
+ Created
+ |
+
+ Triggered By
+ |
+
+ Status
+ |
+
+ Placement Failures
+ |
+
+
+
+ |
+ {{row.model.shortId}}
+ |
+
+ {{#if row.model.hasJob}}
+
+ {{row.model.plainJobId}}
+
+ {{else}}
+
+ {{row.model.shortNodeId}}
+
+ {{/if}}
+ |
+
+ {{row.model.priority}}
+ |
+
+ {{format-month-ts row.model.createTime}}
+ |
+
+ {{row.model.triggeredBy}}
+ |
+
+
+ |
+
+ {{#if (eq row.model.status "blocked")}}
+ N/A - In Progress
+ {{else if row.model.hasPlacementFailures}}
+ True
+ {{else}}
+ False
+ {{/if}}
+ |
+
+
+
+
+ {{else}}
+
+
+
+ No Matches
+
+
+ {{#if this.status}}
+
+ No evaluations match the status
+
+ {{this.status}}
+
+
+ {{else}}
+
+ There are no evaluations
+
+ {{/if}}
+
+
+
\ No newline at end of file
diff --git a/ui/mirage/config.js b/ui/mirage/config.js
index b95244b545e0..a95e068232ef 100644
--- a/ui/mirage/config.js
+++ b/ui/mirage/config.js
@@ -261,6 +261,7 @@ export default function () {
return this.serialize(evaluations.where({ jobId: params.id }));
});
+ this.get('/evaluations');
this.get('/evaluation/:id');
this.get('/deployment/allocations/:id', function (schema, { params }) {
diff --git a/ui/mirage/factories/evaluation.js b/ui/mirage/factories/evaluation.js
index 8a3666d1677a..1ea767717c77 100644
--- a/ui/mirage/factories/evaluation.js
+++ b/ui/mirage/factories/evaluation.js
@@ -31,9 +31,17 @@ const generateCountMap = (keysCount, list) => () => {
};
const generateNodesAvailable = generateCountMap(5, DATACENTERS);
-const generateClassFiltered = generateCountMap(3, provide(10, faker.hacker.abbreviation));
+const generateClassFiltered = generateCountMap(
+ 3,
+ provide(10, faker.hacker.abbreviation)
+);
const generateClassExhausted = generateClassFiltered;
-const generateDimensionExhausted = generateCountMap(1, ['cpu', 'mem', 'disk', 'iops']);
+const generateDimensionExhausted = generateCountMap(1, [
+ 'cpu',
+ 'mem',
+ 'disk',
+ 'iops',
+]);
const generateQuotaExhausted = generateDimensionExhausted;
const generateScores = generateCountMap(1, ['binpack', 'job-anti-affinity']);
const generateConstraintFiltered = generateCountMap(2, [
@@ -59,7 +67,9 @@ export default Factory.extend({
createIndex: () => faker.random.number({ min: 10, max: 2000 }),
createTime() {
- return faker.date.past(2 / 365, new Date(this.modifyTime / 1000000)) * 1000000;
+ return (
+ faker.date.past(2 / 365, new Date(this.modifyTime / 1000000)) * 1000000
+ );
},
waitUntil: null,
@@ -68,14 +78,22 @@ export default Factory.extend({
status: 'blocked',
afterCreate(evaluation, server) {
assignJob(evaluation, server);
- const taskGroups = server.db.taskGroups.where({ jobId: evaluation.jobId });
+ const taskGroups = server.db.taskGroups.where({
+ jobId: evaluation.jobId,
+ });
const taskGroupNames = taskGroups.mapBy('name');
- const failedTaskGroupsCount = faker.random.number({ min: 1, max: taskGroupNames.length });
+ const failedTaskGroupsCount = faker.random.number({
+ min: 1,
+ max: taskGroupNames.length,
+ });
const failedTaskGroupNames = [];
for (let i = 0; i < failedTaskGroupsCount; i++) {
failedTaskGroupNames.push(
- ...taskGroupNames.splice(faker.random.number(taskGroupNames.length - 1), 1)
+ ...taskGroupNames.splice(
+ faker.random.number(taskGroupNames.length - 1),
+ 1
+ )
);
}
@@ -91,7 +109,9 @@ export default Factory.extend({
}),
afterCreate(evaluation, server) {
- assignJob(evaluation, server);
+ if (!evaluation.nodeId) {
+ assignJob(evaluation, server);
+ }
},
});
@@ -101,7 +121,9 @@ function assignJob(evaluation, server) {
server.db.jobs.length
);
- const job = evaluation.jobId ? server.db.jobs.find(evaluation.jobId) : pickOne(server.db.jobs);
+ const job = evaluation.jobId
+ ? server.db.jobs.find(evaluation.jobId)
+ : pickOne(server.db.jobs);
evaluation.update({
jobId: job.id,
});
@@ -113,12 +135,18 @@ export function generateTaskGroupFailures() {
NodesEvaluated: faker.random.number({ min: 1, max: 100 }),
NodesExhausted: faker.random.number({ min: 1, max: 100 }),
- NodesAvailable: faker.random.number(10) >= 7 ? generateNodesAvailable() : null,
- ClassFiltered: faker.random.number(10) >= 7 ? generateClassFiltered() : null,
- ConstraintFiltered: faker.random.number(10) >= 7 ? generateConstraintFiltered() : null,
- ClassExhausted: faker.random.number(10) >= 7 ? generateClassExhausted() : null,
- DimensionExhausted: faker.random.number(10) >= 7 ? generateDimensionExhausted() : null,
- QuotaExhausted: faker.random.number(10) >= 7 ? generateQuotaExhausted() : null,
+ NodesAvailable:
+ faker.random.number(10) >= 7 ? generateNodesAvailable() : null,
+ ClassFiltered:
+ faker.random.number(10) >= 7 ? generateClassFiltered() : null,
+ ConstraintFiltered:
+ faker.random.number(10) >= 7 ? generateConstraintFiltered() : null,
+ ClassExhausted:
+ faker.random.number(10) >= 7 ? generateClassExhausted() : null,
+ DimensionExhausted:
+ faker.random.number(10) >= 7 ? generateDimensionExhausted() : null,
+ QuotaExhausted:
+ faker.random.number(10) >= 7 ? generateQuotaExhausted() : null,
Scores: faker.random.number(10) >= 7 ? generateScores() : null,
};
}
diff --git a/ui/package.json b/ui/package.json
index 8f5a619ba917..e7f5845be2bb 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -20,7 +20,9 @@
"build-storybook": "STORYBOOK=true ember build && build-storybook -s dist",
"storybook": "STORYBOOK=true start-storybook -p 6006 -s dist",
"test": "npm-run-all lint:* test:*",
- "test:ember": "ember test"
+ "test:ember": "ember test",
+ "local:qunitdom": "ember test --server --query=dockcontainer",
+ "local:exam": "ember exam --server --load-balance --parallel=4"
},
"husky": {
"hooks": {
@@ -83,6 +85,7 @@
"ember-data": "~3.24",
"ember-data-model-fragments": "5.0.0-beta.2",
"ember-decorators": "^6.1.1",
+ "ember-exam": "6.1.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.0.2",
"ember-inflector": "^3.0.0",
diff --git a/ui/testem.js b/ui/testem.js
index f0d81dfdfa9d..0d47b107fe77 100644
--- a/ui/testem.js
+++ b/ui/testem.js
@@ -11,6 +11,7 @@ const config = {
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_start_timeout: 120,
+ parallel: -1,
browser_args: {
// New format in testem/master, but not in a release yet
// Chrome: {
diff --git a/ui/tests/acceptance/evaluations-test.js b/ui/tests/acceptance/evaluations-test.js
new file mode 100644
index 000000000000..bc444042149d
--- /dev/null
+++ b/ui/tests/acceptance/evaluations-test.js
@@ -0,0 +1,446 @@
+import { click, currentRouteName, visit } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { Response } from 'ember-cli-mirage';
+import a11yAudit from 'nomad-ui/tests/helpers/a11y-audit';
+import {
+ selectChoose,
+ clickTrigger,
+} from 'ember-power-select/test-support/helpers';
+
+const getStandardRes = () => [
+ {
+ CreateIndex: 1249,
+ CreateTime: 1640181894162724000,
+ DeploymentID: '12efbb28-840e-7794-b215-a7b112e40a4f',
+ ID: '5fb1b8cd-00f8-fff8-de0c-197dc37f5053',
+ JobID: 'cores-example',
+ JobModifyIndex: 694,
+ ModifyIndex: 1251,
+ ModifyTime: 1640181894167194000,
+ Namespace: 'ted-lasso',
+ Priority: 50,
+ QueuedAllocations: {
+ lb: 0,
+ webapp: 0,
+ },
+ SnapshotIndex: 1249,
+ Status: 'complete',
+ TriggeredBy: 'job-register',
+ Type: 'service',
+ },
+ {
+ CreateIndex: 1304,
+ CreateTime: 1640183201719510000,
+ DeploymentID: '878435bf-7265-62b1-7902-d45c44b23b79',
+ ID: '66cb98a6-7740-d5ef-37e4-fa0f8b1de44b',
+ JobID: 'cores-example',
+ JobModifyIndex: 1304,
+ ModifyIndex: 1306,
+ ModifyTime: 1640183201721418000,
+ Namespace: 'default',
+ Priority: 50,
+ QueuedAllocations: {
+ webapp: 0,
+ lb: 0,
+ },
+ SnapshotIndex: 1304,
+ Status: 'complete',
+ TriggeredBy: 'job-register',
+ Type: 'service',
+ },
+ {
+ CreateIndex: 1267,
+ CreateTime: 1640182198255685000,
+ DeploymentID: '12efbb28-840e-7794-b215-a7b112e40a4f',
+ ID: '78009518-574d-eee6-919a-e83879175dd3',
+ JobID: 'cores-example',
+ JobModifyIndex: 1250,
+ ModifyIndex: 1274,
+ ModifyTime: 1640182228112823000,
+ Namespace: 'ted-lasso',
+ PreviousEval: '84f1082f-3e6e-034d-6df4-c6a321e7bd63',
+ Priority: 50,
+ QueuedAllocations: {
+ lb: 0,
+ },
+ SnapshotIndex: 1272,
+ Status: 'complete',
+ TriggeredBy: 'alloc-failure',
+ Type: 'service',
+ WaitUntil: '2021-12-22T14:10:28.108136Z',
+ },
+ {
+ CreateIndex: 1322,
+ CreateTime: 1640183505760099000,
+ DeploymentID: '878435bf-7265-62b1-7902-d45c44b23b79',
+ ID: 'c184f72b-68a3-5180-afd6-af01860ad371',
+ JobID: 'cores-example',
+ JobModifyIndex: 1305,
+ ModifyIndex: 1329,
+ ModifyTime: 1640183535540881000,
+ Namespace: 'default',
+ PreviousEval: '9a917a93-7bc3-6991-ffc9-15919a38f04b',
+ Priority: 50,
+ QueuedAllocations: {
+ lb: 0,
+ },
+ SnapshotIndex: 1326,
+ Status: 'complete',
+ TriggeredBy: 'alloc-failure',
+ Type: 'service',
+ WaitUntil: '2021-12-22T14:32:15.539556Z',
+ },
+];
+
+module('Acceptance | evaluations list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ test('it passes an accessibility audit', async function (assert) {
+ assert.expect(2);
+
+ await visit('/evaluations');
+
+ assert.equal(
+ currentRouteName(),
+ 'evaluations.index',
+ 'The default route in evaluations is evaluations index'
+ );
+
+ await a11yAudit(assert);
+ });
+
+ test('it renders an empty message if there are no evaluations rendered', async function (assert) {
+ await visit('/evaluations');
+
+ assert
+ .dom('[data-test-empty-evaluations-list]')
+ .exists('We display empty table message.');
+ assert
+ .dom('[data-test-no-eval]')
+ .exists('We display a message saying there are no evaluations.');
+ });
+
+ test('it renders a list of evaluations', async function (assert) {
+ assert.expect(3);
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: '',
+ },
+ 'Forwards the correct query parameters on default query when route initially loads'
+ );
+ return getStandardRes();
+ });
+
+ await visit('/evaluations');
+
+ assert
+ .dom('[data-test-eval-table]')
+ .exists('Evaluations table should render');
+ assert
+ .dom('[data-test-evaluation]')
+ .exists({ count: 4 }, 'Should render the correct number of evaluations');
+ });
+
+ test('it should enable filtering by evaluation status', async function (assert) {
+ assert.expect(2);
+
+ server.get('/evaluations', getStandardRes);
+
+ await visit('/evaluations');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: 'pending',
+ next_token: '',
+ },
+ 'It makes another server request using the options selected by the user'
+ );
+ return [];
+ });
+
+ await clickTrigger('[data-test-evaluation-status-facet]');
+ await selectChoose('[data-test-evaluation-status-facet]', 'Pending');
+
+ assert
+ .dom('[data-test-no-eval-match]')
+ .exists('Renders a message saying no evaluations match filter status');
+ });
+
+ module('page size', function (hooks) {
+ hooks.afterEach(function () {
+ // PageSizeSelect and the Evaluations Controller are both using localStorage directly
+ // Will come back and invert the dependency
+ window.localStorage.clear();
+ });
+
+ test('it is possible to change page size', async function (assert) {
+ assert.expect(1);
+
+ server.get('/evaluations', getStandardRes);
+
+ await visit('/evaluations');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '50',
+ status: '',
+ next_token: '',
+ },
+ 'It makes a request with the per_page set by the user'
+ );
+ return getStandardRes();
+ });
+
+ await clickTrigger('[data-test-per-page]');
+ await selectChoose('[data-test-per-page]', 50);
+ });
+ });
+
+ module('pagination', function () {
+ test('it should enable pagination by using next tokens', async function (assert) {
+ assert.expect(7);
+
+ server.get('/evaluations', function () {
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-1' },
+ getStandardRes()
+ );
+ });
+
+ await visit('/evaluations');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: 'next-token-1',
+ },
+ 'It makes another server request using the options selected by the user'
+ );
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-2' },
+ getStandardRes()
+ );
+ });
+
+ assert
+ .dom('[data-test-eval-pagination-next]')
+ .isEnabled(
+ 'If there is a next-token in the API response the next button should be enabled.'
+ );
+ await click('[data-test-eval-pagination-next]');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: 'next-token-2',
+ },
+ 'It makes another server request using the options selected by the user'
+ );
+ return getStandardRes();
+ });
+ await click('[data-test-eval-pagination-next]');
+
+ assert
+ .dom('[data-test-eval-pagination-next]')
+ .isDisabled('If there is no next-token, the next button is disabled.');
+
+ assert
+ .dom('[data-test-eval-pagination-prev]')
+ .isEnabled(
+ 'After we transition to the next page, the previous page button is enabled.'
+ );
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: 'next-token-1',
+ },
+ 'It makes a request using the stored old token.'
+ );
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-2' },
+ getStandardRes()
+ );
+ });
+
+ await click('[data-test-eval-pagination-prev]');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: '',
+ },
+ 'When there are no more stored previous tokens, we will request with no next-token.'
+ );
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-1' },
+ getStandardRes()
+ );
+ });
+
+ await click('[data-test-eval-pagination-prev]');
+ });
+
+ test('it should clear all query parameters on refresh', async function (assert) {
+ assert.expect(1);
+
+ server.get('/evaluations', function () {
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-1' },
+ getStandardRes()
+ );
+ });
+
+ await visit('/evaluations');
+
+ server.get('/evaluations', function () {
+ return getStandardRes();
+ });
+
+ await click('[data-test-eval-pagination-next]');
+
+ await clickTrigger('[data-test-evaluation-status-facet]');
+ await selectChoose('[data-test-evaluation-status-facet]', 'Pending');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: '',
+ next_token: '',
+ },
+ 'It clears all query parameters when making a refresh'
+ );
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-1' },
+ getStandardRes()
+ );
+ });
+
+ await click('[data-test-eval-refresh]');
+ });
+
+ test('it should reset pagination when filters are applied', async function (assert) {
+ assert.expect(1);
+
+ server.get('/evaluations', function () {
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-1' },
+ getStandardRes()
+ );
+ });
+
+ await visit('/evaluations');
+
+ server.get('/evaluations', function () {
+ return new Response(
+ 200,
+ { 'x-nomad-nexttoken': 'next-token-2' },
+ getStandardRes()
+ );
+ });
+
+ await click('[data-test-eval-pagination-next]');
+
+ server.get('/evaluations', getStandardRes);
+ await click('[data-test-eval-pagination-next]');
+
+ server.get('/evaluations', function (_server, fakeRequest) {
+ assert.deepEqual(
+ fakeRequest.queryParams,
+ {
+ namespace: '*',
+ per_page: '25',
+ status: 'pending',
+ next_token: '',
+ },
+ 'It clears all next token when filtered request is made'
+ );
+ return getStandardRes();
+ });
+ await clickTrigger('[data-test-evaluation-status-facet]');
+ await selectChoose('[data-test-evaluation-status-facet]', 'Pending');
+ });
+ });
+
+ module('resource linking', function () {
+ test('it should generate a link to the job resource', async function (assert) {
+ server.create('node');
+ const job = server.create('job', { shallow: true });
+ server.create('evaluation', { jobId: job.id });
+ await visit('/evaluations');
+
+ assert
+ .dom('[data-test-evaluation-resource]')
+ .hasText(
+ job.name,
+ 'It conditionally renders the correct resource name'
+ );
+ await click('[data-test-evaluation-resource]');
+ assert
+ .dom('[data-test-job-name]')
+ .includesText(job.name, 'We navigate to the correct job page.');
+ });
+
+ test('it should generate a link to the node resource', async function (assert) {
+ const node = server.create('node');
+ server.create('evaluation', { nodeId: node.id });
+ await visit('/evaluations');
+
+ const shortNodeId = node.id.split('-')[0];
+ assert
+ .dom('[data-test-evaluation-resource]')
+ .hasText(
+ shortNodeId,
+ 'It conditionally renders the correct resource name'
+ );
+
+ await click('[data-test-evaluation-resource]');
+
+ assert
+ .dom('[data-test-title]')
+ .includesText(node.name, 'We navigate to the correct client page.');
+ });
+ });
+});
diff --git a/ui/tests/test-helper.js b/ui/tests/test-helper.js
index b246c315936a..a8efa1f76517 100644
--- a/ui/tests/test-helper.js
+++ b/ui/tests/test-helper.js
@@ -2,7 +2,7 @@ import 'core-js';
import Application from 'nomad-ui/app';
import config from 'nomad-ui/config/environment';
import { setApplication } from '@ember/test-helpers';
-import { start } from 'ember-qunit';
+import start from 'ember-exam/test-support/start';
import { useNativeEvents } from 'ember-cli-page-object/extend';
useNativeEvents();
diff --git a/ui/tests/unit/serializers/evaluation-test.js b/ui/tests/unit/serializers/evaluation-test.js
index 6e17427eb61e..d8f7a75614b6 100644
--- a/ui/tests/unit/serializers/evaluation-test.js
+++ b/ui/tests/unit/serializers/evaluation-test.js
@@ -40,6 +40,8 @@ module('Unit | Serializer | Evaluation', function (hooks) {
nodesAvailable: 10,
},
],
+ namespace: 'test-namespace',
+ plainJobId: 'some-job-id',
},
relationships: {
job: {
@@ -89,6 +91,8 @@ module('Unit | Serializer | Evaluation', function (hooks) {
nodesAvailable: 25,
},
],
+ namespace: 'test-namespace',
+ plainJobId: 'some-job-id',
},
relationships: {
job: {
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 576b50462cde..739b5ba96726 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2493,6 +2493,19 @@
resolve "^1.8.1"
semver "^7.3.2"
+"@embroider/shared-internals@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.0.0.tgz#b081708ac79e4582f17ba0f3e3796e6612a8976c"
+ integrity sha512-Vx3dmejJxI5MG/qC7or3EUZY0AZBSBNOAR50PYotX3LxUSb4lAm5wISPnFbwEY4bbo2VhL/6XtWjMv8ZMcaP+g==
+ dependencies:
+ babel-import-util "^1.1.0"
+ ember-rfc176-data "^0.3.17"
+ fs-extra "^9.1.0"
+ lodash "^4.17.21"
+ resolve-package-path "^4.0.1"
+ semver "^7.3.5"
+ typescript-memoize "^1.0.1"
+
"@embroider/util@^0.36.0":
version "0.36.0"
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.36.0.tgz#b2ffb2b06ac491f157a771392191ce91ef2216a6"
@@ -4868,6 +4881,11 @@ babel-helpers@^6.24.1:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
+babel-import-util@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+ integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
babel-loader@^8.0.6:
version "8.2.3"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
@@ -7007,6 +7025,15 @@ cli-table3@0.6.0:
optionalDependencies:
colors "^1.1.2"
+cli-table3@^0.6.0:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
+ integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
+ dependencies:
+ string-width "^4.2.0"
+ optionalDependencies:
+ colors "1.4.0"
+
cli-table@^0.3.1:
version "0.3.4"
resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.4.tgz#5b37fd723751f1a6e9e70d55953a75e16eab958e"
@@ -7153,7 +7180,7 @@ colorette@^2.0.16:
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
-colors@^1.1.2, colors@^1.4.0:
+colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -7911,6 +7938,13 @@ debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
dependencies:
ms "2.1.2"
+debug@^4.2.0:
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+ integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+ dependencies:
+ ms "2.1.2"
+
debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
version "4.3.2"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
@@ -8420,6 +8454,41 @@ ember-auto-import@^1.10.0, ember-auto-import@^1.2.19, ember-auto-import@^1.6.0:
walk-sync "^0.3.3"
webpack "^4.43.0"
+ember-auto-import@^1.10.1:
+ version "1.12.1"
+ resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.1.tgz#09967bd35cd56ac45f413c48deabf7cfb3a785f6"
+ integrity sha512-Jm0vWKNAy/wYMrdSQIrG8sRsvarIRHZ2sS/CGhMdMqVKJR48AhGU7NgPJ5SIlO/+seL2VSO+dtv7aEOEIaT6BA==
+ dependencies:
+ "@babel/core" "^7.1.6"
+ "@babel/preset-env" "^7.10.2"
+ "@babel/traverse" "^7.1.6"
+ "@babel/types" "^7.1.6"
+ "@embroider/shared-internals" "^1.0.0"
+ babel-core "^6.26.3"
+ babel-loader "^8.0.6"
+ babel-plugin-syntax-dynamic-import "^6.18.0"
+ babylon "^6.18.0"
+ broccoli-debug "^0.6.4"
+ broccoli-node-api "^1.7.0"
+ broccoli-plugin "^4.0.0"
+ broccoli-source "^3.0.0"
+ debug "^3.1.0"
+ ember-cli-babel "^7.0.0"
+ enhanced-resolve "^4.0.0"
+ fs-extra "^6.0.1"
+ fs-tree-diff "^2.0.0"
+ handlebars "^4.3.1"
+ js-string-escape "^1.0.1"
+ lodash "^4.17.19"
+ mkdirp "^0.5.1"
+ resolve-package-path "^3.1.0"
+ rimraf "^2.6.2"
+ semver "^7.3.4"
+ symlink-or-copy "^1.2.0"
+ typescript-memoize "^1.0.0-alpha.3"
+ walk-sync "^0.3.3"
+ webpack "^4.43.0"
+
ember-basic-dropdown@^3.0.16:
version "3.0.16"
resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.0.16.tgz#287fcde57b5a37405d89cc65e0a4ad9a2e8e1b0b"
@@ -9244,6 +9313,26 @@ ember-element-helper@^0.3.2:
ember-cli-htmlbars "^5.1.0"
ember-compatibility-helpers "^1.2.1"
+ember-exam@6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/ember-exam/-/ember-exam-6.1.0.tgz#1ea2c0ece27ac8ad6a80d959b1c207611b7dfdd7"
+ integrity sha512-H9tg7eUgqkjAsr1/15UzxGyZobGLgsyTi56Ng0ySnkYGCRfvVpwtVc3xgcNOFnUaa9RExUFpxC0adjW3K87Uxw==
+ dependencies:
+ "@embroider/macros" "^0.36.0"
+ chalk "^4.1.0"
+ cli-table3 "^0.6.0"
+ debug "^4.2.0"
+ ember-auto-import "^1.10.1"
+ ember-cli-babel "^7.21.0"
+ ember-cli-version-checker "^5.1.2"
+ execa "^4.0.3"
+ fs-extra "^9.0.1"
+ js-yaml "^3.14.0"
+ npmlog "^4.1.2"
+ rimraf "^3.0.2"
+ semver "^7.3.2"
+ silent-error "^1.1.1"
+
ember-export-application-global@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
@@ -10242,7 +10331,7 @@ execa@^3.0.0:
signal-exit "^3.0.2"
strip-final-newline "^2.0.0"
-execa@^4.0.0:
+execa@^4.0.0, execa@^4.0.3:
version "4.1.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -10952,7 +11041,7 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -12771,7 +12860,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -16324,6 +16413,13 @@ resolve-package-path@^3.1.0:
path-root "^0.1.1"
resolve "^1.17.0"
+resolve-package-path@^4.0.1:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+ integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+ dependencies:
+ path-root "^0.1.1"
+
resolve-path@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -18197,6 +18293,11 @@ typescript-memoize@^1.0.0-alpha.3:
resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0-alpha.4.tgz#fd97ab63807c3392af5d0ac5f4754254a4fcd634"
integrity sha512-woA2UUWSvx8ugkEjPN8DMuNjukBp8NQeLmz+LRXbEsQIvhLR8LSlD+8Qxdk7NmgE8xeJabJdU8zSrO4ozijGjg==
+typescript-memoize@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+ integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
+
uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
diff --git a/version/version.go b/version/version.go
index 4036caaaf5c7..5ed24e249e91 100644
--- a/version/version.go
+++ b/version/version.go
@@ -11,7 +11,7 @@ var (
GitDescribe string
// The main version number that is being run at the moment.
- Version = "1.2.5"
+ Version = "1.2.6"
// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
diff --git a/website/content/docs/configuration/client.mdx b/website/content/docs/configuration/client.mdx
index 22e9c2261447..d536c48e648c 100644
--- a/website/content/docs/configuration/client.mdx
+++ b/website/content/docs/configuration/client.mdx
@@ -336,6 +336,8 @@ see the [drivers documentation](/docs/drivers).
- `cpu` `(int: 0)` - Specifies the amount of CPU to reserve, in MHz.
+- `cores` `(int: 0)` - Specifies the number of CPU cores to reserve.
+
- `memory` `(int: 0)` - Specifies the amount of memory to reserve, in MB.
- `disk` `(int: 0)` - Specifies the amount of disk to reserve, in MB.
diff --git a/website/data/version.js b/website/data/version.js
index b8f734d0a196..5c1966f528c5 100644
--- a/website/data/version.js
+++ b/website/data/version.js
@@ -1 +1 @@
-export default '1.2.4'
+export default '1.2.5'
diff --git a/website/lib/consent-manager-services/index.ts b/website/lib/consent-manager-services/index.ts
new file mode 100644
index 000000000000..3a1a65171d08
--- /dev/null
+++ b/website/lib/consent-manager-services/index.ts
@@ -0,0 +1,15 @@
+import { ConsentManagerService } from '@hashicorp/react-consent-manager/types'
+
+const localConsentManagerServices: ConsentManagerService[] = [
+ {
+ name: 'Demandbase Tag',
+ description:
+ 'The Demandbase tag is a tracking service to identify website visitors and measure interest on our website.',
+ category: 'Analytics',
+ url: 'https://tag.demandbase.com/960ab0a0f20fb102.min.js',
+ async: true,
+ },
+]
+
+export default localConsentManagerServices
+
diff --git a/website/pages/_app.js b/website/pages/_app.js
index fc7707aac333..431a48ddd6c9 100644
--- a/website/pages/_app.js
+++ b/website/pages/_app.js
@@ -6,6 +6,7 @@ import Head from 'next/head'
import NProgress from '@hashicorp/platform-util/nprogress'
import { ErrorBoundary } from '@hashicorp/platform-runtime-error-monitoring'
import createConsentManager from '@hashicorp/react-consent-manager/loader'
+import localConsentManagerServices from 'lib/consent-manager-services'
import useFathomAnalytics from '@hashicorp/platform-analytics'
import useAnchorLinkAnalytics from '@hashicorp/platform-util/anchor-link-analytics'
import HashiStackMenu from '@hashicorp/react-hashi-stack-menu'
@@ -19,6 +20,7 @@ import alertBannerData, { ALERT_BANNER_ACTIVE } from 'data/alert-banner'
NProgress({ Router })
const { ConsentManager, openConsentManager } = createConsentManager({
preset: 'oss',
+ otherServices: [...localConsentManagerServices],
})
export default function App({ Component, pageProps }) {