You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2024/03/26 20:16:59 UTC

(solr-operator) branch main updated: Do not return metrics for liveness probe (#694)

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new 2358d54  Do not return metrics for liveness probe (#694)
2358d54 is described below

commit 2358d54eb1a314b9068c7cf7b8097c0c8792e45e
Author: Houston Putman <ho...@apache.org>
AuthorDate: Tue Mar 26 16:16:55 2024 -0400

    Do not return metrics for liveness probe (#694)
    
    Fixes #693
---
 controllers/util/prometheus_exporter_util.go | 5 +++--
 helm/solr-operator/Chart.yaml                | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/controllers/util/prometheus_exporter_util.go b/controllers/util/prometheus_exporter_util.go
index 00a8233..fd8f9a2 100644
--- a/controllers/util/prometheus_exporter_util.go
+++ b/controllers/util/prometheus_exporter_util.go
@@ -207,8 +207,9 @@ func GenerateSolrPrometheusExporterDeployment(solrPrometheusExporter *solr.SolrP
 	defaultProbeHandler := corev1.ProbeHandler{
 		HTTPGet: &corev1.HTTPGetAction{
 			Scheme: corev1.URISchemeHTTP,
-			Path:   "/metrics",
-			Port:   intstr.FromInt(SolrMetricsPort),
+			// TODO: When 9.0 is the minimum supported version, this can be "/-/healthy"
+			Path: "/metrics?names[]=",
+			Port: intstr.FromInt(SolrMetricsPort),
 		},
 	}
 
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 61a8a14..83adf37 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -62,12 +62,19 @@ annotations:
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/648
     - kind: fixed
-      description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy  
+      description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy
       links:
         - name: Github Issue
           url: https://github.com/apache/solr-operator/issues/688
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/689
+    - kind: fixed
+      description: SolrPrometheusExporter no longer fails liveness probes when the SolrCloud is too large
+      links:
+        - name: Github Issue
+          url: https://github.com/apache/solr-operator/issues/693
+        - name: Github PR
+          url: https://github.com/apache/solr-operator/pull/694
   artifacthub.io/images: |
     - name: solr-operator
       image: apache/solr-operator:v0.9.0-prerelease