diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-05-27 16:06:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-05-27 16:06:24 +0000 |
| commit | 785e55c23ee2480ef90510dcf63b5a7a2c6fe9ce (patch) | |
| tree | 0de00ec594a6e0ed3a3c95c4cf3f131cdb8a7896 | |
| parent | 78dd828f7223f1e1485dbe9d34dbf037593bfa80 (diff) | |
| parent | 26878c087a13417620a11375f4091dd008307876 (diff) | |
| download | gitlab-ce-785e55c23ee2480ef90510dcf63b5a7a2c6fe9ce.tar.gz | |
Merge branch '62253-add-kubernetes-logs-to-monitoring-ui' into 'master'
Add Kubernetes logs to monitoring UI
Closes #62253
See merge request gitlab-org/gitlab-ce!28685
| -rw-r--r-- | app/controllers/admin/logs_controller.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml | 5 | ||||
| -rw-r--r-- | spec/features/admin/admin_browses_logs_spec.rb | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb index 06b0e6a15a3..704e727b1da 100644 --- a/app/controllers/admin/logs_controller.rb +++ b/app/controllers/admin/logs_controller.rb @@ -15,7 +15,8 @@ class Admin::LogsController < Admin::ApplicationController Gitlab::EnvironmentLogger, Gitlab::SidekiqLogger, Gitlab::RepositoryCheckLogger, - Gitlab::ProjectServiceLogger + Gitlab::ProjectServiceLogger, + Gitlab::Kubernetes::Logger ] end end diff --git a/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml b/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml new file mode 100644 index 00000000000..c01106a15ec --- /dev/null +++ b/changelogs/unreleased/62253-add-kubernetes-logs-to-monitoring-ui.yml @@ -0,0 +1,5 @@ +--- +title: Add Kubernetes logs to Admin Logs UI +merge_request: 28685 +author: +type: added diff --git a/spec/features/admin/admin_browses_logs_spec.rb b/spec/features/admin/admin_browses_logs_spec.rb index 02f50d7e27f..1f83d04d9aa 100644 --- a/spec/features/admin/admin_browses_logs_spec.rb +++ b/spec/features/admin/admin_browses_logs_spec.rb @@ -13,5 +13,6 @@ describe 'Admin browses logs' do expect(page).to have_link 'test.log' expect(page).to have_link 'sidekiq.log' expect(page).to have_link 'repocheck.log' + expect(page).to have_link 'kubernetes.log' end end |