From 308425ff69b42d08d94d9fa369248a08dba7a5c5 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Mon, 25 Mar 2024 16:39:45 -0500 Subject: [PATCH 1/2] Do not return metrics for liveness probe --- controllers/util/prometheus_exporter_util.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/util/prometheus_exporter_util.go b/controllers/util/prometheus_exporter_util.go index 00a8233d..fd8f9a2e 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), }, } From be3d840aa35c57e9ca8804acbf0bb8a7a2b0cdd4 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 26 Mar 2024 11:38:34 -0500 Subject: [PATCH 2/2] Add a changelog entry --- helm/solr-operator/Chart.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml index 61a8a146..83adf370 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