Added thread option and enabled monit for Prometheus

Author: Francisco Borges Aurindo Barros

README.md

@@ -68,7 +68,10 @@ This reference is useful to run the operator locally.
 argument | example | description
 --- | --- | ---
 `sitebuilder-image` | gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/site-builder | The sitebuilder source image name
-`nginx-image` | gitlab-registry.cern.ch/drupal/paas/cern-drupal-distribution/nginx | The nginx source image name
+`php-fpm-exporter-image` | gitlab-registry.cern.ch/drupal/paas/php-fpm-prometheus-exporter:RELEASE.2021.06.02T09-41-38Z | The php-fpm-exporter source image name
+`velero-namespace` | openshift-cern-drupal | The namespace of the Velero server to create backups
+`webdav-image` | gitlab-registry.cern.ch/drupal/paas/sabredav/webdav:RELEASE-2021.10.07T13-46-43Z | The webdav source image name
+`parallel-thread-count` | 5 | The number of threads used by the main controller of DrupalSite Operator
 
 #### Configmaps for each QoS class
 

chart/drupalsite-operator/templates/manager-deploy.yaml

@@ -29,6 +29,7 @@ spec:
         - --zap-stacktrace-level={{.Values.drupalsiteOperator.logStacktraceLevel}}
         - --zap-log-level={{.Values.drupalsiteOperator.logLevel}}
         - --default-release-spec={{.Values.drupalsiteOperator.defaultReleaseSpec}}
+        - --parallel-thread-count={{.Values.drupalsiteOperator.parallelThreadCount}}
         command:
         - /manager
         image: {{ .Values.image | quote }}

chart/drupalsite-operator/templates/prometheus-monitor.yaml

@@ -0,0 +1,15 @@
+# Prometheus Monitor Service (Metrics)
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: controller-manager-metrics-monitor
+  namespace: system
+spec:
+  endpoints:
+    - path: /metrics
+      port: https
+  selector:
+    matchLabels:
+      control-plane: controller-manager

chart/drupalsite-operator/values.yaml

@@ -24,3 +24,4 @@ drupalsiteOperator:
   # Zap Level at and above which stacktraces are captured (one of 'info', 'error')
   logStacktraceLevel: "error"
   defaultReleaseSpec: "RELEASE-2021.09.13T09-24-02Z"
+  parallelThreadCount: 1

config/default/kustomization.yaml

@@ -22,7 +22,7 @@ bases:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
 #- ../certmanager
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
-#- ../prometheus
+- ../prometheus
 
 patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.

controllers/drupalsite_controller.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -65,8 +66,10 @@ var (
 	SMTPHost string
 	// VeleroNamespace refers to the namespace of the velero server to create backups
 	VeleroNamespace string
-	// ReleaseSpec refers to the releaseSpec of the drupalSite to be defaulted incase it is empty
+	// DefaultReleaseSpec refers to the releaseSpec of the drupalSite to be defaulted incase it is empty
 	DefaultReleaseSpec string
+	// ParallelThreadCount refers to the number of parallel reconciliations done by the Operator
+	ParallelThreadCount int
 )
 
 // DrupalSiteReconciler reconciles a DrupalSite object
@@ -134,6 +137,9 @@ func (r *DrupalSiteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				return []reconcile.Request{}
 			}),
 		).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: ParallelThreadCount,
+		}).
 		Complete(r)
 }
 

main.go

@@ -77,6 +77,7 @@ func main() {
 	flag.StringVar(&controllers.SMTPHost, "smtp-host", "cernmx.cern.ch", "SMTP host used by Drupal server pods to send emails.")
 	flag.StringVar(&controllers.VeleroNamespace, "velero-namespace", "openshift-cern-drupal", "The namespace of the Velero server to create backups")
 	flag.StringVar(&controllers.DefaultReleaseSpec, "default-release-spec", "RELEASE-2021.10.07T14-52-56Z", "The default releaseSpec value to be passed to the DrupalSites")
+	flag.IntVar(&controllers.ParallelThreadCount, "parallel-thread-count", 1, "The default number of parallel threads executed by the DrupalSite Operator controllers")
 	opts := zap.Options{
 		Development: false,
 	}