Merge remote-tracking branch 'upstream/6.x'

Author: basepi

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     -   id: isort
         exclude: "(elasticapm/utils/wrapt/.*|tests/utils/stacks/linenos.py|tests/utils/stacks/linenos2.py|tests/contrib/grpc/grpc_app/.*pb2.*.py)"

docs/flask.asciidoc

@@ -23,6 +23,10 @@ NOTE: If you use Flask with uwsgi, make sure to
 http://uwsgi-docs.readthedocs.org/en/latest/Options.html#enable-threads[enable
 threads].
 
+NOTE: If you see an error log that mentions `psutil not found`, you can install
+`psutil` using `pip install psutil`, or add `psutil` to your `requirements.txt`
+file.
+
 [float]
 [[flask-setup]]
 ==== Setup