Skip to content

Commit 0ee339e

Browse files
tianmu2023tianmu2023
committed
feat: collect rds log config
1 parent c0f7467 commit 0ee339e

File tree

5 files changed

+40
-6
lines changed

5 files changed

+40
-6
lines changed

‎collector/alicloud/collector/db/rds/rds.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package rds
1717

1818
import (
1919
"context"
20+
das20200116 "github.com/alibabacloud-go/das-20200116/v3/client"
2021
rds20140815 "github.com/alibabacloud-go/rds-20140815/v6/client"
2122
util "github.com/alibabacloud-go/tea-utils/v2/service"
2223
"github.com/alibabacloud-go/tea/tea"
@@ -73,6 +74,7 @@ func GetRDSResource() schema.Resource {
7374

7475
func GetInstanceDetail(ctx context.Context, service schema.ServiceInterface, res chan<- any) error {
7576
cli := service.(*collector.Services).RDS
77+
dasCli := service.(*collector.Services).DAS
7678

7779
var page int32 = 1
7880
req := &rds20140815.DescribeDBInstancesRequest{}
@@ -98,6 +100,7 @@ func GetInstanceDetail(ctx context.Context, service schema.ServiceInterface, res
98100
DBInstanceTDE: describeDBInstanceTDE(ctx, cli, i.DBInstanceId),
99101
SQLCollectorPolicy: describeSQLCollectorPolicy(ctx, cli, i.DBInstanceId),
100102
BackupPolicy: describeBackupPolicy(ctx, cli, i.DBInstanceId),
103+
SqlLogConfig: describeSqlLogConfig(ctx, dasCli, i.DBInstanceId),
101104
}
102105
}
103106
if count >= int(*bd.TotalRecordCount) || len(bd.Items.DBInstance) == 0 {
@@ -118,6 +121,7 @@ type Detail struct {
118121
DBInstanceTDE *rds20140815.DescribeDBInstanceTDEResponseBody
119122
SQLCollectorPolicy *rds20140815.DescribeSQLCollectorPolicyResponseBody
120123
BackupPolicy *rds20140815.DescribeBackupPolicyResponseBody
124+
SqlLogConfig *das20200116.DescribeSqlLogConfigResponseBodyData
121125
}
122126

123127
// This interface is used to query the backup settings of the RDS instance.
@@ -212,3 +216,14 @@ func describeSQLCollectorPolicy(ctx context.Context, cli *rds20140815.Client, DB
212216
}
213217
return resp.Body
214218
}
219+
220+
func describeSqlLogConfig(ctx context.Context, cli *das20200116.Client, InstanceId *string) (res *das20200116.DescribeSqlLogConfigResponseBodyData) {
221+
request := &das20200116.DescribeSqlLogConfigRequest{}
222+
request.InstanceId = InstanceId
223+
resp, err := cli.DescribeSqlLogConfig(request)
224+
if err != nil {
225+
log.CtxLogger(ctx).Error("", zap.Error(err))
226+
return
227+
}
228+
return resp.Body.Data
229+
}

‎collector/alicloud/collector/services.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
cr20181201 "github.com/alibabacloud-go/cr-20181201/v2/client"
3535
cs20151215 "github.com/alibabacloud-go/cs-20151215/v5/client"
3636
openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
37+
das20200116 "github.com/alibabacloud-go/das-20200116/v3/client"
3738
ddoscoo20200101 "github.com/alibabacloud-go/ddoscoo-20200101/v3/client"
3839
dds20151201 "github.com/alibabacloud-go/dds-20151201/v8/client"
3940
dms_enterprise20181101 "github.com/alibabacloud-go/dms-enterprise-20181101/client"
@@ -192,6 +193,7 @@ type Services struct {
192193
VOD *vod.Client
193194
SGW *sgw.Client
194195
Live *live.Client
196+
DAS *das20200116.Client
195197
}
196198

197199
// Clone creates a new instance of Services with copied configuration
@@ -339,6 +341,10 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err
339341
if err != nil {
340342
log.CtxLogger(ctx).Warn("init rds client failed", zap.Error(err))
341343
}
344+
s.DAS, err = createDasClient(param.Region, s.Config)
345+
if err != nil {
346+
log.CtxLogger(ctx).Warn("init das client failed", zap.Error(err))
347+
}
342348
case PolarDB:
343349
s.Polardb, err = createPolarDBClient(param.Region, s.Config)
344350
if err != nil {
@@ -1117,3 +1123,10 @@ func createActiontrailClient(regionId string, config *openapi.Config) (_result *
11171123
_result, _err = actiontrail20200706.NewClient(config)
11181124
return _result, _err
11191125
}
1126+
1127+
func createDasClient(regionId string, config *openapi.Config) (_result *das20200116.Client, _err error) {
1128+
config.Endpoint = tea.String("das." + regionId + ".aliyuncs.com")
1129+
_result = &das20200116.Client{}
1130+
_result, _err = das20200116.NewClient(config)
1131+
return _result, _err
1132+
}

‎collector/alicloud/go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ require (
1717
github.com/alibabacloud-go/cloudfw-20171207/v7 v7.0.4
1818
github.com/alibabacloud-go/cr-20181201/v2 v2.5.0
1919
github.com/alibabacloud-go/cs-20151215/v5 v5.7.10
20-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9
20+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11
21+
github.com/alibabacloud-go/das-20200116/v3 v3.8.1
2122
github.com/alibabacloud-go/ddoscoo-20200101/v3 v3.6.0
2223
github.com/alibabacloud-go/dds-20151201/v8 v8.0.0
2324
github.com/alibabacloud-go/dms-enterprise-20181101 v1.63.0
@@ -46,7 +47,7 @@ require (
4647
github.com/alibabacloud-go/sls-20201230/v6 v6.9.2
4748
github.com/alibabacloud-go/swas-open-20200601/v3 v3.0.0
4849
github.com/alibabacloud-go/tablestore-20201209 v1.0.1
49-
github.com/alibabacloud-go/tea v1.3.10
50+
github.com/alibabacloud-go/tea v1.3.11
5051
github.com/alibabacloud-go/tea-utils/v2 v2.0.7
5152
github.com/alibabacloud-go/waf-openapi-20211001/v4 v4.6.0
5253
github.com/alibabacloud-go/yundun-bastionhost-20191209/v2 v2.3.0

‎collector/go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ require (
4747
github.com/alibabacloud-go/darabonba-array v0.1.0 // indirect
4848
github.com/alibabacloud-go/darabonba-encode-util v0.0.2 // indirect
4949
github.com/alibabacloud-go/darabonba-map v0.0.2 // indirect
50-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9 // indirect
50+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11 // indirect
5151
github.com/alibabacloud-go/darabonba-signature-util v0.0.7 // indirect
5252
github.com/alibabacloud-go/darabonba-string v1.0.2 // indirect
53+
github.com/alibabacloud-go/das-20200116/v3 v3.8.1 // indirect
5354
github.com/alibabacloud-go/ddoscoo-20200101/v3 v3.6.0 // indirect
5455
github.com/alibabacloud-go/dds-20151201/v8 v8.0.0 // indirect
5556
github.com/alibabacloud-go/debug v1.0.1 // indirect
@@ -82,7 +83,7 @@ require (
8283
github.com/alibabacloud-go/sls-20201230/v6 v6.9.2 // indirect
8384
github.com/alibabacloud-go/swas-open-20200601/v3 v3.0.0 // indirect
8485
github.com/alibabacloud-go/tablestore-20201209 v1.0.1 // indirect
85-
github.com/alibabacloud-go/tea v1.3.10 // indirect
86+
github.com/alibabacloud-go/tea v1.3.11 // indirect
8687
github.com/alibabacloud-go/tea-fileform v1.1.1 // indirect
8788
github.com/alibabacloud-go/tea-oss-sdk v1.1.3 // indirect
8889
github.com/alibabacloud-go/tea-oss-utils v1.1.0 // indirect

‎collector/go.sum‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,15 @@ github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.10/go.mod h1:26a14FGhZVELuz
5656
github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11-0.20241012070109-f821fe24f6e4/go.mod h1:A6E1SF+mmjR/E5cmMKADxLkime1otayC2OF0ylGlHH0=
5757
github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11/go.mod h1:wHxkgZT1ClZdcwEVP/pDgYK/9HucsnCfMipmJgCz4xY=
5858
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.5/go.mod h1:N0ppnkOnfC/zNQZBwxEC0y53FELAgEHLY3ZBFxq1WG0=
59-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9 h1:7P0KWfed/YMtpeuW3E2iwokzoz9L7H9rB+VZzg5DeBs=
6059
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9/go.mod h1:kgnXaV74AVjM3ZWJu1GhyXGuCtxljJ677oUfz6MyJOE=
60+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11 h1:5JIs4BPVpzbgcBrgmUxBdDsMjmsHZvPbTPD1m4aB+ZQ=
61+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11/go.mod h1:ue0+WkdPxpCB2JP3iaG4Iawayxp72kyT5uDbozQKaW8=
6162
github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg=
6263
github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ=
6364
github.com/alibabacloud-go/darabonba-string v1.0.2 h1:E714wms5ibdzCqGeYJ9JCFywE5nDyvIXIIQbZVFkkqo=
6465
github.com/alibabacloud-go/darabonba-string v1.0.2/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA=
66+
github.com/alibabacloud-go/das-20200116/v3 v3.8.1 h1:zyXqmvnfWdkWNkORGbQdGAhqgR0qHR8GlDOtthTSnQw=
67+
github.com/alibabacloud-go/das-20200116/v3 v3.8.1/go.mod h1:ysO3/S6gZoX8TgTZjD0DmtjHjyI/bSqQ6lc9ZPp6UW8=
6568
github.com/alibabacloud-go/ddoscoo-20200101/v3 v3.6.0 h1:RGBWWOHFygyFkF/tK4aUQ2g2H5aX1FoV1WD5NG9CIpE=
6669
github.com/alibabacloud-go/ddoscoo-20200101/v3 v3.6.0/go.mod h1:odVZ/hv9XR2GWHiAjlEIGPXo1KPuQZcseJFmRxaq0HA=
6770
github.com/alibabacloud-go/dds-20151201/v8 v8.0.0 h1:XQnJOri44cQ6FiyHLxPYuvsWxjONyNWxRqma5KjAZKs=
@@ -143,8 +146,9 @@ github.com/alibabacloud-go/tea v1.2.1/go.mod h1:qbzof29bM/IFhLMtJPrgTGK3eauV5J2w
143146
github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
144147
github.com/alibabacloud-go/tea v1.2.3-0.20240605082020-e6e537a31150/go.mod h1:SP/4ugxOFdctgZvPRC0Anqbq1Q1VmuPXoUVyncO5azs=
145148
github.com/alibabacloud-go/tea v1.3.4/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
146-
github.com/alibabacloud-go/tea v1.3.10 h1:J0Ke8iMyoxX2daj90hdPr1QgfxJnhR8SOflB910o/Dk=
147149
github.com/alibabacloud-go/tea v1.3.10/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
150+
github.com/alibabacloud-go/tea v1.3.11 h1:F7s2HRszY0J+tFckhy5FCpnBEENTijgFcYR68Brg9/Y=
151+
github.com/alibabacloud-go/tea v1.3.11/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
148152
github.com/alibabacloud-go/tea-fileform v1.1.1 h1:1YG6erAP3joQ0XdCXYIotuD7zyOM6qCR49xkp5FZDeU=
149153
github.com/alibabacloud-go/tea-fileform v1.1.1/go.mod h1:ZeCV91o4ISmxidd686f0ebdS5EDHWU+vW+TkjLhrsFE=
150154
github.com/alibabacloud-go/tea-oss-sdk v1.1.3 h1:EhAHI6edMeqgkZEqP7r4nc9iMWAUBKGxJHoBsOSKTtU=

0 commit comments

Comments
 (0)