Skip to content

Remove port annotation from PrometheusExporter service #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HoustonPutman merged 2 commits into from
Apr 6, 2023
Merged

Remove port annotation from PrometheusExporter service #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91476ff
Remove port annotation form prometheusexporter service
HoustonPutman Mar 31, 2023
2cd25cc
Merge branch 'main' into prom-exp-port-ann
HoustonPutman Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion controllers/util/prometheus_exporter_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ func GenerateSolrMetricsService(solrPrometheusExporter *solr.SolrPrometheusExpor
"prometheus.io/scrape": "true",
"prometheus.io/scheme": "http",
"prometheus.io/path": "/metrics",
"prometheus.io/port": strconv.Itoa(ExtSolrMetricsPort),
}

selectorLabels := solrPrometheusExporter.SharedLabels()
Expand Down
7 changes: 7 additions & 0 deletions helm/solr-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ annotations:
url: https://github.com/apache/solr-operator/pull/530
- name: Feature Documentation
url: https://apache.github.io/solr-operator/docs/solr-cloud/managed-updates.html#pod-readiness-during-updates
- kind: fixed
description: Don't give port annotation for PrometheusExporter, let Prometheus find the port itself
links:
- name: GitHub Issue
url: https://github.com/apache/solr-operator/issues/483
- name: GitHub PR
url: https://github.com/apache/solr-operator/pull/539
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.7.0-prerelease
Expand Down