From 44b836df5d65922ca7ce09a3517829874517d66f Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 5 Dec 2019 15:48:33 +0100
Subject: [PATCH] Fix prometheus-settings secret
Fixes: #420
---
ansible/roles/apps/templates/monitoring-values.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/apps/templates/monitoring-values.yaml b/ansible/roles/apps/templates/monitoring-values.yaml
index 1d4bf9f79..c36732059 100644
--- a/ansible/roles/apps/templates/monitoring-values.yaml
+++ b/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)
--
GitLab