diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 21:08:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 21:08:44 +0000 |
| commit | 0e9eea40b62fcae67b2bd885dbedd7525fbca3c7 (patch) | |
| tree | 099467fd4c16441f60a879239056b235c7fdabdc /doc/administration/troubleshooting | |
| parent | 1ca9950d5f890cd8f185e1eda158b969a7244fe2 (diff) | |
| download | gitlab-ce-0e9eea40b62fcae67b2bd885dbedd7525fbca3c7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/troubleshooting')
| -rw-r--r-- | doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md | 4 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/linux_cheat_sheet.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index d4719bb41dc..a4180eb638a 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -166,7 +166,7 @@ GIT_CURL_VERBOSE=1 GIT_TRACE=1 git clone <repository> # A single project project = Project.find_by_full_path('PROJECT_PATH') -# All projects in a particular namespace. Can be a username, a group +# All projects in a particular namespace. Can be a username, a group # ('gitlab-org'), or even include subgroups ('gitlab-org/distribution') namespace = Namespace.find_by_full_path('NAMESPACE_PATH') projects = namespace.all_projects @@ -997,7 +997,7 @@ gitlab_rails['env'] = { } ``` -Then `gitlab-ctl reconfigure; gitlab-ctl restart sidekiq`. The Sidekiq logs will now include additional data for troubleshooting. +Then `gitlab-ctl reconfigure; gitlab-ctl restart sidekiq`. The Sidekiq logs will now include additional data for troubleshooting. ### Sidekiq kill signals diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md index 0ad1f028f20..d53745c58b3 100644 --- a/doc/administration/troubleshooting/linux_cheat_sheet.md +++ b/doc/administration/troubleshooting/linux_cheat_sheet.md @@ -133,7 +133,7 @@ sudo !! ### Memory, Disk, & CPU usage ```shell -# disk space info. The '-h' gives the data in human-readable values +# disk space info. The '-h' gives the data in human-readable values df -h # size of each file/dir and its contents in the current dir @@ -186,7 +186,7 @@ Be aware that strace can have major impacts to system performance when it is run ### The Strace Parser tool Our [strace-parser tool](https://gitlab.com/wchandler/strace-parser) can be used to -provide a high level summary of the `strace` output. It is similar to `strace -C`, +provide a high level summary of the `strace` output. It is similar to `strace -C`, but provides much more detailed statistics. MacOS and Linux binaries [are available](https://gitlab.com/gitlab-com/support/toolbox/strace-parser/-/tags), @@ -198,7 +198,7 @@ First run the tool with no arguments other than the strace output file name to g a summary of the top processes sorted by time spent actively performing tasks. You can also sort based on total time, # of syscalls made, PID #, and # of child processes using the `-S` or `--sort` flag. The number of results defaults to 25 processes, but -can be changed using the `-c`/`--count` option. See `--help` for full details. +can be changed using the `-c`/`--count` option. See `--help` for full details. ```shell $ ./strace-parser strace.txt |