feat(supervisor): add resource status severity

Author: Andrea Falzetti

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/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