Merge remote-tracking branch 'upstream/master'

yang1666204 · May 7, 2024 · 23838f8 · 23838f8
2 parents 1b9776e + d0c2143
commit 23838f8
Show file tree

Hide file tree

Showing 105 changed files with 17,442 additions and 725 deletions.
diff --git a/charts/oceanbase-dashboard/templates/bundle.yaml b/charts/oceanbase-dashboard/templates/bundle.yaml
@@ -35,7 +35,7 @@ spec:
             - name: USER_NAMESPACE
               value: {{ .Values.userNamespace | default .Release.Namespace }}
         - name: prometheus
-          image: prom/prometheus
+          image: prom/prometheus:v2.51.1
           resources:
             requests:
               cpu: 100m
@@ -54,10 +54,10 @@ spec:
             - name: prometheus-storage-volume
               mountPath: /prometheus/
       volumes:
+      # volumes for prometheus
         - name: prometheus-config-volume
           configMap:
             defaultMode: 420
             name: {{ .Release.Name }}-prometheus-server-conf
-
         - name: prometheus-storage-volume
           emptyDir: {}
diff --git a/charts/oceanbase-dashboard/templates/prom-config.yaml b/charts/oceanbase-dashboard/templates/prom-config.yaml
@@ -19,7 +19,7 @@ data:
       - scheme: http
         static_configs:
         - targets:
-          - "alertmanager.monitoring.svc:9093"
+          - "alertmanager.{{ .Release.Namespace }}.svc:9093"
 
     scrape_configs:
       - job_name: 'obagent-monitor-basic'

diff --git a/internal/dashboard/business/oceanbase/obcluster_usage.go b/internal/dashboard/business/oceanbase/obcluster_usage.go
@@ -62,7 +62,7 @@ func GetOBClusterUsages(ctx context.Context, nn *param.K8sObjectIdentity) (*resp
 	}
 	defer manager.Close()
 
-	parameters, err := manager.GetParameter("__min_full_resource_pool_memory", nil)
+	parameters, err := manager.GetParameter(ctx, "__min_full_resource_pool_memory", nil)
 	if err != nil {
 		return nil, httpErr.NewInternal(err.Error())
 	}
@@ -77,7 +77,7 @@ func GetOBClusterUsages(ctx context.Context, nn *param.K8sObjectIdentity) (*resp
 		}
 		essentials.MinPoolMemory = minPoolMemory.Value()
 	}
-	gvservers, err := manager.ListGVServers()
+	gvservers, err := manager.ListGVServers(ctx)
 	if err != nil {
 		return nil, httpErr.NewInternal(err.Error())
 	}

diff --git a/internal/dashboard/business/oceanbase/obtenant.go b/internal/dashboard/business/oceanbase/obtenant.go
@@ -174,10 +174,10 @@ func buildOverviewFromApiType(t *v1alpha1.OBTenant) *response.OBTenantOverview {
 	rt.Locality = t.Status.TenantRecordInfo.Locality
 	rt.PrimaryZone = t.Status.TenantRecordInfo.PrimaryZone
 
-	for i := range t.Spec.Pools {
-		pool := t.Spec.Pools[i]
+	for i := range t.Status.Pools {
+		pool := t.Status.Pools[i]
 		replica := response.OBTenantReplica{
-			Zone:     pool.Zone,
+			Zone:     pool.ZoneList,
 			Priority: pool.Priority,
 			Type:     pool.Type.Name,
 		}

diff --git a/internal/dashboard/generated/bindata/bindata.go b/internal/dashboard/generated/bindata/bindata.go