From b4a1616d7126113b9b57b5ca56046915fb1c61a2 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 3 Jul 2024 12:20:13 +0200 Subject: [PATCH 1/3] Increase alerting threshold for networt policy violations --- resources/prometheus/prometheus-rules.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/resources/prometheus/prometheus-rules.yaml b/resources/prometheus/prometheus-rules.yaml index 7db4d4d8..7a5930c9 100644 --- a/resources/prometheus/prometheus-rules.yaml +++ b/resources/prometheus/prometheus-rules.yaml @@ -780,18 +780,7 @@ for the cluster autoscaler. Limits can be adjusted by modifying the cluster auto sop_url: "https://gitlab.cee.redhat.com/stackrox/acs-cloud-service/runbooks/-/blob/master/sops/dp-043-selinux-violation.md" - alert: ClusterAuditNetworkPolicyViolations expr: | - network_policy_denials_sample_count > 0 - for: 10m - labels: - severity: info - annotations: - summary: "Network Policy Violations occuring on cluster." - description: | - A cluster node logged Network Policy ACL denial(s) for 10 minutes. - sop_url: "https://gitlab.cee.redhat.com/stackrox/acs-cloud-service/runbooks/-/blob/master/sops/dp-044-network-policy-violation.md" - - alert: ClusterAuditNetworkPolicyViolations - expr: | - network_policy_denials_sample_count >= 15 + network_policy_denials_sample_count >= 25 for: 1m labels: severity: info From 45f3e45124c260bb13161d3f4d7998bc54923ee4 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 3 Jul 2024 13:22:24 +0200 Subject: [PATCH 2/3] Update tests --- .../ClusterAuditNetworkPolicyViolations.yaml | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/resources/prometheus/unit_tests/ClusterAuditNetworkPolicyViolations.yaml b/resources/prometheus/unit_tests/ClusterAuditNetworkPolicyViolations.yaml index 18825ca3..39a8ef86 100644 --- a/resources/prometheus/unit_tests/ClusterAuditNetworkPolicyViolations.yaml +++ b/resources/prometheus/unit_tests/ClusterAuditNetworkPolicyViolations.yaml @@ -7,7 +7,7 @@ tests: - interval: 1m input_series: - series: network_policy_denials_sample_count{namespace="rhacs-cloudwatch"} - values: "15x1" + values: "25x1" alert_rule_test: - eval_time: 70s alertname: ClusterAuditNetworkPolicyViolations @@ -19,25 +19,7 @@ tests: exp_annotations: summary: "Network Policy Violations occuring on cluster." description: | - A cluster node logged at least 15 Network Policy ACL denial(s) per minute. - sop_url: "https://gitlab.cee.redhat.com/stackrox/acs-cloud-service/runbooks/-/blob/master/sops/dp-044-network-policy-violation.md" - - - interval: 1m - input_series: - - series: network_policy_denials_sample_count{namespace="rhacs-cloudwatch"} - values: "1x10" - alert_rule_test: - - eval_time: 610s - alertname: ClusterAuditNetworkPolicyViolations - exp_alerts: - - exp_labels: - alertname: ClusterAuditNetworkPolicyViolations - namespace: rhacs-cloudwatch - severity: info - exp_annotations: - summary: "Network Policy Violations occuring on cluster." - description: | - A cluster node logged Network Policy ACL denial(s) for 10 minutes. + A cluster node logged at least 25 Network Policy ACL denial(s) per minute. sop_url: "https://gitlab.cee.redhat.com/stackrox/acs-cloud-service/runbooks/-/blob/master/sops/dp-044-network-policy-violation.md" - interval: 1m @@ -52,7 +34,7 @@ tests: - interval: 1m input_series: - series: network_policy_denials_sample_count{namespace="rhacs-cloudwatch"} - values: "14x1" + values: "24x1" alert_rule_test: - eval_time: 70s alertname: ClusterAuditNetworkPolicyViolations From 12c3dfa954fc6fddf45be9ddc2b60f4cf8365dd2 Mon Sep 17 00:00:00 2001 From: Stephan Hesselmann Date: Sun, 7 Jul 2024 15:39:05 +0200 Subject: [PATCH 3/3] Revert "chore: add more automerge options (#262)" (#264) This reverts commit 5fa01d6f1edcf5c9dd89a9f245aee4b31a90e173. --- .github/workflows/automerge.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index fa22f15a..9d79c96d 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -31,6 +31,3 @@ jobs: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_METHOD: merge MERGE_FILTER_AUTHOR: github-actions[bot] - MERGE_FORKS: false - MERGE_REQUIRED_APPROVALS: 1 - UPDATE_METHOD: rebase