diff --git a/projects/control-service/CHANGELOG.md b/projects/control-service/CHANGELOG.md index 529299335c..a66a02f3df 100644 --- a/projects/control-service/CHANGELOG.md +++ b/projects/control-service/CHANGELOG.md @@ -12,10 +12,16 @@ MAJOR.MINOR - dd.MM.yyyy * **Breaking Changes** +1.3 - 25.10.2021 +---- +* **Improvement** + * Add Kubernetes namespace as label to notification alerts. + + 1.3 - 21.10.2021 ---- * **Bug fixes** - * Clean up metrics when data jobs are deleted + * Clean up metrics when data jobs are deleted. 1.3 - 08.10.2021 diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml index 752665b9a9..b871b8c5f3 100644 --- a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml +++ b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml @@ -494,7 +494,7 @@ alerting: (avg by(data_job) (taurus_datajob_termination_status) * on(data_job) group_left(email_notified_on_success) avg by(data_job, email_notified_on_success) (taurus_datajob_info{email_notified_on_success!=""}) == bool 0) - * on(data_job) group_left(job_name) + * on(data_job) group_left(job_name, namespace) topk by(data_job) (1, label_replace(kube_job_status_completion_time, "data_job", "$1", "job_name", "(.*)-.*")) != 0, "execution_id", "$1", "job_name", "(.*)")`}} JobDelay: @@ -535,7 +535,7 @@ alerting: avg by(data_job, email_notified_on_platform_error) (taurus_datajob_info{email_notified_on_platform_error!=""}) < on(data_job) - group_right(email_notified_on_platform_error) + group_right(email_notified_on_platform_error, namespace) -(min by(data_job) (taurus_datajob_notification_delay) * 60), "execution_id", "$1", "data_job", "(.*)")`}} JobFailurePlatform: @@ -572,7 +572,7 @@ alerting: (max by(data_job) (taurus_datajob_termination_status) * on(data_job) group_left(email_notified_on_platform_error) avg by(data_job, email_notified_on_platform_error) (taurus_datajob_info{email_notified_on_platform_error!=""}) == bool 1) - * on(data_job) group_left(job_name) + * on(data_job) group_left(job_name, namespace) topk by(data_job) (1, label_replace(kube_job_failed * on(job_name) group_left() kube_job_status_start_time, "data_job", "$1", "job_name", "(.*)-.*")) != 0, "execution_id", "$1", "job_name", "(.*)"), "short_execution_id", "$1", "execution_id", "([a-zA-Z -_]{1,58}).*")`}} @@ -610,7 +610,7 @@ alerting: (max by(data_job) (taurus_datajob_termination_status) * on(data_job) group_left(email_notified_on_user_error) avg by(data_job, email_notified_on_user_error) (taurus_datajob_info{email_notified_on_user_error!=""}) == bool 3) - * on(data_job) group_left(job_name) + * on(data_job) group_left(job_name, namespace) topk by(data_job) (1, label_replace(kube_job_status_start_time, "data_job", "$1", "job_name", "(.*)-.*")) != 0, "execution_id", "$1", "job_name", "(.*)"), "short_execution_id", "$1", "execution_id", "([a-zA-Z -_]{1,58}).*")`}}