-
Couldn't load subscription status.
- Fork 35
UPSTREAM: <carry>: OCPBUGS-49410: Enable OCP metrics collection by default #252
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.
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
openshift-merge-bot
merged 1 commit into
openshift:main
from
azych:enable-metrics-collection-by-default
Feb 18, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...catalogd/kustomize/overlays/openshift/olmv1-ns/metrics/catalogd_metrics_monitor_role.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| kind: Role | ||
| metadata: | ||
| name: metrics-monitor-role | ||
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| - endpoints | ||
| - pods | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
15 changes: 15 additions & 0 deletions
15
.../kustomize/overlays/openshift/olmv1-ns/metrics/catalogd_metrics_monitor_role_binding.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| name: metrics-monitor-rolebinding | ||
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: metrics-monitor-role | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: prometheus-k8s | ||
| namespace: openshift-monitoring | ||
27 changes: 27 additions & 0 deletions
27
...ustomize/overlays/openshift/olmv1-ns/metrics/catalogd_metrics_monitor_servicemonitor.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| name: metrics-monitor | ||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| openshift.io/cluster-monitoring: 'true' | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| interval: 30s | ||
| path: /metrics | ||
| port: metrics | ||
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| scheme: https | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: catalogd-service.openshift-catalogd.svc | ||
| namespaceSelector: | ||
| matchNames: | ||
| - openshift-catalogd | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: catalogd | ||
|
|
||
4 changes: 4 additions & 0 deletions
4
openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/metrics/kustomization.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| resources: | ||
| - catalogd_metrics_monitor_role.yaml | ||
| - catalogd_metrics_monitor_role_binding.yaml | ||
| - catalogd_metrics_monitor_servicemonitor.yaml |
7 changes: 7 additions & 0 deletions
7
...t/catalogd/kustomize/overlays/openshift/olmv1-ns/patches/manager_namespace_monitored.yaml
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| $patch: merge | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: system | ||
| labels: | ||
| openshift.io/cluster-monitoring: "true" |
1 change: 1 addition & 0 deletions
1
.../catalogd/kustomize/overlays/openshift/olmv1-ns/patches/manager_namespace_privileged.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| $patch: merge | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
openshift/catalogd/manifests/04-role-openshift-catalogd-catalogd-metrics-monitor-role.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| name: catalogd-metrics-monitor-role | ||
| namespace: openshift-catalogd | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| - endpoints | ||
| - pods | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions
17
...logd/manifests/10-rolebinding-openshift-catalogd-catalogd-metrics-monitor-rolebinding.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| name: catalogd-metrics-monitor-rolebinding | ||
| namespace: openshift-catalogd | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: catalogd-metrics-monitor-role | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: prometheus-k8s | ||
| namespace: openshift-monitoring |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions
28
...hift/catalogd/manifests/17-servicemonitor-openshift-catalogd-catalogd-metrics-monitor.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| --- | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| labels: | ||
| app.kubernetes.io/name: catalogd | ||
| app.kubernetes.io/part-of: olm | ||
| openshift.io/cluster-monitoring: "true" | ||
| name: catalogd-metrics-monitor | ||
| namespace: openshift-catalogd | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| interval: 30s | ||
| path: /metrics | ||
| port: metrics | ||
| scheme: https | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: catalogd-service.openshift-catalogd.svc | ||
| namespaceSelector: | ||
| matchNames: | ||
| - openshift-catalogd | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: catalogd |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
...hift/operator-controller/kustomize/overlays/openshift/olmv1-ns/metrics/kustomization.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| resources: | ||
| - operator_controller_metrics_monitor_role.yaml | ||
| - operator_controller_metrics_monitor_rolebinding.yaml | ||
| - operator_controller_metrics_monitor_servicemonitor.yaml |
17 changes: 17 additions & 0 deletions
17
...stomize/overlays/openshift/olmv1-ns/metrics/operator_controller_metrics_monitor_role.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| name: metrics-monitor-role | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| - endpoints | ||
| - pods | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch |
14 changes: 14 additions & 0 deletions
14
.../overlays/openshift/olmv1-ns/metrics/operator_controller_metrics_monitor_rolebinding.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| name: metrics-monitor-rolebinding | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: metrics-monitor-role | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: prometheus-k8s | ||
| namespace: openshift-monitoring |
25 changes: 25 additions & 0 deletions
25
...erlays/openshift/olmv1-ns/metrics/operator_controller_metrics_monitor_servicemonitor.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| name: metrics-monitor | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| openshift.io/cluster-monitoring: 'true' | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| interval: 30s | ||
| path: /metrics | ||
| port: https | ||
azych marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| scheme: https | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: operator-controller-service.openshift-operator-controller.svc | ||
| namespaceSelector: | ||
| matchNames: | ||
| - openshift-operator-controller | ||
| selector: | ||
| matchLabels: | ||
| control-plane: operator-controller-controller-manager | ||
7 changes: 7 additions & 0 deletions
7
...controller/kustomize/overlays/openshift/olmv1-ns/patches/manager_namespace_monitored.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| $patch: merge | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: system | ||
| labels: | ||
| openshift.io/cluster-monitoring: "true" |
1 change: 1 addition & 0 deletions
1
...ontroller/kustomize/overlays/openshift/olmv1-ns/patches/manager_namespace_privileged.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| $patch: merge | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...ifests/06-role-openshift-operator-controller-operator-controller-metrics-monitor-role.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: Role | ||
| metadata: | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| name: operator-controller-metrics-monitor-role | ||
| namespace: openshift-operator-controller | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - services | ||
| - endpoints | ||
| - pods | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions
16
...binding-openshift-operator-controller-operator-controller-metrics-monitor-rolebinding.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: RoleBinding | ||
| metadata: | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| name: operator-controller-metrics-monitor-rolebinding | ||
| namespace: openshift-operator-controller | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: Role | ||
| name: operator-controller-metrics-monitor-role | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: prometheus-k8s | ||
| namespace: openshift-monitoring |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
27 changes: 27 additions & 0 deletions
27
...s/23-servicemonitor-openshift-operator-controller-operator-controller-metrics-monitor.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- | ||
| apiVersion: monitoring.coreos.com/v1 | ||
| kind: ServiceMonitor | ||
| metadata: | ||
| labels: | ||
| control-plane: operator-controller-controller-manager | ||
| openshift.io/cluster-monitoring: "true" | ||
| name: operator-controller-metrics-monitor | ||
| namespace: openshift-operator-controller | ||
| spec: | ||
| endpoints: | ||
| - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | ||
| interval: 30s | ||
| path: /metrics | ||
| port: https | ||
| scheme: https | ||
| tlsConfig: | ||
| caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | ||
| certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt | ||
| keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key | ||
| serverName: operator-controller-service.openshift-operator-controller.svc | ||
| namespaceSelector: | ||
| matchNames: | ||
| - openshift-operator-controller | ||
| selector: | ||
| matchLabels: | ||
| control-plane: operator-controller-controller-manager |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.