From 03cfcc1e1a4485f93b41423e02cb6c66a5bd4503 Mon Sep 17 00:00:00 2001
From: dongwoo <wkd1994@ex-em.com>
Date: Tue, 25 Jul 2023 17:52:36 +0900
Subject: [PATCH] =?UTF-8?q?[fea]=20=EB=8D=B0=EB=AA=AC=EC=85=8B=20=EC=97=90?=
 =?UTF-8?q?=EC=9D=B4=EC=A0=84=ED=8A=B8=20=EA=B2=B0=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:Why/What:
- node-exporter와 topology-agent가 같이 배포되도록 수정
- node-exporter의 컨테이너명을 node-agent로 수정
- node-exporter scrape rule 명칭을 agent로 수정

:Tasks:
[CLOUD-19283] Topology Agent 와 node exporter 통합
<https://app.clickup.com/t/25540965/CLOUD-19283>
---
 .../cortex/templates/node-exporter.yaml       | 96 -------------------
 .../templates/cloudmoa-metric-agent.yaml      |  2 +-
 .../05-imxc/templates/topology-agent.yaml     | 38 ++++++++
 3 files changed, 39 insertions(+), 97 deletions(-)
 delete mode 100644 roles/cmoa_install/files/02-base/base/charts/cortex/templates/node-exporter.yaml

diff --git a/roles/cmoa_install/files/02-base/base/charts/cortex/templates/node-exporter.yaml b/roles/cmoa_install/files/02-base/base/charts/cortex/templates/node-exporter.yaml
deleted file mode 100644
index 87a617e..0000000
--- a/roles/cmoa_install/files/02-base/base/charts/cortex/templates/node-exporter.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    prometheus.io/scrape: 'true'
-  labels:
-    app: node-exporter
-    name: node-exporter
-  name: node-exporter
-  namespace: imxc
-spec:
-  clusterIP: None
-  ports:
-  - name: scrape
-    port: 9100
-    protocol: TCP
-  selector:
-    app: node-exporter
-  type: ClusterIP
----
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: apps/v1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: DaemonSet
-metadata:
-  name: node-exporter
-  namespace: imxc
-spec:
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
-  selector:
-    matchLabels:
-      app: node-exporter
-{{- end }}
-  template:
-    metadata:
-      labels:
-        app: node-exporter
-      name: node-exporter
-    spec:
-      tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      - effect: NoExecute
-        operator: Exists
-      containers:
-      - image: {{ .Values.global.IMXC_IN_REGISTRY }}/node-exporter
-        name: node-exporter
-        resources:
-          limits:
-            cpu: 250m
-            memory: 180Mi
-          requests:
-            cpu: 125m
-            memory: 90Mi
-        ports:
-        - containerPort: 9100
-          hostPort: 9100
-          name: scrape
-        args:
-        - --path.procfs=/host/proc
-        - --path.sysfs=/host/sys
-        - --path.rootfs=/host/root
-        - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|run|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
-        - --collector.tcpstat
-        # --log.level=debug
-        env:
-        - name: GOMAXPROCS
-          value: "1"
-        volumeMounts:
-        - mountPath: /host/proc
-          name: proc
-          readOnly: false
-        - mountPath: /host/sys
-          name: sys
-          readOnly: false
-        - mountPath: /host/root
-          mountPropagation: HostToContainer
-          name: root
-          readOnly: true
-      hostNetwork: true
-      hostPID: true
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 65534
-      volumes:
-      - hostPath:
-          path: /proc
-        name: proc
-      - hostPath:
-          path: /sys
-        name: sys
-      - hostPath:
-          path: /
-        name: root
diff --git a/roles/cmoa_install/files/05-imxc/templates/cloudmoa-metric-agent.yaml b/roles/cmoa_install/files/05-imxc/templates/cloudmoa-metric-agent.yaml
index 45c3d41..d371296 100755
--- a/roles/cmoa_install/files/05-imxc/templates/cloudmoa-metric-agent.yaml
+++ b/roles/cmoa_install/files/05-imxc/templates/cloudmoa-metric-agent.yaml
@@ -110,7 +110,7 @@ data:
           action: keep
 
 
-      - job_name: 'kubernetes-node-exporter'
+      - job_name: 'kubernetes-node-agent'
         tls_config:
           ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/roles/cmoa_install/files/05-imxc/templates/topology-agent.yaml b/roles/cmoa_install/files/05-imxc/templates/topology-agent.yaml
index 80476a3..b75ec61 100755
--- a/roles/cmoa_install/files/05-imxc/templates/topology-agent.yaml
+++ b/roles/cmoa_install/files/05-imxc/templates/topology-agent.yaml
@@ -35,6 +35,7 @@ spec:
         app: topology-agent
     spec:
       hostNetwork: true
+      hostPID: true
       dnsPolicy: ClusterFirstWithHostNet
       # below appended
       hostPID: true
@@ -44,6 +45,40 @@ spec:
       - effect: NoExecute
         operator: Exists
       containers:
+        - image: {{ .Values.global.IMXC_IN_REGISTRY }}/node-exporter
+          name: node-agent
+          resources:
+            limits:
+              cpu: 250m
+              memory: 180Mi
+            requests:
+              cpu: 125m
+              memory: 90Mi
+          ports:
+          - containerPort: 9100
+            hostPort: 9100
+            name: scrape
+          args:
+          - --path.procfs=/host/proc
+          - --path.sysfs=/host/sys
+          - --path.rootfs=/host/root
+          - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|run|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
+          - --collector.tcpstat
+          # --log.level=debug
+          env:
+          - name: GOMAXPROCS
+            value: "1"
+          volumeMounts:
+          - mountPath: /host/proc
+            name: proc-volume
+            readOnly: false
+          - mountPath: /host/sys
+            name: sys-volume
+            readOnly: false
+          - mountPath: /host/root
+            mountPropagation: HostToContainer
+            name: root-volume
+            readOnly: true
         - name: topology-agent
           image: {{ .Values.global.IMXC_IN_REGISTRY }}/topology-agent:{{ .Values.global.TOPOLOGY_AGENT_VERSION }}
           imagePullPolicy: IfNotPresent
@@ -105,3 +140,6 @@ spec:
         - name: root-volume
           hostPath:
             path: /
+        - hostPath:
+            path: /sys
+          name: sys-volume
\ No newline at end of file