LOG-1975: return back metrics service for CLO

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

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

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.

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

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.

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. "+

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

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