diff --git a/Helmsman/dsf/prereq-dsf.yaml b/Helmsman/dsf/prereq-dsf.yaml index 17fc48cc..d4f0b73f 100644 --- a/Helmsman/dsf/prereq-dsf.yaml +++ b/Helmsman/dsf/prereq-dsf.yaml @@ -42,14 +42,14 @@ apps: version: 103.1.0+up45.31.1 chart: mosip/rancher-monitoring set: - grafana.global.cattle.clusterId: "c-m-pbrcfglw" - global.cattle.clusterId: "c-m-pbrcfglw" + grafana.global.cattle.clusterId: "" + global.cattle.clusterId: "" wait: true - valuesFile: "$WORKDIR/utils/monitoring_values.yaml" + valuesFile: "$WORKDIR/utils/monitoring_values.yaml" priority: -5 timeout: 600 hooks: - postInstall: "$WORKDIR/hooks/alerting-setup.sh" + postInstall: "$WORKDIR/hooks/alerting-setup.sh " elasticsearch: namespace: cattle-logging-system diff --git a/Helmsman/hooks/alerting-setup.sh b/Helmsman/hooks/alerting-setup.sh index 340e86b7..0d3fbd71 100755 --- a/Helmsman/hooks/alerting-setup.sh +++ b/Helmsman/hooks/alerting-setup.sh @@ -6,9 +6,9 @@ NS=cattle-monitoring-system function installing_alerting() { # Define the Slack channel, Slack_api_url and Cluster name dynamically - SLACK_CHANNEL="soil" - SLACK_API_URL="https://hooks.slack.com/services/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" - ENV_NAME="soil" + SLACK_CHANNEL="$1" + SLACK_API_URL="$2" + ENV_NAME="$3" ALERTMANAGER_FILE="$WORKDIR/utils/alerting/alertmanager.yaml" PATCH_CLUSTER_NAME_FILE="$WORKDIR/utils/alerting/patch-cluster-name.yaml" diff --git a/Helmsman/utils/alerting/alertmanager.yaml b/Helmsman/utils/alerting/alertmanager.yaml index d77e221f..80c0891b 100644 --- a/Helmsman/utils/alerting/alertmanager.yaml +++ b/Helmsman/utils/alerting/alertmanager.yaml @@ -1,7 +1,7 @@ --- global: resolve_timeout: 5m - slack_api_url: https://hooks.slack.com/services/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 + slack_api_url: route: group_by: - namespace @@ -104,7 +104,7 @@ receivers: - name: 'null' - name: 'slack' slack_configs: - - channel: 'soil' + - channel: '' send_resolved: true title: '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] Monitoring Event Notification' diff --git a/Helmsman/utils/alerting/patch-cluster-name.yaml b/Helmsman/utils/alerting/patch-cluster-name.yaml index 93ff0da6..43a1eab3 100644 --- a/Helmsman/utils/alerting/patch-cluster-name.yaml +++ b/Helmsman/utils/alerting/patch-cluster-name.yaml @@ -1,3 +1,3 @@ spec: externalLabels: - cluster: soil + cluster: