From 34d36b526310e8d58d84fb0bddaf2bdeb55c721a Mon Sep 17 00:00:00 2001 From: wenincode Date: Wed, 12 Oct 2022 15:11:05 -0600 Subject: [PATCH 1/6] Filter synthetic nodes on nodes list page --- .../components/providers/reject-by/index.hbs | 1 + .../components/providers/reject-by/index.js | 36 ++++++++ .../app/templates/dc/nodes/index.hbs | 90 ++++++++++--------- .../consul-ui/mock-api/v1/internal/ui/nodes | 3 +- .../tests/acceptance/dc/nodes/index.feature | 58 +++++++++++- 5 files changed, 142 insertions(+), 46 deletions(-) create mode 100644 ui/packages/consul-ui/app/components/providers/reject-by/index.hbs create mode 100644 ui/packages/consul-ui/app/components/providers/reject-by/index.js diff --git a/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs b/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs new file mode 100644 index 0000000000..30b7349001 --- /dev/null +++ b/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs @@ -0,0 +1 @@ +{{yield (hash data=this.data)}} diff --git a/ui/packages/consul-ui/app/components/providers/reject-by/index.js b/ui/packages/consul-ui/app/components/providers/reject-by/index.js new file mode 100644 index 0000000000..f4bd99c91b --- /dev/null +++ b/ui/packages/consul-ui/app/components/providers/reject-by/index.js @@ -0,0 +1,36 @@ +import Component from '@glimmer/component'; +import { isArray } from '@ember/array'; +import { get } from '@ember/object'; +import { isEmpty, isEqual, isPresent } from '@ember/utils'; + +export default class RejectByProvider extends Component { + get items() { + const { items, path, value } = this.args; + + if (!isArray) { + return []; + } else if (isEmpty(path)) { + return items; + } + + let filterFn; + if (isPresent(value)) { + if (typeof value === 'function') { + filterFn = (item) => !value(get(item, path)); + } else { + filterFn = (item) => !isEqual(get(item, path), value); + } + } else { + filterFn = (item) => !get(item, path); + } + + return items.filter(filterFn); + } + + get data() { + const { items } = this; + return { + items, + }; + } +} diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs index a2096231f8..6842c000cb 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs @@ -76,52 +76,54 @@ as |route|> {{/if}} - - - - - - - -

