[Backport] NETOBSERV-2107: fix service monitor quotes (#167)

* fix service monitor quotes

* move service to service monitor file

* add missing roles

* fix relabel regexes

* restore missing env var

Author: jpinsonneau

res/metric-capture.yml

@@ -31,6 +31,26 @@ spec:
             value: "false"
           - name: LOG_LEVEL
             value: info
+          - name: INTERFACES
+            value: ""
+          - name: EXCLUDE_INTERFACES
+            value: "lo"
+          - name: SAMPLING
+            value: "1"
+          - name: ENABLE_RTT
+            value: "false"
+          - name: ENABLE_PKT_DROPS
+            value: "false"
+          - name: ENABLE_DNS_TRACKING
+            value: "false"
+          - name: ENABLE_NETWORK_EVENTS_MONITORING
+            value: "false"
+          - name: ENABLE_UDN_MAPPING
+            value: "false"
+          - name: ENABLE_PKT_TRANSLATION
+            value: "false"
+          - name: ENABLE_FLOW_FILTER
+            value: "false"
           - name: FLOW_FILTER_RULES
             value: >-
               []
@@ -65,21 +85,4 @@ spec:
         - name: var-run-ovs
           hostPath:
             path: /var/run/openvswitch
-            type: DirectoryOrCreate
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: netobserv-cli
-  namespace: "{{NAMESPACE}}"
-  labels:
-    app: netobserv-cli
-spec:
-  ports:
-    - name: prometheus
-      protocol: TCP
-      port: 9401
-      targetPort: 9401
-  selector:
-    app: netobserv-cli
-  type: ClusterIP
+            type: DirectoryOrCreate

res/service-account.yml

@@ -62,3 +62,39 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: netobserv-cli
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: netobserv-cli-metrics
+  namespace: "{{NAMESPACE}}"
+rules:
+# allow openshift-monitoring metrics reading
+  - apiGroups:
+     - ''
+    resources:
+     - pods
+     - services
+     - endpoints
+    verbs:
+     - list
+     - get
+     - watch
+  - nonResourceURLs:
+     - /metrics
+    verbs:
+     - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: netobserv-cli-metrics
+  namespace: "{{NAMESPACE}}"
+subjects:
+  - kind: ServiceAccount
+    name: prometheus-k8s
+    namespace: openshift-monitoring
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: netobserv-cli-metrics

res/service-monitor.yml

@@ -89,7 +89,7 @@ function loadYAMLs() {
   if [ -f ./res/metric-capture.yml ]; then
     metricAgentYAML="$(cat ./res/metric-capture.yml)"
   fi
-  metricAgentYAML="${metricAgentYAML//"{{NAMESPACE}}"/${namespace}}"
+  metricAgentYAML="${metricAgentYAML/"{{NAMESPACE}}"/${namespace}}"
   metricAgentYAML="${metricAgentYAML/"{{AGENT_IMAGE_URL}}"/${agentImg}}"
 
   collectorServiceYAML='