summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/user/admin_area/monitoring/health_check.md4
-rw-r--r--spec/controllers/health_check_controller_spec.rb6
-rw-r--r--spec/controllers/health_controller_spec.rb6
3 files changed, 9 insertions, 7 deletions
diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md
index 16e53efda63..69a9dfc3500 100644
--- a/doc/user/admin_area/monitoring/health_check.md
+++ b/doc/user/admin_area/monitoring/health_check.md
@@ -16,8 +16,8 @@ traffic until the system is ready or restart the container as needed.
## IP Whitelist
-To access monitoring resources client IP needs to be included in the whitelist.
-To add or remove hosts or ip ranges from the list you can edit `gitlab.yml`.
+To access monitoring resources the client IP needs to be included in the whitelist.
+To add or remove hosts or IP ranges from the list you can edit `gitlab.rb` or `gitlab.yml`.
Example whitelist configuration:
```yaml
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
index 72a5602f23e..03da6287774 100644
--- a/spec/controllers/health_check_controller_spec.rb
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -36,7 +36,7 @@ describe HealthCheckController do
expect(response.content_type).to eq 'text/plain'
end
- it 'supports successful plaintest response' do
+ it 'supports passing the token in query params' do
get :index, token: token
expect(response).to be_success
@@ -50,7 +50,7 @@ describe HealthCheckController do
allow(Gitlab::RequestContext).to receive(:client_ip).and_return(whitelisted_ip)
end
- it 'supports successful plaintest response' do
+ it 'supports successful plaintext response' do
get :index
expect(response).to be_success
@@ -97,7 +97,7 @@ describe HealthCheckController do
allow(Gitlab::RequestContext).to receive(:client_ip).and_return(whitelisted_ip)
end
- it 'supports failure plaintest response' do
+ it 'supports failure plaintext response' do
get :index
expect(response).to have_http_status(500)
diff --git a/spec/controllers/health_controller_spec.rb b/spec/controllers/health_controller_spec.rb
index ce79f068fa1..94d2b420a4e 100644
--- a/spec/controllers/health_controller_spec.rb
+++ b/spec/controllers/health_controller_spec.rb
@@ -15,7 +15,9 @@ describe HealthController do
describe '#readiness' do
shared_context 'endpoint responding with readiness data' do
- subject { get :readiness }
+ let(:request_params) { {} }
+
+ subject { get :readiness, request_params }
it 'responds with readiness checks data' do
subject
@@ -58,7 +60,7 @@ describe HealthController do
context 'token passed as URL param' do
it_behaves_like 'endpoint responding with readiness data' do
- subject { get :readiness, token: token }
+ let(:request_params) { { token: token } }
end
end
end