Merge changes I574c3b05,I95020080,I894e47f3,I86c5c547

* changes:
  Adapt to ytt 0.28.0
  Sort monitoring and logging components into sub-maps in the config
  Collect logs from Gerrit in Kubernetes
  Add promtail chart to collect logs from cluster
diff --git a/charts/prometheus/prometheus.yaml b/charts/prometheus/prometheus.yaml
index d5534e1..6aa5823 100644
--- a/charts/prometheus/prometheus.yaml
+++ b/charts/prometheus/prometheus.yaml
@@ -1089,6 +1089,14 @@
             annotations:
               description: '{{ $labels.instance }} has been unresponsive for 3 min.'
               summary: '{{ $labels.instance }} down'
+          - alert: ThreadDeadlock
+            expr: proc_jvm_thread_num_deadlocked_threads > 0
+            for: 1m
+            labels:
+              severity: critical
+            annotations:
+              description: '{{ $labels.instance }} has deadlocked threads.'
+              summary: '{{ $labels.instance }} deadlocks'
           - alert: SSHBatchUserScheduledTasks
             expr: queue_ssh_batch_worker_scheduled_tasks > 200
             for: 5m