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
This commit is contained in:
Dmitriy Zaporozhets 2019-05-27 16:06:24 +00:00
commit 785e55c23e
3 changed files with 8 additions and 1 deletions

View File

@ -15,7 +15,8 @@ class Admin::LogsController < Admin::ApplicationController
Gitlab::EnvironmentLogger,
Gitlab::SidekiqLogger,
Gitlab::RepositoryCheckLogger,
Gitlab::ProjectServiceLogger
Gitlab::ProjectServiceLogger,
Gitlab::Kubernetes::Logger
]
end
end

View File

@ -0,0 +1,5 @@
---
title: Add Kubernetes logs to Admin Logs UI
merge_request: 28685
author:
type: added

View File

@ -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