From a0f4e73c45b7c264d6ec663e9cd7abba5a982dab Mon Sep 17 00:00:00 2001 From: Vitalii Parfonov Date: Thu, 2 Dec 2021 20:26:46 +0200 Subject: [PATCH] LOG-1975: Return back Service Metrics Signed-off-by: Vitalii Parfonov --- apis/logging/v1/zz_generated.deepcopy.go | 1 + ..._monitoring.coreos.com_v1_servicemonitor.yaml | 13 +++++++++++++ ...ging-operator-metrics-service_v1_service.yaml | 16 ++++++++++++++++ config/default/kustomization.yaml | 2 +- config/prometheus/monitor.yaml | 9 +++++---- config/rbac/kustomization.yaml | 8 ++++---- main.go | 2 +- ..._monitoring.coreos.com_v1_servicemonitor.yaml | 13 +++++++++++++ ...ging-operator-metrics-service_v1_service.yaml | 16 ++++++++++++++++ 9 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml create mode 100644 bundle/manifests/cluster-logging-operator-metrics-service_v1_service.yaml create mode 100644 manifests/5.4/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml create mode 100644 manifests/5.4/cluster-logging-operator-metrics-service_v1_service.yaml diff --git a/apis/logging/v1/zz_generated.deepcopy.go b/apis/logging/v1/zz_generated.deepcopy.go index c798561f72..df571d652d 100644 --- a/apis/logging/v1/zz_generated.deepcopy.go +++ b/apis/logging/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml new file mode 100644 index 0000000000..038df3abbf --- /dev/null +++ b/bundle/manifests/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + control-plane: controller-manager + name: cluster-logging-operator-metrics-monitor +spec: + endpoints: + - path: /metrics + targetPort: 8686 + selector: + matchLabels: + control-plane: cluster-logging-operator diff --git a/bundle/manifests/cluster-logging-operator-metrics-service_v1_service.yaml b/bundle/manifests/cluster-logging-operator-metrics-service_v1_service.yaml new file mode 100644 index 0000000000..ff3cc0e735 --- /dev/null +++ b/bundle/manifests/cluster-logging-operator-metrics-service_v1_service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + name: cluster-logging-operator + name: cluster-logging-operator-metrics +spec: + ports: + - name: http-metrics + port: 8686 + protocol: TCP + targetPort: 8686 + selector: + name: cluster-logging-operator + sessionAffinity: None + type: ClusterIP diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 9d63f86e0b..45c1c71a98 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -22,7 +22,7 @@ bases: # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. #- ../certmanager # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. -#- ../prometheus +- ../prometheus patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 9b8047b760..59602ab840 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -5,12 +5,13 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - name: controller-manager-metrics-monitor - namespace: system + name: cluster-logging-operator-metrics-monitor + namespace: openshift-logging spec: endpoints: - path: /metrics - port: https + targetPort: 8686 + port: 8686 selector: matchLabels: - control-plane: controller-manager + control-plane: cluster-logging-operator diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index dbcbe1bab1..41199edfbe 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,8 +1,8 @@ resources: -- role.yaml -- role_binding.yaml -- leader_election_role.yaml -- leader_election_role_binding.yaml +#- role.yaml +#- role_binding.yaml +#- leader_election_role.yaml +#- leader_election_role_binding.yaml # Comment the following 4 lines if you want to disable # the auth proxy (https://github.com/brancz/kube-rbac-proxy) # which protects your /metrics endpoint. diff --git a/main.go b/main.go index 1f83b8eae6..ef6648729c 100644 --- a/main.go +++ b/main.go @@ -57,7 +57,7 @@ func main() { var metricsAddr string var enableLeaderElection bool var probeAddr string - flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") + flag.StringVar(&metricsAddr, "metrics-bind-address", ":8686", "The address the metric endpoint binds to.") //flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe end point binds to.") flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ diff --git a/manifests/5.4/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/manifests/5.4/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml new file mode 100644 index 0000000000..038df3abbf --- /dev/null +++ b/manifests/5.4/cluster-logging-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + control-plane: controller-manager + name: cluster-logging-operator-metrics-monitor +spec: + endpoints: + - path: /metrics + targetPort: 8686 + selector: + matchLabels: + control-plane: cluster-logging-operator diff --git a/manifests/5.4/cluster-logging-operator-metrics-service_v1_service.yaml b/manifests/5.4/cluster-logging-operator-metrics-service_v1_service.yaml new file mode 100644 index 0000000000..ff3cc0e735 --- /dev/null +++ b/manifests/5.4/cluster-logging-operator-metrics-service_v1_service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + name: cluster-logging-operator + name: cluster-logging-operator-metrics +spec: + ports: + - name: http-metrics + port: 8686 + protocol: TCP + targetPort: 8686 + selector: + name: cluster-logging-operator + sessionAffinity: None + type: ClusterIP