Skip to content
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

Fix metrics selectors #1742

Merged
merged 10 commits into from
Mar 23, 2022
Merged

Fix metrics selectors #1742

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e70ac84
Enable metrics
rubenvp8510 Feb 6, 2022
ae48d86
Merge branch 'master' into re-enable-metrics
rubenvp8510 Feb 11, 2022
ea51b77
Fix tests
rubenvp8510 Feb 11, 2022
c48ba7f
Merge branch 'main' into re-enable-metrics
rubenvp8510 Feb 11, 2022
520e712
Disable prometheus resources creation
rubenvp8510 Feb 21, 2022
5885a9b
Merge branch 'main' into re-enable-metrics
rubenvp8510 Feb 21, 2022
dbea4fb
Merge branch 'main' into re-enable-metrics
rubenvp8510 Mar 8, 2022
8705c7d
Merge branch 'main' into re-enable-metrics
rubenvp8510 Mar 14, 2022
b1cde40
Merge branch 'main' into re-enable-metrics
rubenvp8510 Mar 15, 2022
bff8bd0
Merge branch 'main' into re-enable-metrics
rubenvp8510 Mar 23, 2022
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ bundle-build: ## Build the bundle image.

.PHONY: bundle-push
bundle-push: ## Push the bundle image.
$(MAKE) docker-push IMG=$(BUNDLE_IMG)
docker push $(BUNDLE_IMG)

.PHONY: opm
OPM = ./bin/opm
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/jaeger-operator-metrics_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: jaeger-operator
app.kubernetes.io/component: metrics
name: jaeger-operator
name: jaeger-operator-metrics
spec:
Expand Down
3 changes: 2 additions & 1 deletion config/prometheus/monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
name: jaeger-operator
name: jaeger-operator-metrics-monitor
spec:
endpoints:
Expand All @@ -19,3 +19,4 @@ spec:
selector:
matchLabels:
name: jaeger-operator
app.kubernetes.io/component: metrics
3 changes: 2 additions & 1 deletion config/rbac/auth_proxy_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ apiVersion: v1
kind: Service
metadata:
labels:
control-plane: jaeger-operator
name: jaeger-operator
app.kubernetes.io/component: metrics
name: jaeger-operator-metrics
spec:
ports:
Expand Down