Merge branch '20250212-fixes' into 'main-1.15'

Release 1.15.1 fixes

See merge request ongresinc/stackgres!1652

Author: teoincontatto

stackgres-k8s/install/helm/stackgres-operator/templates/check-upgrade.yaml

@@ -9,36 +9,40 @@
       {{ $version := $deployment.metadata.labels.version }}
       {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
         {{ if or (not (regexMatch "^(1\\.13|1\\.14|1\\.15)\\." $version)) (and (not (eq $version $chart.Version)) (regexMatch "(-alpha[0-9]|-beta[0-9])" $version)) }}
-          {{ fail (print "Upgrading from version " $version " version is not supported. You may force upgrading from an unsupported version setting the parameter \"forceUpgradeFromUnsupportedVersion\" to \"true\". If you do so do it at your own risk. It has not been tested and some functionality may break. If you are conscious of the risk of such a dangerous action we recommend to perform security upgrades of all your SGCluster and SGShardedCluster as soon as possible after upgrading from an unsupported version of the operator upgrade") }}
+          {{ fail (print "Upgrading from version " $version " version is not supported. You may force upgrading from an unsupported version setting the parameter \"forceUpgradeFromUnsupportedVersion\" to \"true\". If you do so do it at your own risk. It has not been tested and some or all functionalities may break. Note that after proceeding you will have to change the value of `stackgres.io/operatorVersion` annotation of all your SGClusters and SGShardedClusters to the target operator version you want to upgrade to and, as soon as possible perform a restart SGDbOps or SGShardedDbOps of all your SGClusters and SGShardedClusters. Before assuming the risk of such a dangerous action we strongly recommend to perform this operation in a staging environment as close as possible to your production environment.") }}
         {{ end }}
       {{ end }}
     {{ end }}
   {{ end }}
 {{ end }}
-{{ $clusters := lookup "stackgres.io/v1" "SGCluster" "" "" }}
-{{ if $clusters }}
-  {{ if $clusters.items }}
-    {{ range $cluster := $clusters.items }}
-      {{ if $cluster.metadata.annotations }}
-        {{ if (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
-          {{ $version := (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
+{{ $shardedclusters := lookup "stackgres.io/v1alpha1" "SGShardedCluster" "" "" }}
+{{ if $shardedclusters }}
+  {{ if $shardedclusters.items }}
+    {{ range $shardedcluster := $shardedclusters.items }}
+      {{ if $shardedcluster.metadata.annotations }}
+        {{ if (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
+          {{ $version := (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ if (not (regexMatch "^(1\\.13|1\\.14|1\\.15)\\." $version)) }}
-            {{ fail (print "Can not upgrade due to some SGCluster still at version " $version ". You have to run a SGDbOps of type securityUpgrade on those SGClusters first.") }}
+            {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
+              {{ fail (print "Can not upgrade due to some SGShardedCluster still at version " $version ". You have to run a SGShardedDbOps of type securityUpgrade on those SGShardedClusters first.") }}
+            {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     {{ end }}
   {{ end }}
 {{ end }}
-{{ $shardedclusters := lookup "stackgres.io/v1" "SGShardedCluster" "" "" }}
-{{ if $shardedclusters }}
-  {{ if $shardedclusters.items }}
-    {{ range $shardedcluster := $shardedclusters.items }}
-      {{ if $shardedcluster.metadata.annotations }}
-        {{ if (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
-          {{ $version := (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
+{{ $clusters := lookup "stackgres.io/v1" "SGCluster" "" "" }}
+{{ if $clusters }}
+  {{ if $clusters.items }}
+    {{ range $cluster := $clusters.items }}
+      {{ if $cluster.metadata.annotations }}
+        {{ if (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
+          {{ $version := (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ if (not (regexMatch "^(1\\.13|1\\.14|1\\.15)\\." $version)) }}
-            {{ fail (print "Can not upgrade due to some SGShardedCluster still at version " $version ". You have to run a SGShardedDbOps of type securityUpgrade on those SGShardedClusters first.") }}
+            {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
+              {{ fail (print "Can not upgrade due to some SGCluster still at version " $version ". You have to run a SGDbOps of type securityUpgrade on those SGClusters first.") }}
+            {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}

stackgres-k8s/install/helm/stackgres-operator/values.yaml

@@ -546,6 +546,12 @@ developer:
       # -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core
       volumeMounts: []
     # Section to define volumes to be used by the distributedlogs controller container
+    # Section to define volumes to be used by the stream container
+    stream:
+      # -- Pod volumes. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volume-v1-core
+      volumes: []
+      # -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core
+      volumeMounts: []
 # -- The list of fields that are serialized into the spec of SGConfig
 specFields: [
   containerRegistry, imagePullPolicy, imagePullSecrets, allowedNamespaces, allowedNamespaceLabelSelector,

stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/configuration/ClusterControllerJmxCollectorRegistry.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2019 OnGres, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package io.stackgres.cluster.configuration;
+
+import javax.management.MalformedObjectNameException;
+
+import io.stackgres.common.ClusterControllerProperty;
+import io.stackgres.common.metrics.AbstractJmxCollectorRegistry;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class ClusterControllerJmxCollectorRegistry extends AbstractJmxCollectorRegistry {
+
+  public ClusterControllerJmxCollectorRegistry() throws MalformedObjectNameException {
+    super(ClusterControllerProperty.CLUSTER_CONTROLLER_JMX_COLLECTOR_YAML_CONFIG
+        .get().orElse(""));
+  }
+
+}

stackgres-k8s/src/cluster-controller/src/main/resources/application.properties

@@ -38,3 +38,6 @@ quarkus.http.auth.basic=true
 org.jooq.no-logo=true
 quarkus.log.category."org.jooq.Constants".level=OFF
 quarkus.log.category."org.jooq.tools.LoggerListener".level=OFF
+
+# Use custom micrometer producer
+quarkus.micrometer.export.prometheus.default-registry=false

stackgres-k8s/src/common/pom.xml

@@ -45,6 +45,14 @@
       <groupId>com.ongres</groupId>
       <artifactId>fluent-process</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus.jmx</groupId>
+      <artifactId>collector</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>io.stackgres</groupId>

stackgres-k8s/src/common/src/main/java/io/stackgres/common/ClusterControllerProperty.java

@@ -26,7 +26,9 @@ public enum ClusterControllerProperty implements StackGresPropertyReader {
   CLUSTER_CONTROLLER_RECONCILE_MANAGED_SQL(
       "stackgres.clusterReconcileManagedSql"),
   CLUSTER_CONTROLLER_RECONCILE_PATRONI_AFTER_MAJOR_VERSION_UPGRADE(
-      "stackgres.clusterReconcilePatroniAfterMajorVersionUpgrade");
+      "stackgres.clusterReconcilePatroniAfterMajorVersionUpgrade"),
+  CLUSTER_CONTROLLER_JMX_COLLECTOR_YAML_CONFIG(
+      "stackgres.cluster.controllerJmxCollectorYamlConfig");
 
   private static final Properties APPLICATION_PROPERTIES =
       StackGresPropertyReader.readApplicationProperties(ClusterControllerProperty.class);

stackgres-k8s/src/common/src/main/java/io/stackgres/common/OperatorProperty.java

@@ -45,10 +45,15 @@ public enum OperatorProperty implements StackGresPropertyReader {
   CLUSTER_ROLE_DISABLED("stackgres.clusterRoleDisabled"),
   FORCE_UNLOCK_OPERATOR("stackgres.forceUnlockOperator"),
   STOP_AFTER_BOOTSTRAP("stackgres.stopAfterBootstrap"),
+  RECONCILIATION_ENABLE_THREAD_POOL("stackgres.reconciliationEnableThreadPool"),
+  RECONCILIATION_THREAD_POOL_METRICS_SCRAPE_INTERVAL("stackgres.reconciliationThreadPoolMetricsScrapeInterval"),
   RECONCILIATION_THREADS("stackgres.reconciliationThreads"),
+  RECONCILIATION_LOW_PRIORITY_THREADS("stackgres.reconciliationLowPriorityThreads"),
+  RECONCILIATION_PRIORITY_TIMEOUT("stackgres.reconciliationPriorityTimeout"),
   RECONCILIATION_INITIAL_BACKOFF("stackgres.reconciliationInitialBackoff"),
   RECONCILIATION_MAX_BACKOFF("stackgres.reconciliationMaxBackoff"),
-  RECONCILIATION_BACKOFF_VARIATION("stackgres.reconciliationBackoffVariation");
+  RECONCILIATION_BACKOFF_VARIATION("stackgres.reconciliationBackoffVariation"),
+  JMX_COLLECTOR_YAML_CONFIG("stackgres.jmxCollectorYamlConfig");
 
   private static final Properties APPLICATION_PROPERTIES =
       StackGresPropertyReader.readApplicationProperties(OperatorProperty.class);

stackgres-k8s/src/common/src/main/java/io/stackgres/common/metrics/AbstractJmxCollectorRegistry.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 OnGres, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package io.stackgres.common.metrics;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+
+import javax.management.MalformedObjectNameException;
+
+import io.prometheus.jmx.JmxCollector;
+import io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.stackgres.common.CdiUtil;
+
+public abstract class AbstractJmxCollectorRegistry {
+  private final PrometheusRegistry collectorRegistry;
+  private final PrometheusTextFormatWriter textFormatter = new PrometheusTextFormatWriter(true);
+
+  public AbstractJmxCollectorRegistry(String yamlConfig) throws MalformedObjectNameException {
+    new JmxCollector(yamlConfig).register(PrometheusRegistry.defaultRegistry);
+    this.collectorRegistry = PrometheusRegistry.defaultRegistry;
+  }
+
+  public AbstractJmxCollectorRegistry() {
+    CdiUtil.checkPublicNoArgsConstructorIsCalledToCreateProxy(getClass());
+    this.collectorRegistry = null;
+  }
+
+  public String scrape(String contentType) {
+    try (
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8)) {
+      textFormatter.write(stream, collectorRegistry.scrape());
+      return stream.toString(StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}

stackgres-k8s/src/common/src/main/java/io/stackgres/common/metrics/CustomPrometheusMeterRegistry.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 OnGres, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package io.stackgres.common.metrics;
+
+import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class CustomPrometheusMeterRegistry extends PrometheusMeterRegistry {
+
+  private final AbstractJmxCollectorRegistry jmxCollectorRegistry;
+
+  public CustomPrometheusMeterRegistry(
+      PrometheusConfig config,
+      AbstractJmxCollectorRegistry jmxCollectorRegistry) {
+    super(config);
+    this.jmxCollectorRegistry = jmxCollectorRegistry;
+  }
+
+  @Override
+  public String scrape(String contentType) {
+    StringBuilder sb = new StringBuilder();
+    sb.append(super.scrape(contentType));
+    if (jmxCollectorRegistry != null) {
+      sb.append(jmxCollectorRegistry.scrape(contentType));
+    }
+    return sb.toString();
+  }
+}

stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/Main.java

@@ -7,7 +7,7 @@
 
 import io.quarkus.runtime.QuarkusApplication;
 import io.quarkus.runtime.annotations.QuarkusMain;
-import io.stackgres.jobs.app.JobsProperty;
+import io.stackgres.jobs.configuration.JobsProperty;
 import io.stackgres.jobs.dbops.DbOpsLauncher;
 import jakarta.inject.Inject;