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

Jump to bottom

fix(operator): Fix duplicate operator metrics due to ServiceMonitor selector #12216

Merged
merged 3 commits into from Mar 14, 2024
Merged

fix(operator): Fix duplicate operator metrics due to ServiceMonitor selector #12216

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1f213c
fix(operator): Add explicit label to metrics service
xperimental Mar 14, 2024
5c8d725
Update changelog
xperimental Mar 14, 2024
49d46f5
Merge branch 'main' into fix-multi-scrape
periklis Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
@@ -1,5 +1,6 @@
## Main

- [12216](https://github.com/grafana/loki/pull/12216) **xperimental**: Fix duplicate operator metrics due to ServiceMonitor selector
- [12165](https://github.com/grafana/loki/pull/12165) **JoaoBraveCoding**: Change attribute value used for CCO-based credential mode
- [12157](https://github.com/grafana/loki/pull/12157) **periklis**: Fix managed auth features annotation for community-openshift bundle
- [12104](https://github.com/grafana/loki/pull/12104) **periklis**: Upgrade build and runtime dependencies
Expand Down
1 change: 1 addition & 0 deletions ...nity-openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ metadata:
service.beta.openshift.io/serving-cert-secret-name: loki-operator-metrics
creationTimestamp: null
labels:
app.kubernetes.io/component: metrics
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
Expand Down
1 change: 1 addition & 0 deletions ...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
View file
Open in desktop
Expand Up @@ -22,4 +22,5 @@ spec:
serverName: loki-operator-controller-manager-metrics-service.kubernetes-operators.svc
selector:
matchLabels:
app.kubernetes.io/component: metrics
app.kubernetes.io/name: loki-operator
2 changes: 1 addition & 1 deletion operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.5.0
createdAt: "2024-03-12T09:52:37Z"
createdAt: "2024-03-14T13:25:52Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down
1 change: 1 addition & 0 deletions ...ndle/community/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: metrics
app.kubernetes.io/instance: loki-operator-v0.5.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
Expand Down
2 changes: 1 addition & 1 deletion operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.5.0
createdAt: "2024-03-12T09:52:36Z"
createdAt: "2024-03-14T13:25:49Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down
1 change: 1 addition & 0 deletions ...ndle/openshift/manifests/loki-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ metadata:
service.beta.openshift.io/serving-cert-secret-name: loki-operator-metrics
creationTimestamp: null
labels:
app.kubernetes.io/component: metrics
app.kubernetes.io/instance: loki-operator-0.1.0
app.kubernetes.io/managed-by: operator-lifecycle-manager
app.kubernetes.io/name: loki-operator
Expand Down
1 change: 1 addition & 0 deletions ...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
View file
Open in desktop
Expand Up @@ -22,4 +22,5 @@ spec:
serverName: loki-operator-controller-manager-metrics-service.openshift-operators-redhat.svc
selector:
matchLabels:
app.kubernetes.io/component: metrics
app.kubernetes.io/name: loki-operator
2 changes: 1 addition & 1 deletion operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2024-03-12T09:52:39Z"
createdAt: "2024-03-14T13:25:55Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down
1 change: 1 addition & 0 deletions operator/config/prometheus/monitor.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,4 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: loki-operator
app.kubernetes.io/component: metrics
1 change: 1 addition & 0 deletions operator/config/rbac/auth_proxy_service.yaml
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/component: metrics
name: controller-manager-metrics-service
spec:
ports:
Expand Down