- {{t 'routes.dc.nodes.index.empty.header' + + + + + + + + +

+ {{t 'routes.dc.nodes.index.empty.header' + items=items.length + }} +

+ + + {{t 'routes.dc.nodes.index.empty.body' items=items.length + canUseACLs=(can 'use acls') + htmlSafe=true }} -

- - - {{t 'routes.dc.nodes.index.empty.body' - items=items.length - canUseACLs=(can 'use acls') - htmlSafe=true - }} - - -
  • - - {{t 'routes.dc.nodes.index.empty.documentation'}} - -
    • -
  • - - {{t 'routes.dc.nodes.index.empty.learn'}} - -
    • -     -     -     -     +     + +
  • + + {{t 'routes.dc.nodes.index.empty.documentation'}} + +
    • +
  • + + {{t 'routes.dc.nodes.index.empty.learn'}} + +
    • +     + + + + {{/let}} diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes index 8b63b7997d..26a2ac5016 100644 --- a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes +++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes @@ -24,7 +24,8 @@ "wan":"${fake.internet.ip()}" }, "Meta": { - "consul-network-segment":"" + "consul-network-segment":"", + "synthetic-node": "${fake.helpers.randomize(["true", "false", "false", "false"])}" }, "Services":[ ${ diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature index beb759c61e..09347ed4cc 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature @@ -21,6 +21,31 @@ Feature: dc / nodes / index Then the url should be /dc-1/nodes Then I see 1 node models And I see status on the nodes.0 like "critical" + Scenario: Viewing nodes list page should not show synthetic nodes + Given 3 node model from yaml + --- + - Meta: + synthetic-node: "true" + Checks: + - Status: passing + ServiceID: "" + - Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + --- + When I visit the nodes page for yaml + --- + dc: dc-1 + --- + Then the url should be /dc-1/nodes + Then I see 2 node models Scenario: Viewing a node with an unhealthy ServiceCheck Given 1 node model from yaml --- @@ -29,6 +54,8 @@ Feature: dc / nodes / index ServiceID: "" - Status: critical ServiceID: web + Meta: + synthetic-node: "false" --- When I visit the nodes page for yaml --- @@ -38,7 +65,24 @@ Feature: dc / nodes / index Then I see 1 node models And I see status on the nodes.0 like "passing" Scenario: Viewing nodes in the listing - Given 3 node models + Given 3 node model from yaml + --- + - Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + --- When I visit the nodes page for yaml --- dc: dc-1 @@ -54,12 +98,18 @@ Feature: dc / nodes / index Checks: - Status: critical Name: Warning check + Meta: + synthetic-node: "false" - Address: 10.0.0.1 Checks: - Status: passing + Meta: + synthetic-node: "false" - Address: 10.0.0.3 Checks: - Status: passing + Meta: + synthetic-node: "false" --- When I visit the nodes page for yaml --- @@ -73,10 +123,16 @@ Feature: dc / nodes / index --- - Node: node-01 Address: 10.0.0.0 + Meta: + synthetic-node: "false" - Node: node-02 Address: 10.0.0.1 + Meta: + synthetic-node: "false" - Node: node-03 Address: 10.0.0.2 + Meta: + synthetic-node: "false" --- When I visit the nodes page for yaml --- From 7cc46f31b01e0201d413c7107132d24c5665b1cd Mon Sep 17 00:00:00 2001 From: wenincode Date: Wed, 12 Oct 2022 15:21:49 -0600 Subject: [PATCH 2/6] Add changelog --- .changelog/14970.txt | 3 +++ .../tests/acceptance/dc/list.feature | 5 ++++- .../acceptance/dc/nodes/empty-ids.feature | 10 +++++++++ .../acceptance/dc/nodes/navigation.feature | 22 ++++++++++++++++++- .../acceptance/dc/nodes/no-leader.feature | 22 ++++++++++++++++++- .../tests/acceptance/dc/nodes/sorting.feature | 12 ++++++++++ 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 .changelog/14970.txt diff --git a/.changelog/14970.txt b/.changelog/14970.txt new file mode 100644 index 0000000000..cbe0754069 --- /dev/null +++ b/.changelog/14970.txt @@ -0,0 +1,3 @@ +```release-note:feature +ui: Filter agentless (synthetic) nodes from the nodes list page. +``` diff --git a/ui/packages/consul-ui/tests/acceptance/dc/list.feature b/ui/packages/consul-ui/tests/acceptance/dc/list.feature index 7a67f4cdd4..ed7fa7e978 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/list.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/list.feature @@ -1,4 +1,7 @@ @setupApplicationTest +# Nodes have been removed from this list because they randomly get +# assigned the synthetic-node property which filters them out of the list page. +# We are already testing the nodes being listed in the nodes index feature test. Feature: dc / list: List Models Scenario: Listing [Model] Given 1 datacenter model with the value "dc-1" @@ -13,7 +16,7 @@ Feature: dc / list: List Models Where: ------------------------------------------------- | Model | Page | Url | - | node | nodes | /dc-1/nodes | + # | node | nodes | /dc-1/nodes | | kv | kvs | /dc-1/kv | # | acl | acls | /dc-1/acls | | token | tokens | /dc-1/acls/tokens | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature index b0f1429ae6..58380713fa 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/empty-ids.feature @@ -6,22 +6,32 @@ Feature: dc / nodes / empty-ids: Hedge for if nodes come in over the API with no --- - ID: id-1 Node: name-1 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-2 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-3 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-4 + Meta: + synthetic-node: false Checks: - Status: passing - ID: "" Node: name-5 + Meta: + synthetic-node: false Checks: - Status: passing --- diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature index 116e26ff89..91c5114aea 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature @@ -2,7 +2,27 @@ Feature: dc / nodes / navigation Scenario: Clicking a node in the listing and back again Given 1 datacenter model with the value "dc-1" - And 3 node models + And 3 node models from yaml + --- + - Node: Node-A + Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + - Node: Node-B + Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Node: Node-C + Meta: + synthetic-node: "false" + Checks: + - Status: warning + ServiceID: "" + --- When I visit the nodes page for yaml --- dc: dc-1 diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature index 84f6036cfb..8f642d394f 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature @@ -2,7 +2,27 @@ Feature: dc / nodes / no-leader Scenario: Leader hasn't been elected Given 1 datacenter model with the value "dc-1" - And 3 node models + And 3 node models from yaml + --- + - Node: Node-A + Meta: + synthetic-node: "false" + Checks: + - Status: critical + ServiceID: "" + - Node: Node-B + Meta: + synthetic-node: "false" + Checks: + - Status: passing + ServiceID: "" + - Node: Node-C + Meta: + synthetic-node: "false" + Checks: + - Status: warning + ServiceID: "" + --- And the url "/v1/status/leader" responds with from yaml --- body: | diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature index 452a2eeea5..3482e5d624 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature @@ -5,26 +5,38 @@ Feature: dc / nodes / sorting And 6 node models from yaml --- - Node: Node-A + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-B + Meta: + synthetic-node: "false" Checks: - Status: passing ServiceID: "" - Node: Node-C + Meta: + synthetic-node: "false" Checks: - Status: warning ServiceID: "" - Node: Node-D + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-E + Meta: + synthetic-node: "false" Checks: - Status: critical ServiceID: "" - Node: Node-F + Meta: + synthetic-node: "false" Checks: - Status: warning ServiceID: "" From 344ebaa9629a709e596c80954dc4f67e9649f841 Mon Sep 17 00:00:00 2001 From: wenincode Date: Wed, 12 Oct 2022 16:34:30 -0600 Subject: [PATCH 3/6] Remove mocking synthetic nodes for now --- ui/packages/consul-ui/mock-api/v1/internal/ui/nodes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes index 26a2ac5016..8b63b7997d 100644 --- a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes +++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes @@ -24,8 +24,7 @@ "wan":"${fake.internet.ip()}" }, "Meta": { - "consul-network-segment":"", - "synthetic-node": "${fake.helpers.randomize(["true", "false", "false", "false"])}" + "consul-network-segment":"" }, "Services":[ ${ From 4218124b10cb9091478900045a5e244d6717a527 Mon Sep 17 00:00:00 2001 From: wenincode Date: Thu, 13 Oct 2022 07:29:51 -0600 Subject: [PATCH 4/6] Use reject-by composable helper instead of provider --- .../components/providers/reject-by/index.hbs | 1 - .../components/providers/reject-by/index.js | 36 --- .../app/templates/dc/nodes/index.hbs | 234 +++++++++--------- 3 files changed, 111 insertions(+), 160 deletions(-) delete mode 100644 ui/packages/consul-ui/app/components/providers/reject-by/index.hbs delete mode 100644 ui/packages/consul-ui/app/components/providers/reject-by/index.js diff --git a/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs b/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs deleted file mode 100644 index 30b7349001..0000000000 --- a/ui/packages/consul-ui/app/components/providers/reject-by/index.hbs +++ /dev/null @@ -1 +0,0 @@ -{{yield (hash data=this.data)}} diff --git a/ui/packages/consul-ui/app/components/providers/reject-by/index.js b/ui/packages/consul-ui/app/components/providers/reject-by/index.js deleted file mode 100644 index f4bd99c91b..0000000000 --- a/ui/packages/consul-ui/app/components/providers/reject-by/index.js +++ /dev/null @@ -1,36 +0,0 @@ -import Component from '@glimmer/component'; -import { isArray } from '@ember/array'; -import { get } from '@ember/object'; -import { isEmpty, isEqual, isPresent } from '@ember/utils'; - -export default class RejectByProvider extends Component { - get items() { - const { items, path, value } = this.args; - - if (!isArray) { - return []; - } else if (isEmpty(path)) { - return items; - } - - let filterFn; - if (isPresent(value)) { - if (typeof value === 'function') { - filterFn = (item) => !value(get(item, path)); - } else { - filterFn = (item) => !isEqual(get(item, path), value); - } - } else { - filterFn = (item) => !get(item, path); - } - - return items.filter(filterFn); - } - - get data() { - const { items } = this; - return { - items, - }; - } -} diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs index 6842c000cb..fb2c1a9d11 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs @@ -1,133 +1,121 @@ - + - + + as |api| + > - - - - - - {{#let - - (hash - value=(or sortBy "Status:asc") - change=(action (mut sortBy) value="target.selected") - ) - - (hash - status=(hash - value=(if status (split status ',') undefined) - change=(action (mut status) value="target.selectedItems") - ) - searchproperty=(hash - value=(if (not-eq searchproperty undefined) - (split searchproperty ',') - this._searchProperties - ) - change=(action (mut searchproperty) value="target.selectedItems") - default=this._searchProperties - ) - ) - - api.data - - leader.data - - as |sort filters items leader|}} - - -

    - {{format-number items.length}} total -

    - + + - - {{#if (gt items.length 0) }} - - {{/if}} + + {{#let + (hash value=(or sortBy 'Status:asc') change=(action (mut sortBy) value='target.selected')) + (hash + status=(hash + value=(if status (split status ',') undefined) + change=(action (mut status) value='target.selectedItems') + ) + searchproperty=(hash + value=(if + (not-eq searchproperty undefined) (split searchproperty ',') this._searchProperties + ) + change=(action (mut searchproperty) value='target.selectedItems') + default=this._searchProperties + ) + ) + api.data + leader.data + as |sort filters items leader| + }} + {{#let (reject-by 'Meta.synthetic-node' 'true' items) as |filtered|}} + + +

    + + {{format-number items.length}} total +

    + +     + + {{#if (gt filtered.length 0)}} + + {{/if}} + + + + + + + + + +

    + {{t 'routes.dc.nodes.index.empty.header' items=items.length}} +

    +     + + {{t + 'routes.dc.nodes.index.empty.body' + items=items.length + canUseACLs=(can 'use acls') + htmlSafe=true + }} + + +
  • + + {{t 'routes.dc.nodes.index.empty.documentation'}} + +
    • +
  • + + {{t 'routes.dc.nodes.index.empty.learn'}} + +
    • +     +     +     +     +     +     + {{/let}} + {{/let}}     - - - - - - - - - -

    - {{t 'routes.dc.nodes.index.empty.header' - items=items.length - }} -

    -     - - {{t 'routes.dc.nodes.index.empty.body' - items=items.length - canUseACLs=(can 'use acls') - htmlSafe=true - }} - - -
  • - - {{t 'routes.dc.nodes.index.empty.documentation'}} - -
    • -
  • - - {{t 'routes.dc.nodes.index.empty.learn'}} - -
    • -     -     -     -     -     -     -     - {{/let}} -     -     +     From b8882a44475609346939d90f01b787f8ec82f55d Mon Sep 17 00:00:00 2001 From: wenincode Date: Thu, 13 Oct 2022 08:29:48 -0600 Subject: [PATCH 5/6] Re-enable nodes in list feature test --- ui/packages/consul-ui/tests/acceptance/dc/list.feature | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ui/packages/consul-ui/tests/acceptance/dc/list.feature b/ui/packages/consul-ui/tests/acceptance/dc/list.feature index ed7fa7e978..7a67f4cdd4 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/list.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/list.feature @@ -1,7 +1,4 @@ @setupApplicationTest -# Nodes have been removed from this list because they randomly get -# assigned the synthetic-node property which filters them out of the list page. -# We are already testing the nodes being listed in the nodes index feature test. Feature: dc / list: List Models Scenario: Listing [Model] Given 1 datacenter model with the value "dc-1" @@ -16,7 +13,7 @@ Feature: dc / list: List Models Where: ------------------------------------------------- | Model | Page | Url | - # | node | nodes | /dc-1/nodes | + | node | nodes | /dc-1/nodes | | kv | kvs | /dc-1/kv | # | acl | acls | /dc-1/acls | | token | tokens | /dc-1/acls/tokens | From cda2cc7b279c0fa1016c9c019fe833f376b09e36 Mon Sep 17 00:00:00 2001 From: wenincode Date: Thu, 13 Oct 2022 08:41:26 -0600 Subject: [PATCH 6/6] Expect a boolean from synthetic-node meta key --- .../app/templates/dc/nodes/index.hbs | 2 +- .../consul-ui/mock-api/v1/health/service/_ | 2 +- .../tests/acceptance/dc/nodes/index.feature | 26 +++++++++---------- .../acceptance/dc/nodes/navigation.feature | 6 ++--- .../acceptance/dc/nodes/no-leader.feature | 6 ++--- .../tests/acceptance/dc/nodes/sorting.feature | 12 ++++----- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs index fb2c1a9d11..dcdc8c5916 100644 --- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs @@ -40,7 +40,7 @@ leader.data as |sort filters items leader| }} - {{#let (reject-by 'Meta.synthetic-node' 'true' items) as |filtered|}} + {{#let (reject-by 'Meta.synthetic-node' items) as |filtered|}}

    diff --git a/ui/packages/consul-ui/mock-api/v1/health/service/_ b/ui/packages/consul-ui/mock-api/v1/health/service/_ index aaf9a1e0f1..40e41019f4 100644 --- a/ui/packages/consul-ui/mock-api/v1/health/service/_ +++ b/ui/packages/consul-ui/mock-api/v1/health/service/_ @@ -54,7 +54,7 @@ "TaggedAddresses":{"lan":"${ip}","wan":"${ip}"}, "Meta":{ "${service}-network-segment":"", - "synthetic-node":${externalSource === 'kubernetes' ? "true" : "false"} + "synthetic-node":${externalSource === 'kubernetes' ? true : false} }, ${typeof location.search.peer !== 'undefined' ? ` "PeerName": "${location.search.peer}", diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature index 09347ed4cc..5602e4f159 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/index.feature @@ -25,17 +25,17 @@ Feature: dc / nodes / index Given 3 node model from yaml --- - Meta: - synthetic-node: "true" + synthetic-node: true Checks: - Status: passing ServiceID: "" - Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" @@ -55,7 +55,7 @@ Feature: dc / nodes / index - Status: critical ServiceID: web Meta: - synthetic-node: "false" + synthetic-node: false --- When I visit the nodes page for yaml --- @@ -68,17 +68,17 @@ Feature: dc / nodes / index Given 3 node model from yaml --- - Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" @@ -99,17 +99,17 @@ Feature: dc / nodes / index - Status: critical Name: Warning check Meta: - synthetic-node: "false" + synthetic-node: false - Address: 10.0.0.1 Checks: - Status: passing Meta: - synthetic-node: "false" + synthetic-node: false - Address: 10.0.0.3 Checks: - Status: passing Meta: - synthetic-node: "false" + synthetic-node: false --- When I visit the nodes page for yaml --- @@ -124,15 +124,15 @@ Feature: dc / nodes / index - Node: node-01 Address: 10.0.0.0 Meta: - synthetic-node: "false" + synthetic-node: false - Node: node-02 Address: 10.0.0.1 Meta: - synthetic-node: "false" + synthetic-node: false - Node: node-03 Address: 10.0.0.2 Meta: - synthetic-node: "false" + synthetic-node: false --- When I visit the nodes page for yaml --- diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature index 91c5114aea..f33a73f837 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/navigation.feature @@ -6,19 +6,19 @@ Feature: dc / nodes / navigation --- - Node: Node-A Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" - Node: Node-B Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Node: Node-C Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: warning ServiceID: "" diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature index 8f642d394f..6a1e5b6597 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/no-leader.feature @@ -6,19 +6,19 @@ Feature: dc / nodes / no-leader --- - Node: Node-A Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" - Node: Node-B Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Node: Node-C Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: warning ServiceID: "" diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature index 3482e5d624..d529a80b71 100644 --- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature +++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sorting.feature @@ -6,37 +6,37 @@ Feature: dc / nodes / sorting --- - Node: Node-A Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" - Node: Node-B Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: passing ServiceID: "" - Node: Node-C Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: warning ServiceID: "" - Node: Node-D Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" - Node: Node-E Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: critical ServiceID: "" - Node: Node-F Meta: - synthetic-node: "false" + synthetic-node: false Checks: - Status: warning ServiceID: ""