{{#if (has-block "content")}}{{yield to="content"}}{{else}}{{value}}{{/if}}{{item.DestinationName}}
`s.
+
+```hbs preview-template
+{
+ "Code": true
+}
+```
+
+```css
+pre code {
+ @extend %block-code;
+}
+```
diff --git a/ui/packages/consul-ui/app/components/inline-code/layout.scss b/ui/packages/consul-ui/app/components/inline-code/layout.scss
index e23fbfe00d..499d70d31d 100644
--- a/ui/packages/consul-ui/app/components/inline-code/layout.scss
+++ b/ui/packages/consul-ui/app/components/inline-code/layout.scss
@@ -2,3 +2,7 @@
display: inline-block;
padding: 0 4px;
}
+%block-code {
+ display: block;
+ padding: 0 8px;
+}
diff --git a/ui/packages/consul-ui/app/components/inline-code/skin.scss b/ui/packages/consul-ui/app/components/inline-code/skin.scss
index 133d1ede38..3fb061925a 100644
--- a/ui/packages/consul-ui/app/components/inline-code/skin.scss
+++ b/ui/packages/consul-ui/app/components/inline-code/skin.scss
@@ -1,3 +1,4 @@
+%block-code,
%inline-code {
border: 1px solid;
color: rgb(var(--tone-brand-600));
diff --git a/ui/packages/consul-ui/app/components/policy-form/index.hbs b/ui/packages/consul-ui/app/components/policy-form/index.hbs
index 61e2fa9081..da1f054798 100644
--- a/ui/packages/consul-ui/app/components/policy-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/policy-form/index.hbs
@@ -47,12 +47,11 @@
<:label>
Rules (HCL Format)
- <:content>
-
Rules (HCL Format)
- <:content>
-
{{else}}
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.scss b/ui/packages/consul-ui/app/components/popover-select/index.scss
index 71de6fd102..235fc643d4 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.scss
+++ b/ui/packages/consul-ui/app/components/popover-select/index.scss
@@ -21,6 +21,8 @@
margin-right: 10px;
}
+/* TODO: Consider moving these to their specific search bard componets or */
+/* even their own search bar sub menu components */
%popover-select .value-passing button::before {
@extend %with-check-circle-fill-mask, %as-pseudo;
color: rgb(var(--tone-green-500));
@@ -37,12 +39,16 @@
@extend %with-minus-square-fill-mask, %as-pseudo;
color: rgb(var(--tone-gray-400));
}
-%popover-select.type-source li button {
+%popover-select.type-source li:not(.partition) button {
text-transform: capitalize;
}
%popover-select.type-source li.aws button {
text-transform: uppercase;
}
+%popover-select.type-source li.partition button::before {
+ @extend %with-user-team-mask, %as-pseudo;
+ color: rgb(var(--tone-gray-500));
+}
%popover-select .aws button::before {
@extend %with-logo-aws-color-icon, %as-pseudo;
}
@@ -68,3 +74,4 @@
%popover-select .terraform button::before {
@extend %with-logo-terraform-color-icon, %as-pseudo;
}
+/**/
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.scss b/ui/packages/consul-ui/app/components/tabular-collection/index.scss
index 300533879e..c46301cc58 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.scss
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.scss
@@ -5,7 +5,7 @@ table.dom-recycling {
%dom-recycling-table tbody {
/* tbodys are all absolute so,*/
/* make room for the header */
- top: 29px !important;
+ top: 33px !important;
/* Make room for the header, plus 20px for a margin on the bottom */
width: 100%;
}
diff --git a/ui/packages/consul-ui/app/filter/predicates/service.js b/ui/packages/consul-ui/app/filter/predicates/service.js
index f9a7d4a1fc..5ca36496a5 100644
--- a/ui/packages/consul-ui/app/filter/predicates/service.js
+++ b/ui/packages/consul-ui/app/filter/predicates/service.js
@@ -20,6 +20,9 @@ export default {
'not-registered': (item, value) => item.InstanceCount === 0,
},
source: (item, values) => {
- return setHelpers.intersectionSize(values, new Set(item.ExternalSources || [])) !== 0;
+ return (
+ setHelpers.intersectionSize(values, new Set(item.ExternalSources || [])) !== 0 ||
+ values.includes(item.Partition)
+ );
},
};
diff --git a/ui/packages/consul-ui/app/models/service.js b/ui/packages/consul-ui/app/models/service.js
index 1e470ab5cb..31f0e2fc0e 100644
--- a/ui/packages/consul-ui/app/models/service.js
+++ b/ui/packages/consul-ui/app/models/service.js
@@ -15,11 +15,17 @@ export const Collection = class Collection {
}
get ExternalSources() {
- const sources = this.items.reduce(function(prev, item) {
+ const items = this.items.reduce(function(prev, item) {
return prev.concat(item.ExternalSources || []);
}, []);
// unique, non-empty values, alpha sort
- return [...new Set(sources)].filter(Boolean).sort();
+ return [...new Set(items)].filter(Boolean).sort();
+ }
+ // TODO: Think about when this/collections is worthwhile using and explain
+ // when and when not somewhere in the docs
+ get Partitions() {
+ // unique, non-empty values, alpha sort
+ return [...new Set(this.items.map(item => item.Partition))].sort();
}
};
export default class Service extends Model {
diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss
index a9b041af8b..197e909631 100644
--- a/ui/packages/consul-ui/app/styles/components.scss
+++ b/ui/packages/consul-ui/app/styles/components.scss
@@ -75,6 +75,7 @@
@import 'consul-ui/components/consul/loader';
@import 'consul-ui/components/consul/tomography/graph';
@import 'consul-ui/components/consul/discovery-chain';
+@import 'consul-ui/components/consul/bucket/list';
@import 'consul-ui/components/consul/upstream/list';
@import 'consul-ui/components/consul/upstream-instance/list';
@import 'consul-ui/components/consul/health-check/list';
diff --git a/ui/packages/consul-ui/app/styles/debug.scss b/ui/packages/consul-ui/app/styles/debug.scss
index 878aac643b..5ca08667b7 100644
--- a/ui/packages/consul-ui/app/styles/debug.scss
+++ b/ui/packages/consul-ui/app/styles/debug.scss
@@ -31,24 +31,24 @@
@extend %p3;
text-align: center;
}
-[id^="docfy-demo-preview-color"] ul,
-[id^="docfy-demo-preview-typography"] ul,
-[id^="docfy-demo-preview-icons"] ul {
+[id^='docfy-demo-preview-color'] ul,
+[id^='docfy-demo-preview-typography'] ul,
+[id^='docfy-demo-preview-icons'] ul {
@extend %debug-grid;
}
-[id^="docfy-demo-preview-typography"] figure,
-[id^="docfy-demo-preview-icons"] figure {
+[id^='docfy-demo-preview-typography'] figure,
+[id^='docfy-demo-preview-icons'] figure {
border: var(--decor-border-100);
border-color: rgb(var(--tone-gray-300));
height: 80px;
}
-[id^="docfy-demo-preview-icons"] figure::before {
+[id^='docfy-demo-preview-icons'] figure::before {
position: relative;
top: 20px;
}
-[id^="docfy-demo-preview-color"] figure {
+[id^='docfy-demo-preview-color'] figure {
height: 40px;
}
#docfy-demo-preview-color0 {
@@ -60,7 +60,7 @@
@extend %theme-dark;
}
-[id^="docfy-demo-preview-typography"] {
+[id^='docfy-demo-preview-typography'] {
.debug-h000 {
@extend %h000;
}
@@ -248,6 +248,9 @@ html.with-route-announcer .route-title {
figcaption code {
@extend %inline-code;
}
+ pre code {
+ @extend %block-code;
+ }
figure > [type='text'] {
border: 1px solid rgb(var(--tone-gray-999));
width: 100%;
diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
index b35b76fe0b..27342bf3cf 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -53,7 +53,10 @@ as |route|>
(reject-by 'Kind' 'connect-proxy' api.data)
-as |sort filters items|}}
+ (or route.params.partition route.model.user.token.Partition 'default')
+ (or route.params.nspace route.model.user.token.Namespace 'default')
+
+as |sort filters items partition nspace|}}
@@ -63,9 +66,12 @@ as |sort filters items|}}
- {{#if (gt items.length 0) }}
+{{#if (gt items.length 0) }}
+ {{#let (collection items) as |items|}}
@@ -115,10 +123,20 @@ as |sort filters items|}}
-
- Documentation on services
+
+ Documentation on services
+
-
- Read the guide
+
+ Read the guide
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
index 41835a81b1..526073d51c 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
@@ -20,12 +20,14 @@ as |route|>
)
)
+ (or route.params.partition route.model.user.token.Partition 'default')
+ (or route.params.nspace route.model.user.token.Namespace 'default')
route.params.dc
- route.params.nspace
+
route.model.proxy
route.model.proxy.Service.Proxy.Upstreams
- as |sort filters dc nspace proxy items|}}
+ as |sort filters partition nspace dc proxy items|}}
{{#if (gt items.length 0)}}
as |collection|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
index 116e00bb3b..72d86d0f7a 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
@@ -42,11 +42,12 @@ as |route|>
)
)
- route.params.nspace
+ (or route.params.partition route.model.user.token.Partition 'default')
+ (or route.params.nspace route.model.user.token.Namespace 'default')
route.params.dc
loader.data
- as |sort filters nspace dc items|}}
+ as |sort filters partition nspace dc items|}}
{{#if (gt items.length 0)}}
@items={{collection.items}}
@dc={{dc}}
@nspace={{nspace}}
+ @partition={{partition}}
>
diff --git a/ui/packages/consul-ui/app/templates/head.hbs b/ui/packages/consul-ui/app/templates/head.hbs
deleted file mode 100644
index d2eda4f162..0000000000
--- a/ui/packages/consul-ui/app/templates/head.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{model.title}}
diff --git a/ui/packages/consul-ui/app/utils/create-fingerprinter.js b/ui/packages/consul-ui/app/utils/create-fingerprinter.js
index 263b349f2a..d0f103dcfb 100644
--- a/ui/packages/consul-ui/app/utils/create-fingerprinter.js
+++ b/ui/packages/consul-ui/app/utils/create-fingerprinter.js
@@ -5,14 +5,19 @@ export default function(foreignKey, nspaceKey, partitionKey, hash = JSON.stringi
return function(item) {
foreignKeyValue = foreignKeyValue == null ? item[foreignKey] : foreignKeyValue;
if (foreignKeyValue == null) {
- throw new Error('Unable to create fingerprint, missing foreignKey value');
+ throw new Error(
+ `Unable to create fingerprint, missing foreignKey value. Looking for value in \`${foreignKey}\` got \`${foreignKeyValue}\``
+ );
}
const slugKeys = slugKey.split(',');
const slugValues = slugKeys.map(function(slugKey) {
- if (get(item, slugKey) == null || get(item, slugKey).length < 1) {
- throw new Error('Unable to create fingerprint, missing slug');
+ const slug = get(item, slugKey);
+ if (slug == null || slug.length < 1) {
+ throw new Error(
+ `Unable to create fingerprint, missing slug. Looking for value in \`${slugKey}\` got \`${slug}\``
+ );
}
- return get(item, slugKey);
+ return slug;
});
// This ensures that all data objects have a Namespace and a Partition
// value set, even in OSS.
diff --git a/ui/packages/consul-ui/mock-api/v1/discovery-chain/_ b/ui/packages/consul-ui/mock-api/v1/discovery-chain/_
index f5f5d0109e..fe51860d2a 100644
--- a/ui/packages/consul-ui/mock-api/v1/discovery-chain/_
+++ b/ui/packages/consul-ui/mock-api/v1/discovery-chain/_
@@ -2,7 +2,9 @@ ${
[1].map(() => {
const namespaces = ['default'];
+ const partitions = ['default'];
const ns = location.search.ns || 'default';
+ const partition = location.search.partition || 'default';
const dc = location.search.dc;
const service = location.pathname.get(2);
@@ -75,7 +77,7 @@ ${
const service = fake.hacker.noun().split(' ').join('-');
return {
ServiceName: service,
- Name: `${service}.${ns}.${dc}`,
+ Name: `${service}.${ns}.${partition}.${dc}`,
Subsets: range(
env(
'CONSUL_SUBSET_COUNT',
@@ -96,7 +98,7 @@ ${
const service = resolvers[i].ServiceName;
return {
ServiceName: service,
- Name: `${service}.${ns}.redirect-${dc}`,
+ Name: `${service}.${ns}.${partition}.redirect-${dc}`,
Subsets: []
};
});
@@ -129,7 +131,7 @@ ${
const splitters = range(
splitterCount
).map(() => ({
- Name: `${service}-${fake.hacker.noun()}.${ns}`,
+ Name: `${service}-${fake.hacker.noun()}.${ns}.${partition}`,
Splits: range(
splitCount
).map((item, i, arr) => ({
@@ -151,6 +153,7 @@ ${
"Chain": {
"ServiceName": "${service}",
"Namespace": "${ns}",
+ "Partition": "${partition}",
"Datacenter": "${dc}",
"Protocol": "http",
"StartNode": "router:${service}",
@@ -247,7 +250,8 @@ ${resolvers.map((resolver) => {
);
const failover = ({
Datacenter: `${resolver.Name.replace(`.${dc}`, `.fail-${dc}`).replace(`.redirect-${dc}`, `.fail-${dc}`)}`,
- Namespace: `${resolver.Name.replace(`.${ns}.`, `.fail-${ns}.`).replace(`.redirect-${ns}.`, `.fail-${ns}.`)}`,
+ Partition: `${resolver.Name.replace(`${ns}.${partition}.`, `${ns}.fail-${partition}.`).replace(`${ns}.redirect-${partition}.`, `${ns}.fail-${partition}.`)}`,
+ Namespace: `${resolver.Name.replace(`.${ns}.${partition}`, `.fail-${ns}.${partition}`).replace(`.redirect-${ns}.${partition}`, `.fail-${ns}.${partition}`)}`,
})[env('CONSUL_FAILOVER_TYPE', 'Datacenter')];
return `
@@ -272,7 +276,8 @@ ${resolver.Subsets.map((subset) => {
const id = `${subset}.${resolver.Name}`;
const failover = ({
Datacenter: `${subset}.${resolver.Name.replace(`.${dc}`, `.fail-${dc}`)}`,
- Namespace: `${subset}.${resolver.Name.replace(`.${ns}.`, `.fail-${ns}.`)}`,
+ Partition: `${subset}.${resolver.Name.replace(`${ns}.${partition}.`, `${ns}.fail-${partition}.`)}`,
+ Namespace: `${subset}.${resolver.Name.replace(`.${ns}.${partition}`, `.fail-${ns}.${partition}`)}`,
})[env('CONSUL_FAILOVER_TYPE', 'Datacenter')];
return `
@@ -321,6 +326,7 @@ ${resolvers.map(item => {
"ID": "${item.Name}",
"Service": "${item.ServiceName}",
"Namespace": "${ns}",
+ "Partition": "${partition}",
"Datacenter": "${dc}",
"MeshGateway": {},
"SNI": "${name}",
@@ -335,6 +341,7 @@ ${item.Subsets.map(ktem => {
"Service": "${item.ServiceName}",
"ServiceSubset": "${ktem}",
"Namespace": "${ns}",
+ "Partition": "${partition}",
"Datacenter": "${dc}",
"MeshGateway": {
},
diff --git a/ui/packages/consul-ui/mock-api/v1/health/service/_ b/ui/packages/consul-ui/mock-api/v1/health/service/_
index 555d46f5e1..3a33f731e6 100644
--- a/ui/packages/consul-ui/mock-api/v1/health/service/_
+++ b/ui/packages/consul-ui/mock-api/v1/health/service/_
@@ -53,7 +53,7 @@ ${typeof location.search.ns !== 'undefined' ? `
"Namespace": "${location.search.ns}",
` : ``}
${typeof location.search.partition !== 'undefined' ? `
- "Partition": "${location.search.partition}",
+ "Partition": "${fake.helpers.randomize([env('CONSUL_PARTITION_EXPORTER', location.search.partition), location.search.partition])}",
` : ``}
"Tags":[
${
@@ -132,6 +132,7 @@ ${range(env('CONSUL_UPSTREAM_COUNT', 10)).map((item, j) => `
"Datacenter": "${fake.address.countryCode().toLowerCase()} ${ i % 2 ? "west" : "east"}-${j}",
"DestinationName": "${fake.hacker.noun()}",
"DestinationNamespace": "${fake.hacker.noun()}",
+ "DestinationPartition": "${fake.hacker.noun()}",
"DestinationType": "${fake.helpers.randomize(['service', 'prepared_query'])}",
${fake.random.number({min: 1, max: 10}) > 5 ? `
"LocalBindAddress": "${fake.internet.ip()}",
diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/gateway-services-nodes/_ b/ui/packages/consul-ui/mock-api/v1/internal/ui/gateway-services-nodes/_
index ef0f45ffa9..3bd1191467 100644
--- a/ui/packages/consul-ui/mock-api/v1/internal/ui/gateway-services-nodes/_
+++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/gateway-services-nodes/_
@@ -17,6 +17,9 @@ ${i === 1 ? `
` : `
"Namespace": "${fake.hacker.noun()}-ns-${i}",
`}
+${typeof location.search.partition !== 'undefined' ? `
+ "Partition": "${fake.helpers.randomize([env('CONSUL_PARTITION_EXPORTER', location.search.partition), location.search.partition])}",
+` : ``}
"Tags": [
${
range(env('CONSUL_TAG_COUNT', fake.random.number(10))).map(
diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/services b/ui/packages/consul-ui/mock-api/v1/internal/ui/services
index 66b7d9fd79..9fb437fbcb 100644
--- a/ui/packages/consul-ui/mock-api/v1/internal/ui/services
+++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/services
@@ -45,6 +45,9 @@ ${[0].map(
"Name":"${name}",
${typeof location.search.ns !== 'undefined' ? `
"Namespace": "${location.search.ns}",
+` : ``}
+${typeof location.search.partition !== 'undefined' ? `
+ "Partition": "${fake.helpers.randomize([env('CONSUL_PARTITION_EXPORTER', location.search.partition), location.search.partition])}",
` : ``}
"Tags": [
${
diff --git a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
index 53e986cd32..f33af1b893 100644
--- a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
@@ -8,8 +8,8 @@ module('Unit | Component | consul/discovery-chain/get-alternative-services', fun
Targets: ['different-ns', 'different-ns2'],
};
const actual = getAlternateServices(
- ['service.different-ns.dc', 'service.different-ns2.dc'],
- 'service.namespace.dc'
+ ['service.different-ns.partition.dc', 'service.different-ns2.partition.dc'],
+ 'service.namespace.partition.dc'
);
assert.equal(actual.Type, expected.Type);
assert.deepEqual(actual.Targets, expected.Targets);
@@ -20,8 +20,8 @@ module('Unit | Component | consul/discovery-chain/get-alternative-services', fun
Targets: ['dc1', 'dc2'],
};
const actual = getAlternateServices(
- ['service.namespace.dc1', 'service.namespace.dc2'],
- 'service.namespace.dc'
+ ['service.namespace.partition.dc1', 'service.namespace.partition.dc2'],
+ 'service.namespace.partition.dc'
);
assert.equal(actual.Type, expected.Type);
assert.deepEqual(actual.Targets, expected.Targets);
@@ -32,8 +32,8 @@ module('Unit | Component | consul/discovery-chain/get-alternative-services', fun
Targets: ['service-2', 'service-3'],
};
const actual = getAlternateServices(
- ['service-2.namespace.dc', 'service-3.namespace.dc'],
- 'service.namespace.dc'
+ ['service-2.namespace.partition.dc', 'service-3.namespace.partition.dc'],
+ 'service.namespace.partition.dc'
);
assert.equal(actual.Type, expected.Type);
assert.deepEqual(actual.Targets, expected.Targets);
@@ -44,8 +44,8 @@ module('Unit | Component | consul/discovery-chain/get-alternative-services', fun
Targets: ['v3', 'v2'],
};
const actual = getAlternateServices(
- ['v3.service.namespace.dc', 'v2.service.namespace.dc'],
- 'v1.service.namespace.dc'
+ ['v3.service.namespace.partition.dc', 'v2.service.namespace.partition.dc'],
+ 'v1.service.namespace.partition.dc'
);
assert.equal(actual.Type, expected.Type);
assert.deepEqual(actual.Targets, expected.Targets);
diff --git a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
index 69dc9634bb..e298984092 100644
--- a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
@@ -4,6 +4,7 @@ import { get } from 'consul-ui/tests/helpers/api';
const dc = 'dc-1';
const nspace = 'default';
+const partition = 'default';
const request = {
url: `/v1/discovery-chain/service-name?dc=${dc}`,
};
@@ -19,7 +20,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const childId = Object.keys(Chain.Targets)[1];
const target = Chain.Targets[`${childId}`];
const firstChild = actual[0].Children[0];
@@ -39,7 +40,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const childId = Object.keys(Chain.Targets)[1];
const target = Chain.Targets[`${childId}`];
const firstChild = actual[0].Children[0];
@@ -61,7 +62,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const actualSubset = actual[0].Children[0];
assert.equal(actualSubset.Subset, true);
assert.equal(actualSubset.Failover.Type, failoverType);
@@ -71,7 +72,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
});
test('it assigns Failovers correctly', function(assert) {
return Promise.all(
- ['Datacenter', 'Namespace'].map(function(failoverType, i) {
+ ['Datacenter', 'Partition', 'Namespace'].map(function(failoverType, i) {
return get(request.url, {
headers: {
cookie: {
@@ -83,7 +84,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const node = Chain.Nodes[`resolver:${Object.keys(Chain.Targets)[0]}`];
const expected = node.Resolver.Failover.Targets.map(item => item.split('.').reverse()[i]);
assert.equal(actual[0].Failover.Type, failoverType);
@@ -101,31 +102,36 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
Protocol: 'http',
StartNode: '',
Nodes: {
- 'resolver:v2.dc-failover.default.dc-1': {
+ 'resolver:v2.dc-failover.default.default.dc-1': {
Type: 'resolver',
- Name: 'v2.dc-failover.default.dc-1',
+ Name: 'v2.dc-failover.default.default.dc-1',
Resolver: {
- Target: 'v2.dc-failover.default.dc-1',
+ Target: 'v2.dc-failover.default.default.dc-1',
Failover: {
- Targets: ['v2.dc-failover.default.dc-5', 'v2.dc-failover.default.dc-6'],
+ Targets: [
+ 'v2.dc-failover.default.default.dc-5',
+ 'v2.dc-failover.default.default.dc-6',
+ ],
},
},
},
},
Targets: {
- 'v2.dc-failover.default.dc-1': {
- ID: 'v2.dc-failover.default.dc-1',
+ 'v2.dc-failover.default.default.dc-1': {
+ ID: 'v2.dc-failover.default.default.dc-1',
Service: 'dc-failover',
Namespace: 'default',
+ Partition: 'default',
Datacenter: 'dc-1',
Subset: {
Filter: '',
},
},
- 'v2.dc-failover.default.dc-6': {
- ID: 'v2.dc-failover.default.dc-6',
+ 'v2.dc-failover.default.default.dc-6': {
+ ID: 'v2.dc-failover.default.default.dc-6',
Service: 'dc-failover',
Namespace: 'default',
+ Partition: 'default',
Datacenter: 'dc-6',
Subset: {
Filter: '',
@@ -134,14 +140,14 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const expected = {
- ID: 'dc-failover.default.dc-1',
+ ID: 'dc-failover.default.default.dc-1',
Name: 'dc-failover',
Children: [
{
Subset: true,
- ID: 'v2.dc-failover.default.dc-1',
+ ID: 'v2.dc-failover.default.default.dc-1',
Name: 'v2',
Failover: {
Type: 'Datacenter',
@@ -162,30 +168,31 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
Protocol: 'http',
StartNode: '',
Nodes: {
- 'resolver:dc-failover.default.dc-1': {
+ 'resolver:dc-failover.default.default.dc-1': {
Type: 'resolver',
- Name: 'dc-failover.default.dc-1',
+ Name: 'dc-failover.default.default.dc-1',
Resolver: {
- Target: 'dc-failover.default.dc-1',
+ Target: 'dc-failover.default.default.dc-1',
Failover: {
- Targets: ['dc-failover.default.dc-5', 'dc-failover.default.dc-6'],
+ Targets: ['dc-failover.default.default.dc-5', 'dc-failover.default.default.dc-6'],
},
},
},
},
Targets: {
- 'dc-failover.default.dc-1': {
- ID: 'dc-failover.default.dc-1',
+ 'dc-failover.default.default.dc-1': {
+ ID: 'dc-failover.default.default.dc-1',
Service: 'dc-failover',
Namespace: 'default',
+ Partition: 'default',
Datacenter: 'dc-1',
},
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
const expected = {
- ID: 'dc-failover.default.dc-1',
+ ID: 'dc-failover.default.default.dc-1',
Name: 'dc-failover',
Children: [],
Failover: {
@@ -201,37 +208,42 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
Chain: {
ServiceName: 'service-name',
Namespace: 'default',
+ Partition: 'default',
Datacenter: 'dc-1',
Protocol: 'http',
StartNode: '',
Nodes: {
- 'resolver:dc-failover.default.redirect-dc-1': {
+ 'resolver:dc-failover.default.default.redirect-dc-1': {
Type: 'resolver',
- Name: 'dc-failover.default.redirect-dc-1',
+ Name: 'dc-failover.default.default.redirect-dc-1',
Resolver: {
- Target: 'dc-failover.default.redirect-dc-1',
+ Target: 'dc-failover.default.default.redirect-dc-1',
Failover: {
- Targets: ['dc-failover.default.redirect-dc-5', 'dc-failover.default.redirect-dc-6'],
+ Targets: [
+ 'dc-failover.default.default.redirect-dc-5',
+ 'dc-failover.default.default.redirect-dc-6',
+ ],
},
},
},
},
Targets: {
'dc-failover.default.redirect-dc-1': {
- ID: 'dc-failover.default.redirect-dc-1',
+ ID: 'dc-failover.default.default.redirect-dc-1',
Service: 'dc-failover',
Namespace: 'default',
+ Partition: 'default',
Datacenter: 'redirect-dc-1',
},
},
},
}).then(function({ Chain }) {
- const actual = getResolvers(dc, nspace, Chain.Targets, Chain.Nodes);
+ const actual = getResolvers(dc, partition, nspace, Chain.Targets, Chain.Nodes);
// Both the parent and the child should have a Failover property
// as in order for a redirect to have failovers it must redirect to a
// service that already has failovers
const expected = {
- ID: 'dc-failover.default.dc-1',
+ ID: 'dc-failover.default.default.dc-1',
Name: 'dc-failover',
Failover: {
Targets: ['redirect-dc-5', 'redirect-dc-6'],
@@ -243,7 +255,7 @@ module('Unit | Component | consul/discovery-chain/get-resolvers', function() {
Targets: ['redirect-dc-5', 'redirect-dc-6'],
Type: 'Datacenter',
},
- ID: 'dc-failover.default.redirect-dc-1',
+ ID: 'dc-failover.default.default.redirect-dc-1',
Name: 'redirect-dc-1',
Redirect: true,
},
diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml
index cefd9f9498..fe1f462b4f 100644
--- a/ui/packages/consul-ui/translations/common/en-us.yaml
+++ b/ui/packages/consul-ui/translations/common/en-us.yaml
@@ -46,6 +46,7 @@ search:
critical: Failing
in-mesh: In service mesh
not-in-mesh: Not in service mesh
+ integrations: Integrations
sort:
alpha:
asc: A to Z
@@ -61,4 +62,4 @@ sort:
desc: Shortest to longest
status:
asc: Unhealthy to Healthy
- desc: Healthy to Unhealthy
\ No newline at end of file
+ desc: Healthy to Unhealthy
diff --git a/website/content/commands/admin-partition.mdx b/website/content/commands/admin-partition.mdx
index 8ed85427ec..e52e46b06a 100644
--- a/website/content/commands/admin-partition.mdx
+++ b/website/content/commands/admin-partition.mdx
@@ -1,32 +1,32 @@
---
layout: commands
-page_title: 'Commands: admin-partition'
+page_title: 'Commands: partition'
description: |
- The admin-partition command enables you create and manage Consul Enterprise admin partitions.
+ The partition command enables you create and manage Consul Enterprise admin partitions.
---
# Consul Admin Partition
-Command: `consul admin-partition`
+Command: `consul partition`
+consul partition
```
-Issue the `consul admin-partition -h` command to view the subcommands.
+Issue the `consul partition -h` command to view the subcommands.
```shell-session
-Usage: consul admin-partition [options] [args]
+Usage: consul partition [options] [args]
This command has subcommands for interacting with Consul Enterprise
admin partitions. Here are some simple examples. More detailed
@@ -34,41 +34,41 @@ Usage: consul admin-partition [options] [args]
Create an admin partition
- $ consul admin-partition create -name team1
+ $ consul partition create -name team1
Create or Update an admin partition from its full definition:
- $ consul admin-partition write part1
+ $ consul partition write part1
Read an admin partition:
- $ consul admin-partition read team1
+ $ consul partition read team1
List all admin partitions:
- $ consul admin-partition list
+ $ consul partition list
Update an admin partition
- $ consul admin-partition update -name team1 -description "first admin-partition"
+ $ consul partition update -name team1 -description "first partition"
Delete an admin partition:
- $ consul admin-partition delete team1
+ $ consul partition delete team1
For more examples, ask for subcommand help or view the documentation.
```
## Subcommands
-You can issue the following subcommands with the `consul admin-partition` command.
+You can issue the following subcommands with the `consul partition` command.
### `create`
The `create` subcommand sends a request to the server to create a new admin partition.
```shell-session
-consul admin-partition create
+consul partition create
```
The admin partition is created according to the values specified in the options. You can specify the following options:
@@ -83,7 +83,7 @@ The admin partition is created according to the values specified in the options.
In the following example, a partition named `webdev` is created:
```shell-session
-consul admin-partition create -name "webdev" -description "Partition for admin of webdev services" -format json -show-meta
+consul partition create -name "webdev" -description "Partition for admin of webdev services" -format json -show-meta
{
"Name": "webdev",
@@ -100,16 +100,16 @@ The `write` subcommand sends a request to the server to create a new admin parti
Use the following syntax to write from file:
```shell-session
-consul admin-partition write
+consul partition write
```
Use the following syntax to write from `stdin`:
```shell-session
-consul admin-partition write -
+consul partition write -
```
-The definition file or `stdin` values can be provided in JSON or HCL format. Refer to the [Admin Partition Definition](#admin-partition-definition) section for details about the supported parameters.
+The definition file or `stdin` values can be provided in JSON or HCL format. Refer to the [Admin Partition Definition](#partition-definition) section for details about the supported parameters.
You can specify the following options:
@@ -121,7 +121,7 @@ You can specify the following options:
In the following example, the `webdev-bu` partition is written using `stdin` values:
```shell-session
-consul admin-partition write -format json -show-meta - <<< 'name = "webdev-bu" description = "backup webdev partition"'
+consul partition write -format json -show-meta - <<< 'name = "webdev-bu" description = "backup webdev partition"'
{
"Name": "webdev-bu",
@@ -136,7 +136,7 @@ consul admin-partition write -format json -show-meta - <<< 'name = "webdev-bu"
The `read` subcommand sends a request to the server to read the configuration for the specified partition and print it to the console.
```shell-session
-consul admin-partition read
+consul partition read
```
The admin partition is created according to the values specified in the options. You can specify the following options:
@@ -149,7 +149,7 @@ The admin partition is created according to the values specified in the options.
In the following example, the configuration for the `webdev` partition is read:
```shell-session
-consul admin-partition read -format json -meta webdev
+consul partition read -format json -meta webdev
{
"Name": "webdev",
@@ -163,7 +163,7 @@ consul admin-partition read -format json -meta webdev
The `list` subcommand prints existing admin partitions to the console.
```shell-session
-consul admin-partition list
+consul partition list
```
The admin partition is created according to the values specified in the options. You can specify the following options:
@@ -176,7 +176,7 @@ The admin partition is created according to the values specified in the options.
The following example lists the admin partitions and their meta data in JSON format:
```shell-session
-consul admin-partition list -format json -show-meta
+consul partition list -format json -show-meta
[
{
@@ -204,12 +204,12 @@ consul admin-partition list -format json -show-meta
The `delete` subcommand sends a request to the server to remove the specified partition.
```shell-session
-consul admin-partition delete
+consul partition delete
```
In the following example, the `webdev-bu` partition is deleted:
```shell-session
-consul admin-partition delete webdev
+consul partition delete webdev
```
## Admin Partition Definition
@@ -234,7 +234,7 @@ Description = "Partition for dev team"
## HTTP API Options
-You can include the following options to interact with the HTTP API when using the `admin-partition` command.
+You can include the following options to interact with the HTTP API when using the `partition` command.
| Option | Description | Default | Required |
| --- | --- | --- | --- |
diff --git a/website/content/docs/connect/config-entries/partition-exports.mdx b/website/content/docs/connect/config-entries/exported-services.mdx
similarity index 86%
rename from website/content/docs/connect/config-entries/partition-exports.mdx
rename to website/content/docs/connect/config-entries/exported-services.mdx
index 94a61569d7..c4dc21213d 100644
--- a/website/content/docs/connect/config-entries/partition-exports.mdx
+++ b/website/content/docs/connect/config-entries/exported-services.mdx
@@ -1,46 +1,46 @@
---
layout: docs
-page_title: 'Configuration Entry Kind: Partition Exports'
+page_title: 'Configuration Entry Kind: Exported Services'
description: >-
- The partition-exports configuration entry enables you to export services from a single file.
+ The exported-services configuration entry enables you to export services from a single file.
Settings in this configuration entry can apply to services in any namespace of the specified partition. Write access to the mesh resource is required.
---
-# Partition Exports
+# Exported Services
-This topic describes the `partition-exports` configuration entry type. The `partition-exports` configuration entry enables Consul to export service instances to other admin partitions from a single file. This enables your services to be networked across admin partitions. See [Admin Partitions](/docs/enterprise/admin-partitions) for additional information.
+This topic describes the `exported-services` configuration entry type. The `exported-services` configuration entry enables Consul to export service instances to other admin partitions from a single file. This enables your services to be networked across admin partitions. See [Admin Partitions](/docs/enterprise/admin-partitions) for additional information.
-> **v1.11.0+:** This config entry is supported in Consul versions 1.11.0+.
## Introduction
-You can configure Consul to export services contained in an admin partition to one or more additional partitions by declaring the `partition-exports` configuration entry in the `kind` field. This enables you to route traffic between services in different clusters that share a single set of Consul servers.
+You can configure Consul to export services contained in an admin partition to one or more additional partitions by declaring the `exported-services` configuration entry in the `kind` field. This enables you to route traffic between services in different clusters that share a single set of Consul servers.
-You can configure the settings defined in the `partition-exports` configuration entry to apply to all namespaces and federated datacenters.
+You can configure the settings defined in the `exported-services` configuration entry to apply to all namespaces and federated datacenters.
## Requirements
* A Consul Enterprise binary
-* A partition that corresponds to the configuration entry. As in, the partition exports config entry for partition "frontend" requires that the "frontend" partition exists
+* A partition that corresponds to the configuration entry. As in, the exported services config entry for partition "frontend" requires that the "frontend" partition exists
## Usage
1. Verify that your datacenter meets the conditions specified in the [Requirements](#requirements).
-1. Specify the `partition-exports` configuration in the agent configuration file (see [`config_entries`](/docs/agent/options#config_entries)) as described in [Configuration](#configuration).
+1. Specify the `exported-services` configuration in the agent configuration file (see [`config_entries`](/docs/agent/options#config_entries)) as described in [Configuration](#configuration).
1. Apply the configuration using one of the following methods:
* Kubernetes CRD: Refer to the [Custom Resource Definitions](/docs/k8s/crds) documentation for details.
* Issue the `consul config write` command: Refer to the [Consul Config Write](/commands/config/write) documentation for details.
## Configuration
-Configure the following parameters to define a `partition-exports` configuration entry:
+Configure the following parameters to define a `exported-services` configuration entry:
-
+
```hcl
-Kind = "partition-exports"
+Kind = "exported-services"
Partition = ""
Services = [
{
@@ -59,7 +59,7 @@ Services = [
```yaml
apiVersion: consul.hashicorp.com/v1alpha1
-Kind: PartitionExports
+Kind: ExportedServices
Partition:
Services:
- Consumers:
@@ -71,7 +71,7 @@ Services:
```json
-"Kind": "partition-exports",
+"Kind": "exported-services",
"Partition": "",
"Services": [
{
@@ -90,11 +90,11 @@ Services:
### Configuration Parameters
-The following table describes the parameters associated with the `partition-exports` configuration entry.
+The following table describes the parameters associated with the `exported-services` configuration entry.
| Parameter | Description | Required | Default |
| --- | --- | --- | --- |
-| `Kind` | String value that enables the configuration entry. The value should always be `partition-exports` (HCL and JSON) or `PartitionExports` (YAML) | Required | None |
+| `Kind` | String value that enables the configuration entry. The value should always be `exported-services` (HCL and JSON) or `ExportedServices` (YAML) | Required | None |
| `Partition` | String value that specifies the name of the partition that contains the services you want to export. | Required | None |
| `Services` | List of objects that specify which services to export. See [`Services`](#services) for details. | Required | None|
| `Meta` | Object that defines a map of the max 64 key/value pairs. | Optional | None |
@@ -115,7 +115,7 @@ The following example configures the agent to export the `billing` service from
```hcl
-Kind = "partition-exports"
+Kind = "exported-services"
Partition = "finance"
Services = [
@@ -147,7 +147,7 @@ Services = [
```yaml
-Kind: partition-exports
+Kind: exported-services
Partition: finance
Services:
- Consumers:
@@ -165,7 +165,7 @@ Services:
```json
-"Kind": "partition-exports",
+"Kind": "exported-services",
"Partition": "finance",
"Services": [
{
@@ -207,4 +207,4 @@ An ACL token with `service:write` permissions is required for the partition from
Exports are available to all services in the consumer partition. In the previous example, any service with `write` permissions for the `frontend` partition will be able to read exports.
-See [Health HTTP Endpoint](/api-docs/health) for additional information.
\ No newline at end of file
+See [Health HTTP Endpoint](/api-docs/health) for additional information.
diff --git a/website/content/docs/discovery/dns.mdx b/website/content/docs/discovery/dns.mdx
index 87c9145c1a..ef1b8a8bed 100644
--- a/website/content/docs/discovery/dns.mdx
+++ b/website/content/docs/discovery/dns.mdx
@@ -96,47 +96,6 @@ pairs according to [RFC1464](https://www.ietf.org/rfc/rfc1464.txt).
Alternatively, the TXT record will only include the node's metadata value when the
node's metadata key starts with `rfc1035-`.
-## Alternative Domain
-
-By default, Consul responds to DNS queries in the `consul` domain,
-but you can set a specific domain for responding to DNS queries by configuring the [`domain`](/docs/agent/options#domain) parameter.
-
-In some instances, Consul may need to respond to queries in more than one domain,
-such as during a DNS migration or to distinguish between internal and external queries.
-
-Consul versions 1.5.2+ can be configured to respond to DNS queries on an alternative domain
-through the [`alt_domain`](/docs/agent/options#alt_domain) agent configuration
-option. As of Consul versions 1.11.0+, Consul's DNS response will use the same domain as was used in the query;
-in prior versions, the response may use the primary [`domain`](/docs/agent/options#domain) no matter which
-domain was used in the query.
-
-In the following example, the `alt_domain` parameter is set to `test-domain`:
-
-```hcl
- alt_domain = "test-domain"
-```
-
-```shell-session
-$ dig @127.0.0.1 -p 8600 consul.service.test-domain SRV
-```
-The following responses are returned:
-
-```
-;; QUESTION SECTION:
-;consul.service.test-domain. IN SRV
-
-;; ANSWER SECTION:
-consul.service.test-domain. 0 IN SRV 1 1 8300 machine.node.dc1.test-domain.
-
-;; ADDITIONAL SECTION:
-machine.node.dc1.test-domain. 0 IN A 127.0.0.1
-machine.node.dc1.test-domain. 0 IN TXT "consul-network-segment="
-```
-
--> **PTR queries:** Responses to PTR queries (`.in-addr.arpa.`) will always use the
-[primary domain](/docs/agent/options#domain) (not the alternative domain),
-as there is no way for the query to specify a domain.
-
## Service Lookups
A service lookup is used to query for service providers. Service queries support
@@ -319,6 +278,47 @@ without setting the truncate bit. This is to prevent a redundant lookup over
TCP that generates additional load. If the lookup is done over TCP, the results
are not truncated.
+## Alternative Domain
+
+By default, Consul responds to DNS queries in the `consul` domain,
+but you can set a specific domain for responding to DNS queries by configuring the [`domain`](/docs/agent/options#domain) parameter.
+
+In some instances, Consul may need to respond to queries in more than one domain,
+such as during a DNS migration or to distinguish between internal and external queries.
+
+Consul versions 1.5.2+ can be configured to respond to DNS queries on an alternative domain
+through the [`alt_domain`](/docs/agent/options#alt_domain) agent configuration
+option. As of Consul versions 1.11.0+, Consul's DNS response will use the same domain as was used in the query;
+in prior versions, the response may use the primary [`domain`](/docs/agent/options#domain) no matter which
+domain was used in the query.
+
+In the following example, the `alt_domain` parameter is set to `test-domain`:
+
+```hcl
+ alt_domain = "test-domain"
+```
+
+```shell-session
+$ dig @127.0.0.1 -p 8600 consul.service.test-domain SRV
+```
+The following responses are returned:
+
+```
+;; QUESTION SECTION:
+;consul.service.test-domain. IN SRV
+
+;; ANSWER SECTION:
+consul.service.test-domain. 0 IN SRV 1 1 8300 machine.node.dc1.test-domain.
+
+;; ADDITIONAL SECTION:
+machine.node.dc1.test-domain. 0 IN A 127.0.0.1
+machine.node.dc1.test-domain. 0 IN TXT "consul-network-segment="
+```
+
+-> **PTR queries:** Responses to PTR queries (`.in-addr.arpa.`) will always use the
+[primary domain](/docs/agent/options#domain) (not the alternative domain),
+as there is no way for the query to specify a domain.
+
## Caching
By default, all DNS results served by Consul set a 0 TTL value. This disables
diff --git a/website/content/docs/enterprise/admin-partitions.mdx b/website/content/docs/enterprise/admin-partitions.mdx
index b7b75fa186..97511a38da 100644
--- a/website/content/docs/enterprise/admin-partitions.mdx
+++ b/website/content/docs/enterprise/admin-partitions.mdx
@@ -51,7 +51,7 @@ Values specified for [`proxy-defaults`](/docs/connect/config-entries/proxy-defau
### Cross-partition Networking
-You can configure services to be discoverable by downstream services in any partition within the datacenter. Specify the upstream services that you want to be available for discovery by configuring the `partition-exports` configuration entry in the partition where the services are registered. Refer to the [`partition-exports` documentation](/docs/connect/config-entries/partition-exports) for details. Additionally, the `upstreams` configuration for proxies in the source partition must specify the name of the destination partition so that listeners can be created. Refer to the [Upstream Configuration Reference](/docs/connect/registration/service-registration#upstream-configuration-reference) for additional information.
+You can configure services to be discoverable by downstream services in any partition within the datacenter. Specify the upstream services that you want to be available for discovery by configuring the `exported-services` configuration entry in the partition where the services are registered. Refer to the [`exported-services` documentation](/docs/connect/config-entries/exported-services) for details. Additionally, the `upstreams` configuration for proxies in the source partition must specify the name of the destination partition so that listeners can be created. Refer to the [Upstream Configuration Reference](/docs/connect/registration/service-registration#upstream-configuration-reference) for additional information.
## Requirements
diff --git a/website/content/docs/k8s/crds/index.mdx b/website/content/docs/k8s/crds/index.mdx
index 8364c22d32..1c8eded43e 100644
--- a/website/content/docs/k8s/crds/index.mdx
+++ b/website/content/docs/k8s/crds/index.mdx
@@ -23,7 +23,7 @@ via Kubernetes Custom Resources. Configuration entries provide cluster-wide defa
You can specify the following values in the `kind` field. Click on a configuration entry to view its documentation:
- [`Mesh`](/docs/connect/config-entries/mesh) (requires Consul 1.10.0+)
-- [`PartitionExports`](/docs/connect/config-entries/partition-exports)
+- [`ExportedServices`](/docs/connect/config-entries/exported-services)
- [`ProxyDefaults`](/docs/connect/config-entries/proxy-defaults)
- [`ServiceDefaults`](/docs/connect/config-entries/service-defaults)
- [`ServiceSplitter`](/docs/connect/config-entries/service-splitter)
diff --git a/website/content/docs/nia/cli/index.mdx b/website/content/docs/nia/cli/index.mdx
index c216e2da78..24d52476f3 100644
--- a/website/content/docs/nia/cli/index.mdx
+++ b/website/content/docs/nia/cli/index.mdx
@@ -86,7 +86,7 @@ Below are options that can be used across all commands:
|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|--------------------|
| `-port` | Integer value that specifies the port from which the Consul-Terraform-Sync daemon serves its API.
The value is prepended with `http://localhost:`, but you can specify a different scheme or address with the `-http-addr` if necessary. | Optional | `8558` |
| `-http-addr` | String value that specifies the address and port of the Consul-Terraform-Sync API. You can specify an IP or DNS address.
Alternatively, you can specify a value using the `CTS_HTTP_ADDR` environment variable. | Optional | `http://localhost:8558` |
-| `-ssl-verify` | Boolean value that configures Consul-Terraform-Connect to enable verification for TLS/SSL connections to the API. This does not affect insecure HTTP connections.
Alternatively, you can specify the value using the `CTS_SSL_VERIFY` environment variable. | Optional | `true` |
+| `-ssl-verify` | Boolean value that configures Consul-Terraform-Sync to enable verification for TLS/SSL connections to the API. This does not affect insecure HTTP connections.
Alternatively, you can specify the value using the `CTS_SSL_VERIFY` environment variable. | Optional | `true` |
| `-ca-cert` | String value that specifies the path to a PEM-encoded certificate authority file that is used to verify TLS/SSL connections. Takes precedence over `-ca-path` if both are provided.
Alternatively, you can specify the value using the `CTS_CACERT` environment variable. | Optional | `""` |
| `-ca-path` | String value that specifies the path to a directory containing a PEM-encoded certificate authority file that is used to verify TLS/SSL connections.
Alternatively, you can specify the value using the `CTS_CAPATH` environment variable. | Optional | `""` |
| `-client-cert` | String value that specifies the path to a PEM-encoded client certificate that the Consul-Terraform-Sync API requires when [`verify_incoming`](/docs/nia/configuration#verify_incoming) is set to `true` on the API.
Alternatively, you can specify the value using the `CTS_CLIENT_CERT` environment variable. | Optional | `""` |
diff --git a/website/content/docs/security/security-models/nia.mdx b/website/content/docs/security/security-models/nia.mdx
index 980a0e1833..0a26bc4f60 100644
--- a/website/content/docs/security/security-models/nia.mdx
+++ b/website/content/docs/security/security-models/nia.mdx
@@ -71,7 +71,7 @@ security concerns accordingly.
#### Recommendations
- **Use Dedicated Host** - The NIA daemon will potentially have access to critical secrets for your environment’s
- network infrastructure. Using a hardened, dedicated host, for supporting these sensitive operations is highly.
+ network infrastructure. Using a hardened, dedicated host, for supporting these sensitive operations is highly recommended.
- **Run without Root** - The NIA daemon does not require root or other administrative privileges to operate.
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index c081d0fbfc..47f87740b9 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -151,8 +151,8 @@
"path": "connect/config-entries/mesh"
},
{
- "title": "Partition Exports",
- "path": "connect/config-entries/partition-exports"
+ "title": "Exported Services",
+ "path": "connect/config-entries/exported-services"
},
{
"title": "Proxy Defaults",
diff --git a/website/package-lock.json b/website/package-lock.json
index 7b67f8d161..b1387cef3c 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -25,7 +25,7 @@
"@hashicorp/react-docs-page": "^14.4.2",
"@hashicorp/react-enterprise-alert": "^6.0.1",
"@hashicorp/react-featured-slider": "^5.0.1",
- "@hashicorp/react-hashi-stack-menu": "^2.0.7",
+ "@hashicorp/react-hashi-stack-menu": "^2.1.2",
"@hashicorp/react-head": "^3.1.2",
"@hashicorp/react-hero": "^8.0.2",
"@hashicorp/react-image": "^4.0.3",
@@ -1280,12 +1280,13 @@
}
},
"node_modules/@hashicorp/react-hashi-stack-menu": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-2.0.7.tgz",
- "integrity": "sha512-3b9VxAzSPbb5YeiKbMiygrointTb56VsMBp27mXPXS2dqrZ4pj1o5AJCYwescv7g7KbwwL+YC9hlLlhRxjErUw==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-2.1.2.tgz",
+ "integrity": "sha512-3K6Y2FNSLq6TsMceX3a1pdmxaVx8lRvxCgjxcKL1P6DpmOk0AU5/eL0CvKP8GzXSYstL36xXxIhWFfiaAaF/yQ==",
"dependencies": {
- "@hashicorp/react-inline-svg": "^1.0.2",
- "slugify": "1.3.4"
+ "@hashicorp/react-inline-svg": "^6.0.1",
+ "@hashicorp/react-link-wrap": "^3.0.3",
+ "slugify": "1.6.0"
},
"peerDependencies": {
"@hashicorp/mktg-global-styles": ">=3.x",
@@ -1293,20 +1294,12 @@
"react": ">=16.x"
}
},
- "node_modules/@hashicorp/react-hashi-stack-menu/node_modules/@hashicorp/react-inline-svg": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@hashicorp/react-inline-svg/-/react-inline-svg-1.0.2.tgz",
- "integrity": "sha512-AAFnBslSTgnEr++dTbMn3sybAqvn7myIj88ijGigF6u11eSRiV64zqEcyYLQKWTV6dF4AvYoxiYC6GSOgiM0Yw==",
- "peerDependencies": {
- "react": "^16.9.0"
- }
- },
"node_modules/@hashicorp/react-hashi-stack-menu/node_modules/slugify": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz",
- "integrity": "sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.0.tgz",
+ "integrity": "sha512-FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang==",
"engines": {
- "node": ">=4.0.0"
+ "node": ">=8.0.0"
}
},
"node_modules/@hashicorp/react-head": {
@@ -2012,13 +2005,9 @@
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.2.tgz",
"integrity": "sha512-hZuwOlGOwBZADA8EyDYyjx3+4JGIGjSHDHWrmpI7g5rFmQNltjlbaefAbiU5Kk7j3BUSDwt30quJRFv3nyJQ0w==",
- "cpu": [
- "arm64"
- ],
+ "cpu": ["arm64"],
"optional": true,
- "os": [
- "darwin"
- ],
+ "os": ["darwin"],
"engines": {
"node": ">= 10"
}
@@ -2027,13 +2016,9 @@
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.2.tgz",
"integrity": "sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==",
- "cpu": [
- "x64"
- ],
+ "cpu": ["x64"],
"optional": true,
- "os": [
- "darwin"
- ],
+ "os": ["darwin"],
"engines": {
"node": ">= 10"
}
@@ -2042,13 +2027,9 @@
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.2.tgz",
"integrity": "sha512-YcDHTJjn/8RqvyJVB6pvEKXihDcdrOwga3GfMv/QtVeLphTouY4BIcEUfrG5+26Nf37MP1ywN3RRl1TxpurAsQ==",
- "cpu": [
- "x64"
- ],
+ "cpu": ["x64"],
"optional": true,
- "os": [
- "linux"
- ],
+ "os": ["linux"],
"engines": {
"node": ">= 10"
}
@@ -2057,13 +2038,9 @@
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.2.tgz",
"integrity": "sha512-e/pIKVdB+tGQYa1cW3sAeHm8gzEri/HYLZHT4WZojrUxgWXqx8pk7S7Xs47uBcFTqBDRvK3EcQpPLf3XdVsDdg==",
- "cpu": [
- "x64"
- ],
+ "cpu": ["x64"],
"optional": true,
- "os": [
- "win32"
- ],
+ "os": ["win32"],
"engines": {
"node": ">= 10"
}
@@ -8083,9 +8060,7 @@
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"hasInstallScript": true,
"optional": true,
- "os": [
- "darwin"
- ],
+ "os": ["darwin"],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
@@ -19263,24 +19238,19 @@
}
},
"@hashicorp/react-hashi-stack-menu": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-2.0.7.tgz",
- "integrity": "sha512-3b9VxAzSPbb5YeiKbMiygrointTb56VsMBp27mXPXS2dqrZ4pj1o5AJCYwescv7g7KbwwL+YC9hlLlhRxjErUw==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-2.1.2.tgz",
+ "integrity": "sha512-3K6Y2FNSLq6TsMceX3a1pdmxaVx8lRvxCgjxcKL1P6DpmOk0AU5/eL0CvKP8GzXSYstL36xXxIhWFfiaAaF/yQ==",
"requires": {
- "@hashicorp/react-inline-svg": "^1.0.2",
- "slugify": "1.3.4"
+ "@hashicorp/react-inline-svg": "^6.0.1",
+ "@hashicorp/react-link-wrap": "^3.0.3",
+ "slugify": "1.6.0"
},
"dependencies": {
- "@hashicorp/react-inline-svg": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@hashicorp/react-inline-svg/-/react-inline-svg-1.0.2.tgz",
- "integrity": "sha512-AAFnBslSTgnEr++dTbMn3sybAqvn7myIj88ijGigF6u11eSRiV64zqEcyYLQKWTV6dF4AvYoxiYC6GSOgiM0Yw==",
- "requires": {}
- },
"slugify": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz",
- "integrity": "sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw=="
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.0.tgz",
+ "integrity": "sha512-FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="
}
}
},
diff --git a/website/package.json b/website/package.json
index 9c247e886c..dcee7d6a47 100644
--- a/website/package.json
+++ b/website/package.json
@@ -21,7 +21,7 @@
"@hashicorp/react-docs-page": "^14.4.2",
"@hashicorp/react-enterprise-alert": "^6.0.1",
"@hashicorp/react-featured-slider": "^5.0.1",
- "@hashicorp/react-hashi-stack-menu": "^2.0.7",
+ "@hashicorp/react-hashi-stack-menu": "^2.1.2",
"@hashicorp/react-head": "^3.1.2",
"@hashicorp/react-hero": "^8.0.2",
"@hashicorp/react-image": "^4.0.3",
diff --git a/website/redirects.next.js b/website/redirects.next.js
index 4062050f38..4b8905597c 100644
--- a/website/redirects.next.js
+++ b/website/redirects.next.js
@@ -86,6 +86,11 @@ module.exports = [
destination: '/docs/connect/registration/sidecar-service',
permanent: true,
},
+ {
+ source: '/docs/connect/config-entries/partition-exports',
+ destination: '/docs/connect/config-entries/exported-services',
+ permanent: true,
+ },
{
source: '/docs/enterprise/license',
destination: '/docs/enterprise/license/overview',