feat :: v2 로직 수정

team-xquare · Aug 1, 2024 · 958eb63 · 958eb63
1 parent 04bfb11
commit 958eb63
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/...quare/app/xquareinfra/domain/container/application/service/GetContainerCpuUsageService.kt b/...quare/app/xquareinfra/domain/container/application/service/GetContainerCpuUsageService.kt
@@ -56,7 +56,8 @@ class GetContainerCpuUsageService(
                         team = deploy.team.teamNameEn,
                         containerName = deploy.deployName,
                         serviceType = deploy.deployType,
-                        envType = environment
+                        envType = environment,
+                        isV2 = deploy.isV2
                     ),
                     refId = "A",
                     datasource = "prometheus",

diff --git a/...re/app/xquareinfra/domain/container/application/service/GetContainerMemoryUsageService.kt b/...re/app/xquareinfra/domain/container/application/service/GetContainerMemoryUsageService.kt
@@ -58,7 +58,8 @@ class GetContainerMemoryUsageService(
                         team = deploy.team.teamNameEn,
                         containerName = deploy.deployName,
                         serviceType = deploy.deployType,
-                        envType = environment
+                        envType = environment,
+                        isV2 = deploy.isV2
                     ),
                     refId = "A",
                     datasource = "prometheus",

diff --git a/src/main/kotlin/xquare/app/xquareinfra/domain/log/service/LogService.kt b/src/main/kotlin/xquare/app/xquareinfra/domain/log/service/LogService.kt
@@ -68,7 +68,8 @@ class LogService(
                         team = deploy.team.teamNameEn,
                         containerName = deploy.deployName,
                         serviceType = deploy.deployType,
-                        envType = if(environment == "prod") ContainerEnvironment.prod else ContainerEnvironment.stag
+                        envType = if(environment == "prod") ContainerEnvironment.prod else ContainerEnvironment.stag,
+                        isV2 = deploy.isV2
                     ),
                     refId = "A",
                     datasource = "loki",

diff --git a/src/main/kotlin/xquare/app/xquareinfra/infrastructure/feign/client/data/DataUtil.kt b/src/main/kotlin/xquare/app/xquareinfra/infrastructure/feign/client/data/DataUtil.kt
@@ -27,14 +27,36 @@ object DataUtil {
         }
     }
 
-    fun makeLogQuery(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment): String {
-        val fullName = "${containerName}-${serviceType.toString().lowercase()}-${envType.toString().lowercase()}"
-        val response = "{job=\"$team-${envType.toString().lowercase()}/$fullName\"} |~ \"(?i)\" \n"
+    fun getFullName(
+        containerName: String,
+        serviceType: DeployType,
+        envType: ContainerEnvironment,
+        isV2: Boolean
+    ): String {
+        var fullName: String
+        if(isV2) {
+            fullName = "${containerName}-${envType.toString().lowercase()}"
+        }
+        else {
+            fullName = "${containerName}-${serviceType.toString().lowercase()}-${envType.toString().lowercase()}"
+        }
+        return fullName
+    }
+
+
+    fun makeLogQuery(
+        team: String,
+        containerName: String,
+        serviceType: DeployType,
+        envType: ContainerEnvironment,
+        isV2: Boolean
+    ): String {
+        val response = "{job=\"$team-${envType.toString().lowercase()}/${getFullName(containerName, serviceType, envType, isV2)}\"} |~ \"(?i)\" \n"
         return response
     }
 
-    fun makeCpuUsageQuery(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment): String {
-        val fullName = "${containerName}-${serviceType.toString().lowercase()}-${envType.toString().lowercase()}"
+    fun makeCpuUsageQuery(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment, isV2: Boolean): String {
+        val fullName = getFullName(containerName, serviceType, envType, isV2)
 
         val namespace = "$team-${envType.toString().lowercase()}"
 
@@ -56,8 +78,8 @@ object DataUtil {
         """.trimIndent()
     }
 
-    fun makeMemoryUsageQuery(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment): String {
-        val fullName = "${containerName}-${serviceType.toString().lowercase()}-${envType.toString().lowercase()}"
+    fun makeMemoryUsageQuery(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment, isV2: Boolean): String {
+        val fullName = getFullName(containerName, serviceType, envType, isV2)
         val namespace = "$team-${envType.toString().lowercase()}"
 
         return """
@@ -80,8 +102,8 @@ object DataUtil {
         """.trimIndent()
     }
 
-    fun makeRequestCountPerMinute(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment, minute: Int): String {
-        val fullName = "${containerName}-${serviceType.toString().lowercase()}-${envType.toString().lowercase()}"
+    fun makeRequestCountPerMinute(team: String, containerName: String, serviceType: DeployType, envType: ContainerEnvironment, minute: Int, isV2: Boolean): String {
+        val fullName = getFullName(containerName, serviceType, envType, isV2)
         val namespace = "$team-${envType.toString().lowercase()}"
 
         return """