Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/.gitlab/issue_templates/Service Ping reporting and monitoring.md b/.gitlab/issue_templates/Service Ping reporting and monitoring.md
index 045f13c1c40..1c0d221318b 100644
--- a/.gitlab/issue_templates/Service Ping reporting and monitoring.md
+++ b/.gitlab/issue_templates/Service Ping reporting and monitoring.md
@@ -18,7 +18,7 @@ Broken metrics issues are marked with the ~"broken metric" label.
 
 ## Prerequisites
 
-1. Make sure the SSH key is added to the local SSH agent: `ssh-add`.
+1. Add your SSH key to the local SSH agent: `ssh-add`. Your SSH key is required to connect to a Rails console from the bastion host.
 
 ## Triggering
 
@@ -97,6 +97,13 @@ Trigger some events from the User Interface.
 Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'event_name', start_date: 28.days.ago, end_date: Date.current)
 ```
 
+# Troubleshooting
+
+## Connecting to a Rails console host fails with `Permission denied (publickey).`.
+
+Make sure you add the SSH key to the local SSH agent with: `ssh-add`. If you don't add your SSH key, your key won't be forwarded
+when you run `ssh -A`, and you will not be able to connect to a Rails console host.
+
 # What to do if you get mentioned
 
 In this issue, we keep the track of new metrics added to the Service Ping, and the metrics that are timing out.