Commit dec75a9c authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre Committed by Kushal Pandya

Show GitLab version for each node in the status page

parent 256b12da
...@@ -29,6 +29,7 @@ class GeoNodeStatus { ...@@ -29,6 +29,7 @@ class GeoNodeStatus {
this.$lastEventSeen = $('.js-last-event-seen', this.$status); this.$lastEventSeen = $('.js-last-event-seen', this.$status);
this.$lastCursorEvent = $('.js-last-cursor-event', this.$status); this.$lastCursorEvent = $('.js-last-cursor-event', this.$status);
this.$health = $('.js-health-message', this.$status.parent()); this.$health = $('.js-health-message', this.$status.parent());
this.$version = $('.js-gitlab-version', this.$status);
this.endpoint = this.$el.data('status-url'); this.endpoint = this.$el.data('status-url');
this.$advancedStatus = $('.js-advanced-geo-node-status-toggler', this.$status.parent()); this.$advancedStatus = $('.js-advanced-geo-node-status-toggler', this.$status.parent());
this.$advancedStatus.on('click', GeoNodeStatus.toggleShowAdvancedStatus.bind(this)); this.$advancedStatus.on('click', GeoNodeStatus.toggleShowAdvancedStatus.bind(this));
...@@ -182,6 +183,7 @@ class GeoNodeStatus { ...@@ -182,6 +183,7 @@ class GeoNodeStatus {
healthStatus: status.health_status, healthStatus: status.health_status,
healthMessage: status.health, healthMessage: status.health,
}); });
this.$version.text(status.version);
// Replication lag can be nil if the secondary isn't actually streaming // Replication lag can be nil if the secondary isn't actually streaming
if (status.db_replication_lag_seconds !== null && status.db_replication_lag_seconds >= 0) { if (status.db_replication_lag_seconds !== null && status.db_replication_lag_seconds >= 0) {
......
...@@ -29,14 +29,25 @@ ...@@ -29,14 +29,25 @@
.node-badge.current-node Current node .node-badge.current-node Current node
- if node.primary? - if node.primary?
.node-badge.primary-node Primary .node-badge.primary-node Primary
%span.help-block Primary node %p
%span.help-block Primary node
%p
%span.help-block
Gitlab version:
%strong.node-info= Gitlab::VERSION
- else - else
= status_loading_icon = status_loading_icon
%table.geo-node-status.js-geo-node-status.hidden %table.geo-node-status.js-geo-node-status.hidden
%tr
%td
.help-block
GitLab Version:
%td
.node-info.prepend-top-10.prepend-left-5.js-gitlab-version
- if node.enabled? - if node.enabled?
%tr %tr
%td %td
.help-block .help-block.prepend-top-10
Health Status: Health Status:
%td %td
.health-status.prepend-top-10.prepend-left-5.js-health-status .health-status.prepend-top-10.prepend-left-5.js-health-status
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment