feat(supervisor): add resource status severity

components/gitpod-cli/cmd/top.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	supervisor_helper "github.com/gitpod-io/gitpod/gitpod-cli/pkg/supervisor-helper"
+	"github.com/gitpod-io/gitpod/supervisor/api"
 	supervisor "github.com/gitpod-io/gitpod/supervisor/api"
 
 	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/utils"
@@ -35,8 +36,8 @@ func outputTable(workspaceResources *supervisor.ResourcesStatusResponse) {
 	colors := []tablewriter.Colors{}
 
 	if !noColor && utils.ColorsEnabled() {
-		cpuColor := getColor(cpuFraction)
-		memoryColor := getColor(memFraction)
+		cpuColor := getColor(workspaceResources.Cpu.Severity)
+		memoryColor := getColor(workspaceResources.Memory.Severity)
 		colors = []tablewriter.Colors{{cpuColor}, {memoryColor}}
 	}
 
@@ -45,12 +46,11 @@ func outputTable(workspaceResources *supervisor.ResourcesStatusResponse) {
 	table.Render()
 }
 
-// TODO: retrieve thresholds from supervisor once we implement this: https://github.com/gitpod-io/gitpod/issues/12075
-func getColor(value int64) int {
-	switch {
-	case value >= 95:
+func getColor(severity api.ResourceStatusSeverity) int {
+	switch severity {
+	case api.ResourceStatusSeverity_danger:
 		return tablewriter.FgRedColor
-	case value >= 80:
+	case api.ResourceStatusSeverity_warning:
 		return tablewriter.FgYellowColor
 	default:
 		return tablewriter.FgHiGreenColor

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodMetricProvider.kt

@@ -10,6 +10,7 @@ import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.MetricType
 import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.MetricsStatus
 import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.providers.MetricProvider
 import io.gitpod.jetbrains.remote.GitpodManager
+import io.gitpod.supervisor.api.Status.ResourceStatusSeverity
 import kotlin.math.roundToInt
 
 class GitpodMetricProvider: MetricProvider {
@@ -21,29 +22,15 @@ class GitpodMetricProvider: MetricProvider {
 
         val cpuUsed = resourceStatus?.cpu?.used?.toDouble() ?: 0.0
         val cpuTotal = resourceStatus?.cpu?.limit?.toDouble() ?: 0.0
+        val cpuSeverity = resourceStatus?.cpu?.severity ?: ResourceStatusSeverity.normal
         val cpuPercentage = (cpuUsed / cpuTotal) * 100
-
-        // TODO: retrieve thresholds from supervisor once we implement this: https://github.com/gitpod-io/gitpod/issues/12075
-        val cpuStatus = if (cpuPercentage >= 95) {
-            MetricsStatus.DANGER
-        } else if (cpuPercentage >= 80) {
-            MetricsStatus.WARNING
-        } else {
-            MetricsStatus.NORMAL
-        }
+        val cpuStatus = getSeverityStatus(cpuSeverity)
 
         val memoryUsed = convertBytesToGB(resourceStatus?.memory?.used ?: 0)
         val memoryTotal = convertBytesToGB(resourceStatus?.memory?.limit ?: 0)
+        val memorySeverity = resourceStatus?.memory?.severity ?:ResourceStatusSeverity.normal
         val memoryPercentage = (memoryUsed / memoryTotal) * 100
-
-        // TODO: retrieve thresholds from supervisor once we implement this: https://github.com/gitpod-io/gitpod/issues/12075
-        val memoryStatus = if (memoryPercentage >= 95) {
-            MetricsStatus.DANGER
-        } else if (memoryPercentage >= 80) {
-            MetricsStatus.WARNING
-        } else {
-            MetricsStatus.NORMAL
-        }
+        val memoryStatus = getSeverityStatus(memorySeverity)
 
         return mapOf(
                 "gitpod_workspace_cpu_used" to Metric(MetricType.PERFORMANCE, MetricsStatus.NORMAL, roundTo(cpuUsed, 0)),
@@ -62,4 +49,14 @@ class GitpodMetricProvider: MetricProvider {
     private fun roundTo(number: Double, decimals: Int) : String {
         return String.format("%.${decimals}f", number)
     }
+
+    private fun getSeverityStatus(severity: ResourceStatusSeverity) : MetricsStatus {
+        return if (severity == ResourceStatusSeverity.danger) {
+            MetricsStatus.DANGER
+        } else if (severity == ResourceStatusSeverity.warning) {
+            MetricsStatus.WARNING
+        } else {
+            MetricsStatus.NORMAL
+        }
+    }
 }

components/supervisor-api/generate.sh

@@ -53,7 +53,7 @@ local_java_protoc() {
         --java_out=java/src/main/java \
         ./*.proto
     # remove trailing spaces
-    find components/supervisor-api/java/src/main/java/io/gitpod/supervisor/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
+    find "${COMPONENTS_DIR}"/supervisor-api/java/src/main/java/io/gitpod/supervisor/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
     # revert Java reserved keywords
     sed -i 's/private_visibility = 0;/private = 0;/g' status.proto
     sed -i 's/public_visibility = 1;/public = 1;/g' status.proto