diff --git a/ui/packages/consul-ui/app/components/consul/node/list/index.hbs b/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
index c1392bd686..f57d7d5ab0 100644
--- a/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
@@ -50,5 +50,17 @@ as |item index|>
{{item.Address}}
+
+ -
+ ConsulVersion
+
+ -
+ {{!-- Displaying consul version from node meta data --}}
+ {{#if item.Meta.consul-version}}
+
+ v{{item.Meta.consul-version}}
+ {{/if}}
+
+
diff --git a/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
index 3aa8681812..47759b155d 100644
--- a/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
@@ -19,12 +19,14 @@
)
)
- (t (concat "components.consul.node.search-bar." search.status.value)
- default=(array
- (concat "common.search." search.status.value)
- (concat "common.consul." search.status.value)
- (concat "common.brand." search.status.value)
- )
+ (if search.status.value
+ search.status.value
+ (t (concat "components.consul.node.search-bar." search.status.value)
+ default=(array
+ (concat "common.search." search.status.value)
+ (concat "common.consul." search.status.value)
+ (concat "common.brand." search.status.value)
+ ))
)
as |key value|}}
@@ -95,6 +97,27 @@ as |key value|}}
{{/let}}
+
+
+
+ {{t "common.consul.version"}}
+
+
+
+ {{#let components.Optgroup components.Option as |Optgroup Option|}}
+ {{#each @versions as |version|}}
+
+ {{/each}}
+ {{/let}}
+
+
<:sort as |search|>
{{t "common.sort.alpha.asc"}}
+
{{/let}}
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 4d0eb2e3ab..56f7676c49 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
@@ -40,10 +40,15 @@
change=(action (mut searchproperty) value='target.selectedItems')
default=this._searchProperties
)
+ version=(hash
+ value=(if this.version (split this.version ',') undefined)
+ change=(action (mut this.version) value='target.selectedItems')
+ )
)
api.data
leader.data
- as |sort filters items leader|
+ api.data.meta.versions
+ as |sort filters items leader versions|
}}
{{#let (reject-by 'Meta.synthetic-node' items) as |filtered|}}
@@ -61,6 +66,7 @@
@onsearch={{action (mut search) value='target.value'}}
@sort={{sort}}
@filter={{filters}}
+ @versions={{versions}}
/>
{{/if}}