Fx/notification interval and description (#18)

* Fix notification interval and clarify description

* Increase waiting interval

* Remove alert by label

Author: echerniak

src/main/java/dev/vality/alerting/mayday/prometheus/client/k8s/PrometheusClient.java

@@ -1,5 +1,6 @@
 package dev.vality.alerting.mayday.prometheus.client.k8s;
 
+import dev.vality.alerting.mayday.common.constant.PrometheusRuleLabel;
 import dev.vality.alerting.mayday.prometheus.client.k8s.model.PrometheusRule;
 import dev.vality.alerting.mayday.prometheus.client.k8s.model.PrometheusRuleSpec;
 import dev.vality.alerting.mayday.prometheus.client.k8s.util.PrometheusFunctionsUtil;
@@ -18,6 +19,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Component
@@ -62,10 +64,11 @@ public Set<PrometheusRuleSpec.Rule> getPrometheusRuleGroupAlerts(String ruleName
             if (rule == null) {
                 return Set.of();
             }
-            var groupAlerts = rule.getSpec().getGroups().stream()
-                    .filter(group -> group.getName().equals(groupName))
-                    .findFirst().orElse(new PrometheusRuleSpec.Group()).getRules();
-            return groupAlerts == null ? Set.of() : groupAlerts;
+            return rule.getSpec().getGroups().stream()
+                    .flatMap(group -> group.getRules().stream()
+                            .filter(rule1 -> rule1.getLabels().containsKey(PrometheusRuleLabel.USERNAME)
+                            && rule1.getLabels().get(PrometheusRuleLabel.USERNAME).equals(groupName)))
+                    .collect(Collectors.toSet());
         }
     }
 
@@ -91,6 +94,7 @@ private void modifyPrometheusRule(String ruleName,
                     prometheusRuleClient = client.resources(PrometheusRule.class);
             var rule =
                     prometheusRuleClient.inNamespace(client.getNamespace()).withName(ruleName).get();
+            log.info("Rule before modification: {}", rule);
             var resource = prometheusRuleClient.inNamespace(client.getNamespace()).resource(rule);
             var response = resource.edit(modifyFunc);
             log.info("Rule after modification: {}", response);

src/main/java/dev/vality/alerting/mayday/prometheus/client/k8s/util/PrometheusFunctionsUtil.java

@@ -1,13 +1,16 @@
 package dev.vality.alerting.mayday.prometheus.client.k8s.util;
 
+import dev.vality.alerting.mayday.common.constant.PrometheusRuleLabel;
 import dev.vality.alerting.mayday.prometheus.client.k8s.model.PrometheusRule;
 import dev.vality.alerting.mayday.prometheus.client.k8s.model.PrometheusRuleSpec;
 import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
+@Slf4j
 @UtilityClass
 public class PrometheusFunctionsUtil {
 
@@ -29,24 +32,29 @@ public static UnaryOperator<PrometheusRule> getRemoveGroupByNameFunc(String grou
     public static UnaryOperator<PrometheusRule> getRemoveAlertByGroupAndNameFunc(String groupName,
                                                                                  String alertNameForRemoval) {
         return prometheusRule -> {
+            log.info("Going to remove alert '{}' for user '{}'", alertNameForRemoval, groupName);
             var groups = prometheusRule.getSpec().getGroups();
             var groupIterator = groups.iterator();
             while (groupIterator.hasNext()) {
                 var group = groupIterator.next();
-                if (group.getName().equals(groupName)) {
-                    Set<PrometheusRuleSpec.Rule> alertRules = group.getRules();
-                    var ruleIterator = alertRules.iterator();
-                    while (ruleIterator.hasNext()) {
-                        var rule = ruleIterator.next();
-                        if (rule.getAlert().equals(alertNameForRemoval)) {
-                            ruleIterator.remove();
-                            break;
+                log.info("Found user '{}'...", group.getName());
+                Set<PrometheusRuleSpec.Rule> alertRules = group.getRules();
+                var ruleIterator = alertRules.iterator();
+                while (ruleIterator.hasNext()) {
+                    var rule = ruleIterator.next();
+                    log.info("Found rule '{}' for user '{}'...", rule.getAlert(), group.getName());
+                    if (rule.getAlert().equals(alertNameForRemoval)
+                            && rule.getLabels().get(PrometheusRuleLabel.USERNAME).equals(groupName)) {
+
+                        ruleIterator.remove();
+                        log.info("Rule '{}' for user '{}' will be removed!", rule.getAlert(), group.getName());
+
+                        if (group.getRules().isEmpty()) {
+                            log.info("User '{}'has no more rules and will be removed!", group.getName());
+                            groupIterator.remove();
                         }
+                        return prometheusRule;
                     }
-                    if (group.getRules().isEmpty()) {
-                        groupIterator.remove();
-                    }
-                    break;
                 }
             }
             return prometheusRule;
@@ -69,12 +77,14 @@ public static UnaryOperator<PrometheusRule> getAddAlertToGroupFunc(String groupN
                 rules = new HashSet<>();
                 group.setRules(rules);
             }
+            log.info("Adding alert '{}' to group '{}'", alert, group);
             rules.add(alert);
             return prometheusRule;
         };
     }
 
     public static PrometheusRuleSpec.Group createPrometheusRuleGroup(String groupName) {
+        log.info("Creating group with name '{}'", groupName);
         var group = new PrometheusRuleSpec.Group();
         group.setName(groupName);
         group.setRules(new HashSet<>());

src/main/java/dev/vality/alerting/mayday/prometheus/converter/CreateAlertDtoToPrometheusRuleConverter.java

@@ -27,6 +27,7 @@ public PrometheusRuleSpec.Rule convert(CreateAlertDto source) {
         PrometheusRuleSpec.Rule rule = new PrometheusRuleSpec.Rule();
         rule.setAlert(source.getAlertId());
         rule.setExpr(source.getPrometheusQuery());
+        rule.setDuration("1m");
         rule.setAnnotations(Map.of(PrometheusRuleAnnotation.ALERT_NAME, source.getUserFriendlyAlertName(),
                 PrometheusRuleAnnotation.ALERT_DESCRIPTION, source.getUserFriendlyAlertDescription()));
         Map<String, String> labels = new HashMap<>(k8sPrometheusRuleProperties.getAlertRule().getLabels());