fix mistakes in ansible playbooks

ansible/roles/apps/tasks/main.yml

@@ -9,8 +9,11 @@
 - name: Tasks pertaining to nginx
   import_tasks: nginx.yml
 
-- name: Tasks pertaining to monitoring
-  import_tasks: monitoring.yml
+- name: Tasks pertaining to prometheus
+  import_tasks: prometheus.yml
+
+- name: Tasks pertaining to grafana
+  import_tasks: grafana.yml
 
 - name: Tasks pertaining to Single sign-on
   import_tasks: single-sign-on.yml

ansible/roles/apps/templates/prometheus-settings.yaml

 alertmanager:
   persistentVolume:
     existingClaim: "alertmanager"
-
-server:
-  persistentVolume:
-    existingClaim: "prometheus-server"
-
-serverFiles:
-  alerting_rules.yml:
-  - name: kubernetes-resources
-    rules:
-    - alert: KubeCPUOvercommit
-      annotations:
-        message: Cluster has overcommitted CPU resource requests for Namespaces.
-        runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecpuovercommit
-      expr: |-
-        sum(kube_resourcequota{job="kube-state-metrics", type="hard", resource="cpu"})
-          /
-        sum(node:node_num_cpu:sum)
-          > 1.5
-      for: 5m
-      labels:
-        severity: warning
-    - alert: KubeMemOvercommit
-      annotations:
-        message: Cluster has overcommitted memory resource requests for Namespaces.
-        runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubememovercommit
-      expr: |-
-        sum(kube_resourcequota{job="kube-state-metrics", type="hard", resource="memory"})
-          /
-        sum(node_memory_MemTotal_bytes{job="node-exporter"})
-          > 1.5
-      for: 5m
-      labels:
-        severity: warning
-    - alert: KubeQuotaExceeded
-      annotations:
-{%- raw %}
-        message: Namespace {{`{{ $labels.namespace }}`}} is using {{`{{ printf "%0.0f" $value }}`}}% of its {{`{{ $labels.resource }}`}} quota.
-{% 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"}
-          / ignoring(instance, job, type)
-        (kube_resourcequota{job="kube-state-metrics", type="hard"} > 0)
-          > 90
-      for: 15m
-      labels:
-        severity: warning
-    - alert: CPUThrottlingHigh
-      annotations:
-{%- raw %}
-        message: '{{ printf "%0.0f" $value }}% throttling of CPU in namespace {{ $labels.namespace }} for container {{ $labels.container_name }} in pod {{ $labels.pod_name }}.'
-{% 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)
-          /
-        sum(increase(container_cpu_cfs_periods_total{}[5m])) by (container_name, pod_name, namespace)
-          > 25
-      for: 15m
-      labels:
-        severity: warning
-
+# server:
+#   persistentVolume:
+#     existingClaim: "prometheus-server"
+# 
+# serverFiles:
+#   alerting_rules.yml:
+#   - name: kubernetes-resources
+#     rules:
+#     - alert: KubeCPUOvercommit
+#       annotations:
+#         message: Cluster has overcommitted CPU resource requests for Namespaces.
+#         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecpuovercommit
+#       expr: |-
+#         sum(kube_resourcequota{job="kube-state-metrics", type="hard", resource="cpu"})
+#           /
+#         sum(node:node_num_cpu:sum)
+#           > 1.5
+#       for: 5m
+#       labels:
+#         severity: warning
+#     - alert: KubeMemOvercommit
+#       annotations:
+#         message: Cluster has overcommitted memory resource requests for Namespaces.
+#         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubememovercommit
+#       expr: |-
+#         sum(kube_resourcequota{job="kube-state-metrics", type="hard", resource="memory"})
+#           /
+#         sum(node_memory_MemTotal_bytes{job="node-exporter"})
+#           > 1.5
+#       for: 5m
+#       labels:
+#         severity: warning
+#     - alert: KubeQuotaExceeded
+#       annotations:
+# {%- raw %}
+#         message: Namespace {{`{{ $labels.namespace }}`}} is using {{`{{ printf "%0.0f" $value }}`}}% of its {{`{{ $labels.resource }}`}} quota.
+# {% 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"}
+#           / ignoring(instance, job, type)
+#         (kube_resourcequota{job="kube-state-metrics", type="hard"} > 0)
+#           > 90
+#       for: 15m
+#       labels:
+#         severity: warning
+#     - alert: CPUThrottlingHigh
+#       annotations:
+# {%- raw %}
+#         message: '{{ printf "%0.0f" $value }}% throttling of CPU in namespace {{ $labels.namespace }} for container {{ $labels.container_name }} in pod {{ $labels.pod_name }}.'
+# {% 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)
+#           /
+#         sum(increase(container_cpu_cfs_periods_total{}[5m])) by (container_name, pod_name, namespace)
+#           > 25
+#       for: 15m
+#       labels:
+#         severity: warning
+#