From 289e6cd9ec2410c820b14c65477185d00ee8fb41 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@users.noreply.github.com>
Date: Thu, 25 Feb 2021 06:56:48 +0000
Subject: [PATCH] Adding override for monitoring helm charts addition (#2281)
If you want to add one more chart in to the monitoring stack,
Rather than overriding the complete variable,
you can override it in common.yaml
Signed-off-by: Rajesh Rajendran <rajesh.r@optit.co>
---
.../sunbird-monitoring/defaults/main.yml | 33 +++++++++++--------
.../roles/sunbird-monitoring/tasks/main.yml | 4 +--
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
index 211cf8802..b65da6b62 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml
@@ -12,17 +12,23 @@ monitoring_stack:
- kafka-topic-exporter
- prometheus-redis-exporter
- processing-kafka-exporter
- - azure-ambari-prometheus-exporter
+
+# Variable to add additional charts in monitoring.
+# eg:
+# monitoring_stack_additional_charts:
+ # - custom_chart1
+ # - custom_monitoring_chart2
+monitoring_stack_additional_charts:
namespace: monitoring
-monitor_alerts_mail_from_email:
-monitor_alerts_mail_server_host:
+monitor_alerts_mail_from_email:
+monitor_alerts_mail_server_host:
monitor_alerts_mail_server_port: 587
-monitor_alerts_mail_server_username:
-monitor_alerts_mail_server_password:
-monitor_alerts_slack_url:
-monitor_alerts_slack_channel:
+monitor_alerts_mail_server_username:
+monitor_alerts_mail_server_password:
+monitor_alerts_slack_url:
+monitor_alerts_slack_channel:
env: dev
kubernetes_cluster_name: kubernetes-1
#dp_monitor_alerts_slack_channel: "{{ monitor_alerts_slack_channel }}"
@@ -69,7 +75,7 @@ alert_teams:
- cassandra_.*
- elasticsearch_.*
- logstash_.*
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ lp_process_exporter_team_mailing_list_critical }}"
- severity: fatal
@@ -85,7 +91,7 @@ alert_teams:
- historical.*
- broker.*
- middle-Manager.*
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ druid_team_mailing_list_critical }}"
- severity: fatal
@@ -100,7 +106,7 @@ alert_teams:
- kafka_.*
- zookeeper_.*
- yarn_.*
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ dp_process_exporter_team_mailing_list_critical }}"
- severity: fatal
@@ -110,7 +116,7 @@ alert_teams:
alerts_mailing_list: "{{ node_exporter_team_mailing_list }}"
services:
- .*node-exporter
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ node_exporter_team_mailing_list_critical }}"
- severity: fatal
@@ -120,7 +126,7 @@ alert_teams:
alerts_mailing_list: "{{ elasticsearch_exporter_team_mailing_list }}"
services:
- .*elasticsearch-exporter
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ elasticsearch_exporter_team_mailing_list_critical }}"
- severity: fatal
@@ -130,7 +136,7 @@ alert_teams:
alerts_mailing_list: "{{ blackbox_exporter_team_mailing_list }}"
services:
- .*-service
- severity_mailing_filter:
+ severity_mailing_filter:
- severity: critical
alerts_mailing_list: "{{ blackbox_exporter_team_mailing_list_critical }}"
- severity: fatal
@@ -214,4 +220,3 @@ redis_process_names: ""
vault_azure_spark_cluster_http_password: ""
azure_spark_cluster_http_password: "{{ vault_azure_spark_cluster_http_password }}"
-
diff --git a/kubernetes/ansible/roles/sunbird-monitoring/tasks/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/tasks/main.yml
index 5083041ba..508e7cbaa 100644
--- a/kubernetes/ansible/roles/sunbird-monitoring/tasks/main.yml
+++ b/kubernetes/ansible/roles/sunbird-monitoring/tasks/main.yml
@@ -4,11 +4,11 @@
template:
src: "{{ item }}.yaml"
dest: "/tmp/{{item}}.yaml"
- with_items: "{{ monitoring_stack }}"
+ with_items: "{{ monitoring_stack + monitoring_stack_additional_charts }}"
- name: Creating sunbird monitoring stack
shell: helm upgrade --install --atomic --timeout {{helm_install_timeout | d("10m")}} {{ item }} {{chart_path}}/{{ item }} --namespace monitoring -f /tmp/{{ item }}.yaml
- with_items: "{{ monitoring_stack }}"
+ with_items: "{{ monitoring_stack + monitoring_stack_additional_charts }}"
- name: Creating sunbird monitoring grafana dashboards
shell: "helm upgrade --install grafana-dashboards {{chart_path}}/dashboards --namespace monitoring"
--
GitLab