Merge branch 'master' into make-rsync-use-ssh-args

ansible/roles/apps/templates/monitoring-values.yaml

@@ -92,9 +92,9 @@ additionalPrometheusRulesMap:
           severity: warning
       - alert: KubeQuotaExceeded
         annotations:
-          {% raw %}
+{%- raw %}
           message: Namespace {{`{{ $labels.namespace }}`}} is using {{`{{ printf "%0.0f" $value }}`}}% of its {{`{{ $labels.resource }}`}} quota.
-          {% endraw %}
+{% endraw %}
           runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotaexceeded
         expr: |-
           100 * kube_resourcequota{job="kube-state-metrics", type="used"}
@@ -106,9 +106,9 @@ additionalPrometheusRulesMap:
           severity: warning
       - alert: CPUThrottlingHigh
         annotations:
-          {% raw %}
+{%- raw %}
           message: '{{ printf "%0.0f" $value }}% throttling of CPU in namespace {{ $labels.namespace }} for container {{ $labels.container_name }} in pod {{ $labels.pod_name }}.'
-          {% endraw %}
+{% endraw %}
           runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-cputhrottlinghigh
         expr: |-
           100 * sum(increase(container_cpu_cfs_throttled_periods_total{container_name!="", }[5m])) by (container_name, pod_name, namespace)