From a9ad4f1e66c666bd25f2566d8d9f8e758d853a42 Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Wed, 6 Jun 2018 11:27:25 +0200 Subject: [PATCH] [frontend] Add host to the Peek status bar to show which host the request is serving in the HA mode. This required that we add the hostname package to the base docker image. --- docker-files/base/Dockerfile.42.3 | 2 +- src/api/Gemfile | 1 + src/api/Gemfile.lock | 3 +++ src/api/config/initializers/peek.rb | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-files/base/Dockerfile.42.3 b/docker-files/base/Dockerfile.42.3 index 7ff5fdfa498..94f539ac982 100644 --- a/docker-files/base/Dockerfile.42.3 +++ b/docker-files/base/Dockerfile.42.3 @@ -9,7 +9,7 @@ RUN echo 'solver.allowVendorChange = true' >> /etc/zypp/zypp.conf; \ # Install requirements for all our containers RUN zypper -n install --no-recommends --replacefiles \ make gcc gcc-c++ patch curl vim vim-data psmisc \ - timezone ack glibc-locale sudo aaa_base + timezone ack glibc-locale sudo aaa_base hostname # Add our bootstrap script ADD docker-bootstrap.sh /root/bin/docker-bootstrap.sh diff --git a/src/api/Gemfile b/src/api/Gemfile index 70fdcc67d04..972b6c2d895 100644 --- a/src/api/Gemfile +++ b/src/api/Gemfile @@ -63,6 +63,7 @@ gem 'feature' # for profiling gem 'peek' gem 'peek-dalli' +gem 'peek-host' gem 'peek-mysql2' # for kerberos authentication gem 'gssapi', require: false diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock index 97948d90ae3..33f5af2517c 100644 --- a/src/api/Gemfile.lock +++ b/src/api/Gemfile.lock @@ -228,6 +228,8 @@ GEM concurrent-ruby-ext dalli peek + peek-host (1.0.0) + peek peek-mysql2 (1.2.0) concurrent-ruby concurrent-ruby-ext @@ -462,6 +464,7 @@ DEPENDENCIES nokogiri peek peek-dalli + peek-host peek-mysql2 poltergeist pry (>= 0.9.12) diff --git a/src/api/config/initializers/peek.rb b/src/api/config/initializers/peek.rb index e3e3e1cbc42..56222705f7a 100644 --- a/src/api/config/initializers/peek.rb +++ b/src/api/config/initializers/peek.rb @@ -1,2 +1,3 @@ Peek.into Peek::Views::Mysql2 Peek.into Peek::Views::Dalli +Peek.into Peek::Views::Host