Merge branch 'main' into feat/zod-to-openapi

Author: mlhiter

.gitignore

@@ -23,3 +23,5 @@ pkg/registry/save/testdata/registry
 deploy/cloud/tars
 .vscode/
 /lifecycle/tools/
+
+**.env*

controllers/pkg/go.mod

@@ -39,14 +39,12 @@ require (
 	github.com/wechatpay-apiv3/wechatpay-go v0.2.17
 	go.mongodb.org/mongo-driver v1.12.1
 	go.uber.org/zap v1.26.0
-	golang.org/x/time v0.5.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/postgres v1.5.4
 	gorm.io/gorm v1.25.5
 	k8s.io/api v0.29.0
 	k8s.io/apimachinery v0.29.0
-	k8s.io/client-go v12.0.0+incompatible
 	sigs.k8s.io/controller-runtime v0.17.2
 )
 
@@ -106,13 +104,15 @@ require (
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/client-go v12.0.0+incompatible // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect

controllers/pkg/objectstorage/objectstorage.go

@@ -247,6 +247,11 @@ func QueryUserUsageAndTraffic(client *MetricsClient) (Metrics, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get bucket traffic metrics: %w", err)
 	}
+
+	// Initialize a map to count the number of metrics per bucket for sent traffic
+	bucketSentCounts := make(map[string]int)
+	// Seed the random number generator
+
 	for _, bucketMetric := range bucketMetrics {
 		if !isUsageAndTrafficBytesTargetMetric(bucketMetric.Name) {
 			continue
@@ -279,7 +284,14 @@ func QueryUserUsageAndTraffic(client *MetricsClient) (Metrics, error) {
 					metricData.Usage[bucket] += intValue
 				}
 				if bucketMetric.Name == "minio_bucket_traffic_sent_bytes" {
+					// Skip this data point to simulate loss
+					// if strings.HasPrefix(bucket, "961a5c2b") && rand.Intn(10) == 0 {
+					// 	fmt.Printf("Simulated data loss for bucket %s, value %d\n", bucket, intValue)
+					// 	continue
+					// }
 					metricData.Sent[bucket] += intValue
+					// Increment the counter for this bucket
+					bucketSentCounts[bucket]++
 				}
 				if bucketMetric.Name == "minio_bucket_traffic_received_bytes" {
 					metricData.Received[bucket] += intValue
@@ -289,6 +301,22 @@ func QueryUserUsageAndTraffic(client *MetricsClient) (Metrics, error) {
 		}
 	}
 
+	// After processing all metrics, check the counts for sent traffic
+	for user, metricData := range obMetrics {
+		for bucket, count := range bucketSentCounts {
+			if _, ok := metricData.Sent[bucket]; ok {
+				if count < 4 {
+					// Zero out if less than 4 metrics were added
+					metricData.Sent[bucket] = -1
+				}
+				// if strings.HasPrefix(bucket, "961a5c2b") {
+				// 	fmt.Println("bucket:", bucket, ", sent:", sent)
+				// }
+			}
+		}
+		obMetrics[user] = metricData
+	}
+
 	return obMetrics, err
 }
 

controllers/resources/controllers/monitor_controller.go

@@ -25,6 +25,8 @@ import (
 	"sync"
 	"time"
 
+	v1 "github.com/labring/sealos/controllers/account/api/v1"
+
 	"github.com/labring/sealos/controllers/pkg/types"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -260,11 +262,31 @@ func (r *MonitorReconciler) enqueueNamespacesForReconcile() {
 		return
 	}
 
+	filterNormalNamespace(namespaceList)
+
 	if err := r.processNamespaceList(namespaceList); err != nil {
 		r.Logger.Error(err, "failed to process namespace", "time", time.Now().Format(time.RFC3339))
 	}
 }
 
+func filterNormalNamespace(namespaceList *corev1.NamespaceList) {
+	var items []corev1.Namespace
+	for i := range namespaceList.Items {
+		debtStatus := ""
+		anno := namespaceList.Items[i].Annotations
+		if anno != nil {
+			debtStatus = anno[v1.DebtNamespaceAnnoStatusKey]
+		}
+		if debtStatus == v1.SuspendDebtNamespaceAnnoStatus || debtStatus == v1.SuspendCompletedDebtNamespaceAnnoStatus ||
+			debtStatus == v1.FinalDeletionDebtNamespaceAnnoStatus || debtStatus == v1.FinalDeletionCompletedDebtNamespaceAnnoStatus {
+			continue
+		}
+		items = append(items, namespaceList.Items[i])
+	}
+	namespaceList.Items = items
+	logger.Info("filter normal namespace", "namespaceList len", len(namespaceList.Items), "time", time.Now().Format(time.RFC3339))
+}
+
 func (r *MonitorReconciler) processNamespaceList(namespaceList *corev1.NamespaceList) error {
 	logger.Info("start processNamespaceList", "namespaceList len", len(namespaceList.Items), "time", time.Now().Format(time.RFC3339))
 	if len(namespaceList.Items) == 0 {
@@ -580,9 +602,14 @@ func (r *MonitorReconciler) monitorObjectStorageTraffic() error {
 			sent := int64(0)
 			if r.lastObjectMetrics != nil && r.lastObjectMetrics[user].Sent != nil {
 				if _, ok := r.lastObjectMetrics[user].Sent[bucket]; ok {
-					ss := m - r.lastObjectMetrics[user].Sent[bucket]
-					if ss > 0 {
-						sent = ss
+					if m == -1 {
+						r.currentObjectMetrics[user].Sent[bucket] = r.lastObjectMetrics[user].Sent[bucket]
+						m = r.lastObjectMetrics[user].Sent[bucket]
+					} else {
+						ss := m - r.lastObjectMetrics[user].Sent[bucket]
+						if ss > 0 {
+							sent = ss
+						}
 					}
 				}
 			}

frontend/desktop/.vscode/settings.json

@@ -11,8 +11,8 @@
     "i18n-ally.keystyle": "nested",
     "i18n-ally.sortKeys": true,
     "i18n-ally.keepFulfilled": false,
-    "i18n-ally.sourceLanguage": "zh",
-    "i18n-ally.displayLanguage": "zh",
+    "i18n-ally.sourceLanguage": "en",
+    "i18n-ally.displayLanguage": "en",
     "i18n-ally.namespace": true,
     "i18n-ally.pathMatcher": "{locale}/{namespaces}.json",
     "i18n-ally.extract.targetPickingStrategy": "most-similar-by-key",

frontend/desktop/deploy/README.md

@@ -6,14 +6,15 @@ sealos build -t docker.io/labring/sealos-cloud-desktop:latest -f Kubefile .
 
 ### Env
 
-| Name                       | Description                 | Default            |
-|----------------------------|-----------------------------|--------------------|
-| `cloudDomain`              | sealos cloud domain         | `127.0.0.1.nip.io` |
-| `wildcardCertSecretName`   | wildcard cert secret name   | `wildcard-cert`    |
+| Name                     | Description               | Default            |
+| ------------------------ | ------------------------- | ------------------ |
+| `cloudDomain`            | sealos cloud domain       | `127.0.0.1.nip.io` |
+| `wildcardCertSecretName` | wildcard cert secret name | `wildcard-cert`    |
 
 ### Config
 
 Here is a config file example:
+
 ```yaml
 # desktop-config.yaml
 apiVersion: apps.sealos.io/v1beta1
@@ -49,7 +50,7 @@ spec:
           layout:
             title: "Sealos Cloud"
             logo: "/logo.png"
-            backgroundImage: "/images/bg-blue.svg"
+            backgroundImage: "/images/bg-light.svg"
             meta:
               title: "Sealos Cloud"
               description: "Sealos Cloud"
@@ -76,7 +77,6 @@ spec:
               password:
                 enabled: "true"
                 salt: "thisispasswordsalt"
-    
 ```
 
 ### How to run
@@ -86,5 +86,5 @@ sealos run \
     --env cloudDomain="127.0.0.1.nip.io" \
     --env wildcardCertSecretName="wildcard-cert" \
     docker.io/labring/sealos-cloud-desktop:latest \
-    --config-file desktop-config.yaml 
+    --config-file desktop-config.yaml
 ```

frontend/desktop/deploy/manifests/configmap.yaml.tmpl

@@ -23,7 +23,7 @@ data:
       layout:
         title: "Sealos Cloud"
         logo: "/logo.svg"
-        backgroundImage: "/images/bg-blue.svg"
+        backgroundImage: "/images/bg-light.svg"
         meta:
           title: "Sealos Cloud"
           description: "Sealos Cloud"

frontend/desktop/package.json

@@ -38,11 +38,13 @@
     "@tanstack/react-query": "^4.35.3",
     "@umami/node": "^0.4.0",
     "axios": "^1.5.1",
+    "boring-avatars": "^1.11.2",
     "clsx": "^1.2.1",
     "cors": "^2.8.5",
     "croner": "^8.0.2",
     "dayjs": "^1.11.10",
     "decimal.js": "^10.4.3",
+    "disposable-email-domains-js": "^1.11.0",
     "eslint": "8.38.0",
     "eslint-config-next": "13.3.0",
     "framer-motion": "^10.16.4",
@@ -53,6 +55,7 @@
     "jsonwebtoken": "^9.0.2",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
+    "lucide-react": "^0.488.0",
     "minio": "^7.1.3",
     "mongodb": "^5.9.0",
     "nanoid": "^4.0.2",

frontend/desktop/prisma/global/migrations/20250512031158_add_plan/migration.sql

@@ -0,0 +1,32 @@
+-- CreateTable
+CREATE TABLE "user_info" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "user_uid" UUID NOT NULL,
+    "sign_up_region_uid" UUID NOT NULL,
+    "is_inited" BOOL NOT NULL DEFAULT false,
+    "config" JSONB,
+
+    CONSTRAINT "user_info_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "workspace_usage" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "user_uid" UUID NOT NULL,
+    "workspace_uid" UUID NOT NULL,
+    "region_uid" UUID NOT NULL,
+    "seat" INT4 NOT NULL,
+    "created_at" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "workspace_usage_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_info_user_uid_key" ON "user_info"("user_uid");
+
+-- CreateIndex
+CREATE INDEX "workspace_usage_user_uid_idx" ON "workspace_usage"("user_uid");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "workspace_usage_region_uid_user_uid_workspace_uid_key" ON "workspace_usage"("region_uid", "user_uid", "workspace_uid");

frontend/desktop/prisma/global/schema.prisma

@@ -25,12 +25,13 @@ model OauthProvider {
 }
 
 model Region {
-  uid         String              @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  displayName String
-  location    String
-  domain      String
-  description String?
-  txDetail    TransactionDetail[]
+  uid            String              @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  displayName    String
+  location       String
+  domain         String
+  description    String?
+  txDetail       TransactionDetail[]
+  WorkspaceUsage WorkspaceUsage[]
 }
 
 model Account {
@@ -59,6 +60,34 @@ model AccountTransaction {
   billing_id               String   @db.Uuid
 }
 
+model UserInfo {
+  id              String  @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  userUid         String  @unique @map("user_uid") @db.Uuid
+  signUpRegionUid String  @map("sign_up_region_uid") @db.Uuid
+  isInited        Boolean @default(false) @map("is_inited")
+  // verify_email    Boolean @default(false)
+  config          Json?
+  user            User    @relation(fields: [userUid], references: [uid])
+
+  @@map("user_info")
+}
+
+model WorkspaceUsage {
+  id           String   @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  userUid      String   @map("user_uid") @db.Uuid
+  workspaceUid String   @map("workspace_uid") @db.Uuid
+  regionUid    String   @map("region_uid") @db.Uuid
+  seat         Int
+  createdAt    DateTime @default(now()) @map("created_at") @db.Timestamptz(3)
+  updatedAt    DateTime @updatedAt @map("updated_at") @db.Timestamptz(3)
+  region       Region   @relation(fields: [regionUid], references: [uid])
+  user         User     @relation(fields: [userUid], references: [uid])
+
+  @@unique([regionUid, userUid, workspaceUid])
+  @@index([userUid])
+  @@map("workspace_usage")
+}
+
 model ErrorPaymentCreate {
   userUid         String   @db.Uuid
   regionUid       String   @db.Uuid
@@ -106,6 +135,8 @@ model User {
   DeleteUserTransactionInfo   DeleteUserTransactionInfo?
   deleteUserLog               DeleteUserLog?
   userTasks                   UserTask[]
+  userInfo                    UserInfo?
+  WorkspaceUsage              WorkspaceUsage[]
 }
 
 model Transfer {
@@ -219,7 +250,7 @@ model EventLog {
   createdAt DateTime @default(now()) @db.Timestamptz(3)
   mainId    String
   eventName String
-  // json 
+  // json
   data      String
 }