fix: get instance more limit (#15)

* fix: get instance more limit

* fix: supportDimensions missing key

Co-authored-by: juexiaolin <[email protected]>

Author: juexiaolin

configs/qcloud-cvm-product.yml

@@ -11,7 +11,7 @@ products:
     all_instances: true
     #only_include_metrics: []
     #only_include_instances: [ins-xxxxxxxx]
-    #extra_labels: [InstanceName]
+    #extra_labels: [InstanceId, InstanceName]
     #statistics_types: [last]
     #period_seconds: 60
     #metric_name_type: 2

pkg/collector/handler_clb.go

@@ -3,6 +3,7 @@ package collector
 import (
 	"github.com/go-kit/kit/log"
 	"github.com/tencentyun/tencentcloud-exporter/pkg/metric"
+	"github.com/tencentyun/tencentcloud-exporter/pkg/util"
 )
 
 const (
@@ -19,9 +20,10 @@ type clbHandler struct {
 }
 
 func (h *clbHandler) CheckMetricMeta(meta *metric.TcmMeta) bool {
-	if len(meta.SupportDimensions) == 0 {
-		meta.SupportDimensions = append(meta.SupportDimensions, "vip")
+	if !util.IsStrInList(meta.SupportDimensions, ClbInstanceidKey) {
+		meta.SupportDimensions = append(meta.SupportDimensions, ClbInstanceidKey)
 	}
+
 	return true
 }
 

pkg/collector/handler_clb7.go

@@ -33,7 +33,10 @@ type clb7Handler struct {
 }
 
 func (h *clb7Handler) CheckMetricMeta(meta *metric.TcmMeta) bool {
-	meta.SupportDimensions = append(meta.SupportDimensions, "vip")
+	if !util.IsStrInList(meta.SupportDimensions, Clb7InstanceidKey) {
+		meta.SupportDimensions = append(meta.SupportDimensions, Clb7InstanceidKey)
+	}
+
 	return true
 }
 

pkg/collector/handler_cvm.go

@@ -25,6 +25,10 @@ type cvmHandler struct {
 }
 
 func (h *cvmHandler) CheckMetricMeta(meta *metric.TcmMeta) bool {
+	if !util.IsStrInList(meta.SupportDimensions, CvmInstanceidKey) {
+		meta.SupportDimensions = append(meta.SupportDimensions, CvmInstanceidKey)
+	}
+
 	return true
 }
 

pkg/instance/repository_cdb.go

@@ -50,6 +50,7 @@ func (repo *CdbTcInstanceRepository) ListByFilters(filters map[string]string) (i
 	var limit uint64 = 2000
 	var total int64 = -1
 
+	req.Offset = &offset
 	req.Limit = &limit
 
 getMoreInstances:
@@ -70,6 +71,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < uint64(total) {
+		req.Offset = &offset
 		goto getMoreInstances
 	}
 

pkg/instance/repository_clb.go

@@ -63,6 +63,8 @@ func (repo *ClbTcInstanceRepository) ListByFilters(filters map[string]string) (i
 	var offset int64 = 0
 	var limit int64 = 100
 	var total int64 = -1
+
+	req.Offset = &offset
 	req.Limit = &limit
 
 getMoreInstances:
@@ -83,6 +85,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < total {
+		req.Offset = &offset
 		goto getMoreInstances
 	}
 

pkg/instance/repository_cvm.go

@@ -50,6 +50,7 @@ func (repo *CvmTcInstanceRepository) ListByFilters(filters map[string]string) (i
 	var limit int64 = 100
 	var total int64 = -1
 
+	req.Offset = &offset
 	req.Limit = &limit
 
 getMoreInstances:
@@ -70,6 +71,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < total {
+		req.Offset = &offset
 		goto getMoreInstances
 	}
 	return

pkg/instance/repository_dc.go

@@ -50,6 +50,7 @@ func (repo *DcTcInstanceRepository) ListByFilters(filters map[string]string) (in
 	var limit int64 = 100
 	var total int64 = -1
 
+	req.Offset = &offset
 	req.Limit = &limit
 
 getMoreInstances:
@@ -70,6 +71,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < total {
+		req.Offset = &offset
 		goto getMoreInstances
 	}
 

pkg/instance/repository_dcx.go

@@ -49,6 +49,7 @@ func (repo *DcxTcInstanceRepository) ListByFilters(filters map[string]string) (i
 	var offset int64 = 0
 	var limit int64 = 100
 	var total int64 = -1
+	req.Offset = &offset
 	req.Limit = &limit
 
 getMoreInstances:
@@ -69,6 +70,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < total {
+		req.Offset = &offset
 		goto getMoreInstances
 	}
 

pkg/instance/repository_mongo.go

@@ -51,6 +51,7 @@ func (repo *MongoTcInstanceRepository) ListByFilters(filters map[string]string)
 	var limit uint64 = 100
 	var total int64 = -1
 
+	req.Offset = &offset
 	req.Limit = &limit
 
 	if v, ok := filters["ProjectId"]; ok {
@@ -82,6 +83,7 @@ getMoreInstances:
 	}
 	offset += limit
 	if offset < uint64(total) {
+		req.Offset = &offset
 		goto getMoreInstances
 	}