Commit 785e55c2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 78dd828f 26878c08
...@@ -15,7 +15,8 @@ class Admin::LogsController < Admin::ApplicationController ...@@ -15,7 +15,8 @@ class Admin::LogsController < Admin::ApplicationController
Gitlab::EnvironmentLogger, Gitlab::EnvironmentLogger,
Gitlab::SidekiqLogger, Gitlab::SidekiqLogger,
Gitlab::RepositoryCheckLogger, Gitlab::RepositoryCheckLogger,
Gitlab::ProjectServiceLogger Gitlab::ProjectServiceLogger,
Gitlab::Kubernetes::Logger
] ]
end end
end end
---
title: Add Kubernetes logs to Admin Logs UI
merge_request: 28685
author:
type: added
...@@ -13,5 +13,6 @@ describe 'Admin browses logs' do ...@@ -13,5 +13,6 @@ describe 'Admin browses logs' do
expect(page).to have_link 'test.log' expect(page).to have_link 'test.log'
expect(page).to have_link 'sidekiq.log' expect(page).to have_link 'sidekiq.log'
expect(page).to have_link 'repocheck.log' expect(page).to have_link 'repocheck.log'
expect(page).to have_link 'kubernetes.log'
end end
end end
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