fix: rm home alerts (#1706)

Co-authored-by: Ferruh Cihan <[email protected]>
Co-authored-by: Jehoszafat Zimnowoda <[email protected]>

Author: 3 people

apps.yaml

@@ -303,7 +303,6 @@ appsInfo:
     license: Apache 2.0
     about: Sealed Secrets is a Kubernetes Custom Resource Definition Controller which allows you to store even sensitive information in Git repositories.
     integration: APL uses Sealed Secrets to provide a secure way to store Kubernetes secrets in Git repositories. Sealed Secrets can be used to store secrets in the values repository.
-    isBeta: true
   tempo:
     title: Tempo
     appVersion: 2.1.1

helmfile.d/snippets/alertmanager.gotmpl

@@ -1,16 +1,14 @@
 {{- $receivers := .instance | get "alerts.receivers" (.root | get "alerts.receivers" (list "slack")) }}
 {{- $suffix := (true | ternary "" ".monitoring.svc.cluster.local") }}
-{{- $homeReceivers := .root | get "home.receivers" (list "slack") }}
-{{- $isHomeMonitored:= .root | get "otomi.isHomeMonitored" }}
 global:
-{{- if or (has "slack" $receivers ) (and $isHomeMonitored (has "slack" $homeReceivers)) }}
+{{- if (has "slack" $receivers ) }}
   slack_api_url: {{ .instance | get "alerts.slack.url" (.root | get "alerts.slack.url" (.root | get "home.slack.url" nil)) }}
 {{- end }}
-{{- if or (has "opsgenie" $receivers ) (and $isHomeMonitored (has "opsgenie" $homeReceivers)) }}
+{{- if (has "opsgenie" $receivers ) }}
   opsgenie_api_key: {{ .instance | get "alerts.opsgenie.apiKey" (.root | get "alerts.opsgenie.apiKey" (.root | get "home.opsgenie.apiKey" nil)) }}
   opsgenie_api_url: {{ .instance | get "alerts.opsgenie.url" (.root | get "alerts.opsgenie.url" (.root | get "home.opsgenie.url" nil)) }}
 {{- end }}
-{{- if or (has "email" $receivers) (and $isHomeMonitored (has "email" $homeReceivers))  }}
+{{- if or (has "email" $receivers) }}
   smtp_smarthost: {{ .root | get "smtp.smarthost" }}
   smtp_hello: {{ .root | get "smtp.hello" .root.cluster.domainSuffix }}
   smtp_from: {{ .root | get "smtp.from" (print "alerts@" .root.cluster.domainSuffix) }}
@@ -51,16 +49,6 @@ route:
       {{- else }}
       receiver: critical
       {{- end }}
-    {{- if $isHomeMonitored }}
-      continue: true
-    - match:
-        severity: critical
-      {{- if (has "none" $receivers ) }}
-      receiver: "null"
-      {{- else }}
-      receiver: critical-home
-      {{- end }}
-    {{- end }}
 receivers:
   - name: "null"
 {{- if not (has "none" $receivers ) }}
@@ -120,34 +108,4 @@ receivers:
         send_resolved: true
     {{- end }}
   {{- end }}
-{{- end }}
-
-{{- if $isHomeMonitored }}
-  - name: critical-home
-  {{- $receivers := .root.home | get "receivers" }}
-    # sending criticals also to home to be aware of issues
-  {{- if has "slack" $receivers  }}
-    slack_configs:
-      - channel: "#{{ .root | get "home.slack.channelCrit" "mon-otomi-crit" }}"
-        {{- .slackTpl | nindent 8 }}
-  {{- end }}
-  {{- if has "opsgenie" $receivers  }}
-    opsgenie_configs:
-      - priority: "P1"
-        send_resolved: true
-        {{- .opsgenieTpl | nindent 8 }}
-  {{- end }}
-  {{- if has "msteams" $receivers  }}
-    webhook_configs:
-      - url: "http://prometheus-msteams.monitoring.svc.cluster.local:800/high_priority_channel"
-        send_resolved: true
-  {{- end }}
-  {{- if has "email" $receivers  }}
-    {{- $criticalTo := .root | get "home.email.critical" nil }}
-    {{- if $criticalTo }}
-    email_configs:
-      - to: {{ $criticalTo }}
-        send_resolved: true
-    {{- end }}
-  {{- end }}
 {{- end }}

helmfile.d/snippets/defaults.yaml

@@ -820,7 +820,6 @@ environments:
         otomi:
           hasExternalDNS: false
           hasExternalIDP: false
-          isHomeMonitored: false
           isMultitenant: true
           nodeSelector: {}
         e2e:

tests/fixtures/env/secrets.settings.yaml

@@ -7,11 +7,6 @@ alerts:
         lowPrio: https://xxxxxxxx.com
     slack:
         url: https://hooks.slack.com/services/id
-home:
-    email:
-        critical: [email protected]
-    slack:
-        url: https://hooks.slack.com/services/id
 kms:
     sops:
         azure:
@@ -24,10 +19,10 @@ otomi:
         password: blablabla
 smtp:
     auth_password: somesecretvalue
+platformBackups:
+    persistentVolumes:
+        linodeApiToken: justanapitokenhere
 obj:
     provider:
         linode:
             secretAccessKey: somesecretvalue
-platformBackups:
-    persistentVolumes:
-        linodeApiToken: justanapitokenhere

tests/fixtures/env/settings.yaml

@@ -24,13 +24,6 @@ dns:
     zoneIdFilters: []
 e2e:
     enabled: false
-home:
-    email: {}
-    receivers:
-        - slack
-    slack:
-        channel: mon-otomi
-        channelCrit: mon-otomi-crit
 ingress:
     classes:
         - className: private
@@ -78,7 +71,6 @@ otomi:
         username: otomi
     hasExternalDNS: true
     hasExternalIDP: true
-    isHomeMonitored: false
     nodeSelector:
         otomi: otomi-sys
     version: main

values-changes.yaml

@@ -286,3 +286,5 @@ changes:
   - version: 28
     deletions:
       - 'apps.cnpg.storage'
+      - 'otomi.isHomeMonitored'
+      - 'home'

values-schema.yaml

@@ -2653,8 +2653,6 @@ properties:
       entrypoint:
         $ref: '#/definitions/ipV4Address'
         description: Optional. A public IP address that will override (loadbalancer) ip used for registering hosts. This allows for access to private clusters.
-  home:
-    $ref: '#/definitions/alerts'
   files:
     type: object
     description: 'Custom values for the workload chart.'
@@ -2809,10 +2807,6 @@ properties:
         default: false
         description: Set this to true when bringing your own external IDP such as Azure AD. (Expects required `oidc:` fields to be set.)
         type: boolean
-      isHomeMonitored:
-        default: false
-        description: Whether this cluster is home monitored (like when under a Premium SLA). Sends criticals home.
-        type: boolean
       isMultitenant:
         default: true
         description: Whether to separate team metrics and logs. Disabling this lets everybody be admin and see everything.