Merge pull request #257 from vshn/redis_user_alerting

add mailgun and alerting alerting to Redis
vshn · Nov 21, 2023 · a513575 · a513575
2 parents 7d54ca2 + 3edb433
commit a513575
Show file tree

Hide file tree

Showing 22 changed files with 4,963 additions and 32 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -39,7 +39,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.41.1
+        tag: v4.42.0
       apiserver:
         registry: ghcr.io
         repository: vshn/appcat-apiserver

diff --git a/component/component/common.libsonnet b/component/component/common.libsonnet
@@ -126,6 +126,15 @@ local openShiftTemplate(name, displayName, description, iconClass, tags, message
   message: message,
 };
 
+local emailAlerting(alertingSettings) = {
+  emailAlertingEnabled: std.toString(alertingSettings.enabled),
+  emailAlertingSecretNamespace: alertingSettings.secretNamespace,
+  emailAlertingSecretName: alertingSettings.secretName,
+  emailAlertingSmtpFromAddress: alertingSettings.smtpFromAddress,
+  emailAlertingSmtpUsername: alertingSettings.smtpUsername,
+  emailAlertingSmtpHost: alertingSettings.smtpHost,
+};
+
 local getAppCatImageTag() = std.strReplace(params.images.appcat.tag, '/', '_');
 
 local getApiserverImageTag() = std.strReplace(params.images.apiserver.tag, '/', '_');
@@ -177,4 +186,6 @@ local argoCDAnnotations() = {
     removeField(obj, name),
   ArgoCDAnnotations():
     argoCDAnnotations(),
+  EmailAlerting(alertingSettings):
+    emailAlerting(alertingSettings),
 }
diff --git a/component/component/prometheus.libsonnet b/component/component/prometheus.libsonnet
@@ -107,7 +107,7 @@ local generatePrometheusNonSLORules(serviceName, memoryContainerName, additional
                       runbook_url: 'https://hub.syn.tools/appcat/runbooks/vshn-generic.html#MemoryCritical',
                       summary: 'Memory usage critical',
                     },
-                    expr: std.strReplace(topPod('(container_memory_working_set_bytes{container="%s"}  / on(container,pod,namespace)  kube_pod_container_resource_limits{resource="memory"} * 100) > 85') % memoryContainerName, toReplace, 'vshn-' + serviceNameLower),
+                    expr: std.strReplace(topPod('(max(container_memory_working_set_bytes{container="%s"}) without (name, id)  / on(container,pod,namespace)  kube_pod_container_resource_limits{resource="memory"} * 100) > 85') % memoryContainerName, toReplace, 'vshn-' + serviceNameLower),
                     'for': '120m',
                     labels: {
                       severity: 'critical',

diff --git a/component/component/vshn_postgres.jsonnet b/component/component/vshn_postgres.jsonnet
@@ -912,16 +912,10 @@ local composition(restore=false) =
               data: {
                 imageTag: common.GetAppCatImageTag(),
                 sgNamespace: pgParams.sgNamespace,
-                emailAlertingEnabled: std.toString(params.services.vshn.emailAlerting.enabled),
-                emailAlertingSecretNamespace: params.services.vshn.emailAlerting.secretNamespace,
-                emailAlertingSecretName: params.services.vshn.emailAlerting.secretName,
-                emailAlertingSmtpFromAddress: params.services.vshn.emailAlerting.smtpFromAddress,
-                emailAlertingSmtpUsername: params.services.vshn.emailAlerting.smtpUsername,
-                emailAlertingSmtpHost: params.services.vshn.emailAlerting.smtpHost,
                 externalDatabaseConnectionsEnabled: std.toString(params.services.vshn.externalDatabaseConnectionsEnabled),
                 quotasEnabled: std.toString(params.services.vshn.quotasEnabled),
                 sideCars: std.toString(pgParams.sideCars),
-              },
+              } + common.EmailAlerting(params.services.vshn.emailAlerting),
             },
             container: {
               image: 'postgresql',

diff --git a/component/component/vshn_redis.jsonnet b/component/component/vshn_redis.jsonnet
@@ -522,7 +522,7 @@ local composition =
                 controlNamespace: params.services.controlNamespace,
                 restoreSA: 'redisrestoreserviceaccount',
                 quotasEnabled: std.toString(params.services.vshn.quotasEnabled),
-              },
+              } + common.EmailAlerting(params.services.vshn.emailAlerting),
             },
             container: {
               image: 'redis',

diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.41.1
+          image: ghcr.io/vshn/appcat:v4.42.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,7 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.41.1
+        image: ghcr.io/vshn/appcat:v4.42.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -25,7 +25,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-          imageTag: v4.41.1
+          imageTag: v4.42.0
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io
           minioChartVersion: 5.0.13

diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.41.1
+          image: ghcr.io/vshn/appcat:v4.42.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -30,7 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-              image: ghcr.io/vshn/appcat:v4.41.1
+              image: ghcr.io/vshn/appcat:v4.42.0
               name: sla-reporter
               resources:
                 limits:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,7 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.41.1
+        image: ghcr.io/vshn/appcat:v4.42.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -28,7 +28,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_VSHNREDIS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.41.1
+        image: ghcr.io/vshn/appcat:v4.42.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml
@@ -118,7 +118,7 @@ spec:
                         alertmanagerConfigRef:
                           description: AlertmanagerConfigRef contains the name of
                             the AlertmanagerConfig that should be copied over to the
-                            namespace of the PostgreSQL instance.
+                            namespace of the instance.
                           type: string
                         alertmanagerConfigSecretRef:
                           description: AlertmanagerConfigSecretRef contains the name