* 'master' of gitlab.com:gitlab-com/runbooks:
  Update alerts_manual.md
  How to add more slack channels to alertmanager
  Add information about available channels for alertmanager
  Add documentation about snapshot backups from chef
  Add support for killing a Sidekiq Job ID
  Update manage-chef.md
  Update oncall.md
  Update elasticsearch.md
  Update the documentation on runners cache disk space
  add link to on-call log
  Add section of things to do while on-call

* dev/master:
  Update runners_cache_disk_space.md
  Recording rule for gitlab-pages status codes

# Conflicts:
#   alerts/db-under-heavy-load.rules
#   alerts/git-cat-file.rules
#   alerts/postgresql-replication-status.rules

Adjust `FOR` interval on alerts to avoid scrape failure induced alert flapping.