From 958eb6378fd8bc497244e013891d98e14f827a21 Mon Sep 17 00:00:00 2001 From: HyunSu1768 Date: Thu, 1 Aug 2024 20:19:19 +0900 Subject: [PATCH] =?UTF-8?q?feat=20::=20v2=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/GetContainerCpuUsageService.kt | 3 +- .../service/GetContainerMemoryUsageService.kt | 3 +- .../domain/log/service/LogService.kt | 3 +- .../feign/client/data/DataUtil.kt | 40 ++++++++++++++----- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerCpuUsageService.kt b/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerCpuUsageService.kt index 93905fb..4c44027 100644 --- a/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerCpuUsageService.kt +++ b/src/main/kotlin/xquare/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/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerMemoryUsageService.kt b/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerMemoryUsageService.kt index eab7c06..1f53d88 100644 --- a/src/main/kotlin/xquare/app/xquareinfra/domain/container/application/service/GetContainerMemoryUsageService.kt +++ b/src/main/kotlin/xquare/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 index 07a03f0..2e5ac3f 100644 --- 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 index d550357..cf1fd7b 100644 --- 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 """