diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 11:31:29 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 11:31:29 +0000 |
commit | 5d8bb33d48826abc7cd348a7c151c5b6985f0ade (patch) | |
tree | 24fdd6e911e931888c7786302016e603543c68f7 /app | |
parent | 4251c6565fa18ecd64befe3a2561df30d48d1846 (diff) | |
parent | 94a3dbca33634dd4f6a1de8b14cd2a4f0a9a0abc (diff) | |
download | gitlab-ce-5d8bb33d48826abc7cd348a7c151c5b6985f0ade.tar.gz |
Merge branch 'zj-gitaly-server-info' into 'master'
Gitaly Server info for admin panel
See merge request gitlab-org/gitlab-ce!16794
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/admin/gitaly_servers_controller.rb | 5 | ||||
-rw-r--r-- | app/views/admin/dashboard/index.html.haml | 10 | ||||
-rw-r--r-- | app/views/admin/gitaly_servers/index.html.haml | 31 |
3 files changed, 38 insertions, 8 deletions
diff --git a/app/controllers/admin/gitaly_servers_controller.rb b/app/controllers/admin/gitaly_servers_controller.rb new file mode 100644 index 00000000000..11c4dfe3d8d --- /dev/null +++ b/app/controllers/admin/gitaly_servers_controller.rb @@ -0,0 +1,5 @@ +class Admin::GitalyServersController < Admin::ApplicationController + def index + @gitaly_servers = Gitaly::Server.all + end +end diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 509f559c120..d251f75a8fd 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -138,20 +138,12 @@ GitLab API %span.pull-right = API::API::version - %p - Gitaly - %span.pull-right - = Gitlab::GitalyClient.expected_server_version - if Gitlab.config.pages.enabled %p GitLab Pages %span.pull-right = Gitlab::Pages::VERSION %p - Git - %span.pull-right - = Gitlab::Git.version - %p Ruby %span.pull-right #{RUBY_VERSION}p#{RUBY_PATCHLEVEL} @@ -163,6 +155,8 @@ = Gitlab::Database.adapter_name %span.pull-right = Gitlab::Database.version + %p + = link_to "Gitaly Servers", admin_gitaly_servers_path .row .col-md-4 .info-well diff --git a/app/views/admin/gitaly_servers/index.html.haml b/app/views/admin/gitaly_servers/index.html.haml new file mode 100644 index 00000000000..231f94dc95d --- /dev/null +++ b/app/views/admin/gitaly_servers/index.html.haml @@ -0,0 +1,31 @@ +- breadcrumb_title _("Gitaly Servers") + +%h3.page-title= _("Gitaly Servers") +%hr +.gitaly_servers + - if @gitaly_servers.any? + .table-holder + %table.table.responsive-table + %thead.hidden-sm.hidden-xs + %tr + %th= _("Storage") + %th= n_("Gitaly|Address") + %th= _("Server version") + %th= _("Git version") + %th= _("Up to date") + - @gitaly_servers.each do |server| + %tr + %td + = server.storage + %td + = server.address + %td + = server.server_version + %td + = server.git_binary_version + %td + = boolean_to_icon(server.up_to_date?) + - else + .empty-state + .text-center + %h4= _("No connection could be made to a Gitaly Server, please check your logs!") |