Update from suggestions

stackrox · Aug 26, 2024 · a97705f · a97705f
1 parent 3d20adc
commit a97705f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/resources/prometheus/prometheus-rules.yaml b/resources/prometheus/prometheus-rules.yaml
@@ -128,17 +128,17 @@ spec:
             summary: "Fleetshard synchronizer container `{{ $labels.pod }}/{{ $labels.container }}` in namespace `{{ $labels.namespace }}` restarted more than 3 times."
             description: "Fleetshard synchronizer container `{{ $labels.pod }}/{{ $labels.container }}` in namespace `{{ $labels.namespace }}` has restarted more than 3 times during the last 30 minutes."
             sop_url: "https://gitlab.cee.redhat.com/stackrox/acs-managed-service-runbooks/blob/master/sops/dp-005-fleetshard-sync-unavailable.md"
-        - alert: RHACSFleetshardCertificateExpiringCritical
+        - alert: RHACSFleetshardCertificateExpiryCritical
           expr: |
-            acs_fleetshard_certificate_expiration_timestamp <=1 * 24 * 60 * 60 + time()
+            acs_fleetshard_certificate_expiration_timestamp <= 1 * 24 * 60 * 60 + time()
           labels:
             severity: critical
           annotations:
             summary: "Certificate expiring very soon: `{{ $labels.exported_namespace }}/{{ $labels.secret }}/{{ $labels.data_key }}`."
             description: "Certificate `{{ $labels.exported_namespace }}/{{ $labels.secret }}/{{ $labels.data_key }}` expires on {{ humanizeTimestamp $value}}."
-        - alert: RHACSFleetshardCertificateExpiringSoon
+        - alert: RHACSFleetshardCertificateExpiryWarning
           expr: |
-            acs_fleetshard_certificate_expiration_timestamp <=7* 24 * 60 * 60 + time()
+            acs_fleetshard_certificate_expiration_timestamp <= 7* 24 * 60 * 60 + time()
           labels:
             severity: warning
           annotations:

diff --git a/resources/prometheus/unit_tests/RHACSFleetschardCertificateExpiring.yaml b/resources/prometheus/unit_tests/RHACSFleetschardCertificateExpiring.yaml
@@ -11,13 +11,13 @@ tests:
 
     alert_rule_test:
       - eval_time: 0
-        alertname: RHACSFleetshardCertificateExpiringSoon
+        alertname: RHACSFleetshardCertificateExpiryWarning
         exp_alerts: [ ]
       - eval_time: 3d
-        alertname: RHACSFleetshardCertificateExpiringSoon
+        alertname: RHACSFleetshardCertificateExpiryWarning
         exp_alerts:
           - exp_labels:
-              alertname: RHACSFleetshardCertificateExpiringSoon
+              alertname: RHACSFleetshardCertificateExpiryWarning
               exported_namespace: rhacs-00000000000000000000
               secret: secret
               data_key: key
@@ -26,10 +26,10 @@ tests:
               summary: "Certificate expiring soon: `rhacs-00000000000000000000/secret/key`."
               description: "Certificate `rhacs-00000000000000000000/secret/key` expires on 1970-01-09 00:00:00 +0000 UTC."
       - eval_time: 7d
-        alertname: RHACSFleetshardCertificateExpiringCritical
+        alertname: RHACSFleetshardCertificateExpiryCritical
         exp_alerts:
           - exp_labels:
-              alertname: RHACSFleetshardCertificateExpiringCritical
+              alertname: RHACSFleetshardCertificateExpiryCritical
               exported_namespace: rhacs-00000000000000000000
               secret: secret
               data_key: key
@@ -38,10 +38,10 @@ tests:
               summary: "Certificate expiring very soon: `rhacs-00000000000000000000/secret/key`."
               description: "Certificate `rhacs-00000000000000000000/secret/key` expires on 1970-01-09 00:00:00 +0000 UTC."
       - eval_time: 10d
-        alertname: RHACSFleetshardCertificateExpiringCritical
+        alertname: RHACSFleetshardCertificateExpiryCritical
         exp_alerts:
           - exp_labels:
-              alertname: RHACSFleetshardCertificateExpiringCritical
+              alertname: RHACSFleetshardCertificateExpiryCritical
               exported_namespace: rhacs-00000000000000000000
               secret: secret
               data_key: key