Merge pull request #169 from vshn/keycloak_mariadb_alerting

Add Keycloak&Mariadb alerting, non-sla rules
vshn · May 30, 2024 · 24c299a · 24c299a
2 parents 99b6394 + aa12d11
commit 24c299a
Show file tree

Hide file tree

Showing 20 changed files with 17,963 additions and 362 deletions.
diff --git a/apis/vshn/v1/dbaas_vshn_keycloak.go b/apis/vshn/v1/dbaas_vshn_keycloak.go
@@ -73,6 +73,9 @@ type VSHNKeycloakParameters struct {
 	// Maintenance contains settings to control the maintenance of an instance.
 	Maintenance VSHNDBaaSMaintenanceScheduleSpec `json:"maintenance,omitempty"`
 
+	// Monitoring contains settings to control monitoring.
+	Monitoring VSHNMonitoring `json:"monitoring,omitempty"`
+
 	// Security defines the security of a service
 	Security Security `json:"security,omitempty"`
 
@@ -181,6 +184,10 @@ func (v *VSHNKeycloak) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-keycloak-%s", v.GetName())
 }
 
+func (v *XVSHNKeycloak) GetInstanceNamespace() string {
+	return fmt.Sprintf("vshn-keycloak-%s", v.GetName())
+}
+
 func (v *VSHNKeycloak) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
@@ -290,3 +297,7 @@ func (v *VSHNKeycloak) GetAllowedNamespaces() []string {
 	}
 	return append(v.Spec.Parameters.Security.AllowedNamespaces, v.GetClaimNamespace())
 }
+
+func (v *VSHNKeycloak) GetVSHNMonitoring() VSHNMonitoring {
+	return v.Spec.Parameters.Monitoring
+}
diff --git a/apis/vshn/v1/dbaas_vshn_mariadb.go b/apis/vshn/v1/dbaas_vshn_mariadb.go
@@ -74,6 +74,9 @@ type VSHNMariaDBParameters struct {
 	// Maintenance contains settings to control the maintenance of an instance.
 	Maintenance VSHNDBaaSMaintenanceScheduleSpec `json:"maintenance,omitempty"`
 
+	// Monitoring contains settings to control monitoring.
+	Monitoring VSHNMonitoring `json:"monitoring,omitempty"`
+
 	// Security defines the security of a service
 	Security Security `json:"security,omitempty"`
 }

diff --git a/apis/vshn/v1/zz_generated.deepcopy.go b/apis/vshn/v1/zz_generated.deepcopy.go
diff --git a/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml
diff --git a/crds/vshn.appcat.vshn.io_vshnmariadbs.yaml b/crds/vshn.appcat.vshn.io_vshnmariadbs.yaml
diff --git a/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml
diff --git a/crds/vshn.appcat.vshn.io_xvshnmariadbs.yaml b/crds/vshn.appcat.vshn.io_xvshnmariadbs.yaml
diff --git a/pkg/comp-functions/functions/common/alerting.go b/pkg/comp-functions/functions/common/alerting.go
@@ -28,7 +28,7 @@ func AddUserAlerting(obj client.Object) func(ctx context.Context, svc *runtime.S
 	return func(ctx context.Context, svc *runtime.ServiceRuntime) *fnproto.Result {
 
 		log := controllerruntime.LoggerFrom(ctx)
-		log.Info("Check if alerting references are set")
+		log.Info("Checking if alerting references are set")
 
 		log.V(1).Info("Transforming", "obj", svc)
 

diff --git a/pkg/comp-functions/functions/common/alerting_test.go b/pkg/comp-functions/functions/common/alerting_test.go
diff --git a/pkg/comp-functions/functions/common/non_sla_prom_rules.go b/pkg/comp-functions/functions/common/non_sla_prom_rules.go