updated config settings, removed grafana part since it's deprecated, see INFRA-10412
So most of the changes are just new config options or removal of old ones. Most of them are commented out.
The part I removed was the grafana section since it's deprecated and causes issue when updating gitlab. I just want some eyes that I didn't accidently include or remove an important config flag/option