diff --git a/collector/alicloud/collector/services.go b/collector/alicloud/collector/services.go index 42f0fbcc..fdc15115 100644 --- a/collector/alicloud/collector/services.go +++ b/collector/alicloud/collector/services.go @@ -346,7 +346,7 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err if err != nil { log.CtxLogger(ctx).Warn("init oceanbasepro client failed", zap.Error(err)) } - case Elasticsearch: + case Elasticsearch, ElasticsearchLogstash: s.Elasticsearch, err = createElasticsearchClient(param.Region, s.Config) if err != nil { log.CtxLogger(ctx).Warn("init elasticsearch client failed", zap.Error(err)) diff --git a/collector/alicloud/go.sum b/collector/alicloud/go.sum index 020d5c17..2dcf32e6 100644 --- a/collector/alicloud/go.sum +++ b/collector/alicloud/go.sum @@ -54,7 +54,6 @@ github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11-0.20241012070109-f821fe2 github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11/go.mod h1:wHxkgZT1ClZdcwEVP/pDgYK/9HucsnCfMipmJgCz4xY= github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.5/go.mod h1:N0ppnkOnfC/zNQZBwxEC0y53FELAgEHLY3ZBFxq1WG0= github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9/go.mod h1:kgnXaV74AVjM3ZWJu1GhyXGuCtxljJ677oUfz6MyJOE= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.10/go.mod h1:kgnXaV74AVjM3ZWJu1GhyXGuCtxljJ677oUfz6MyJOE= github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11 h1:5JIs4BPVpzbgcBrgmUxBdDsMjmsHZvPbTPD1m4aB+ZQ= github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11/go.mod h1:ue0+WkdPxpCB2JP3iaG4Iawayxp72kyT5uDbozQKaW8= github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg= diff --git a/collector/aws/collector/constant.go b/collector/aws/collector/constant.go index 674bda58..1b62cf24 100644 --- a/collector/aws/collector/constant.go +++ b/collector/aws/collector/constant.go @@ -16,62 +16,64 @@ package collector const ( - EC2 string = "EC2" - ElasticIP string = "ElasticIP" - Bucket string = "Bucket" - EFSFileSystem string = "EFS File System" - FSxFileSystem string = "FSx File System" - RDS string = "RDS" - ElastiCache string = "ElastiCache" - SecurityGroup string = "Security Group" - NetworkAcl string = "Network ACL" - WebACL string = "Web ACL" - Vpc string = "VPC" - CLB string = "CLB" - ELB string = "ELB" - Domain string = "Domain" - Certificate string = "Certificate" - Secret string = "Secret" - SNSTopic string = "SNSTopic" - ResourceRecordSet string = "ResourceRecordSet" - CDN string = "CDN" - User string = "User" - IAMPolicy string = "IAM Policy" - UserGroup string = "User Group" - Role string = "Role" - AccountSettings string = "Account Settings" - Registry string = "Registry" - Repository string = "Repository" - KMS string = "KMS" - Config string = "Config" - GuardDuty string = "GuardDuty" - CloudTrail string = "CloudTrail" - Lambda string = "Lambda" - AutoScalingGroup string = "AutoScalingGroup" - ECSCluster string = "ECSCluster" - ECSTaskDefinition string = "ECSTaskDefinition" - EKSCluster string = "EKSCluster" - DynamoDBTable string = "DynamoDBTable" - CloudFormationStack string = "CloudFormationStack" - APIGatewayRestAPI string = "APIGatewayRestAPI" - APIGatewayV2API string = "APIGatewayV2API" - SQSQueue string = "SQSQueue" - CloudWatchAlarm string = "CloudWatchAlarm" - CloudWatchLogGroup string = "CloudWatchLogGroup" - Account string = "Account" - VPCEndpointService string = "VPCEndpointService" - FlowLog string = "FlowLog" - NetworkInterface string = "NetworkInterface" - AppStreamFleet string = "AppStreamFleet" - AccessAnalyzer string = "AccessAnalyzer" - CognitoUserPool string = "CognitoUserPool" - CognitoIdentityPool string = "CognitoIdentityPool" - FMS string = "FMS" - Inspector2 string = "Inspector2" - SecurityHub string = "SecurityHub" - MacieFinding string = "MacieFinding" - MacieJob string = "MacieJob" - MacieSession string = "MacieSession" - NetworkFirewall string = "NetworkFirewall" - OpenSearch string = "OpenSearch" + EC2 string = "EC2" + ElasticIP string = "ElasticIP" + Bucket string = "Bucket" + EFSFileSystem string = "EFS File System" + FSxFileSystem string = "FSx File System" + RDS string = "RDS" + ElastiCache string = "ElastiCache" + SecurityGroup string = "Security Group" + NetworkAcl string = "Network ACL" + WebACL string = "Web ACL" + Vpc string = "VPC" + CLB string = "CLB" + ELB string = "ELB" + Domain string = "Domain" + Certificate string = "Certificate" + Secret string = "Secret" + SNSTopic string = "SNSTopic" + ResourceRecordSet string = "ResourceRecordSet" + CDN string = "CDN" + User string = "User" + IAMPolicy string = "IAM Policy" + UserGroup string = "User Group" + Role string = "Role" + AccountSettings string = "Account Settings" + Registry string = "Registry" + Repository string = "Repository" + KMS string = "KMS" + Config string = "Config" + GuardDuty string = "GuardDuty" + CloudTrail string = "CloudTrail" + Lambda string = "Lambda" + AutoScalingGroup string = "AutoScalingGroup" + ECSCluster string = "ECSCluster" + ECSTaskDefinition string = "ECSTaskDefinition" + EKSCluster string = "EKSCluster" + DynamoDBTable string = "DynamoDBTable" + CloudFormationStack string = "CloudFormationStack" + APIGatewayRestAPI string = "APIGatewayRestAPI" + APIGatewayV2API string = "APIGatewayV2API" + SQSQueue string = "SQSQueue" + CloudWatchAlarm string = "CloudWatchAlarm" + CloudWatchLogGroup string = "CloudWatchLogGroup" + Account string = "Account" + VPCEndpointService string = "VPCEndpointService" + FlowLog string = "FlowLog" + NetworkInterface string = "NetworkInterface" + AppStreamFleet string = "AppStreamFleet" + AccessAnalyzer string = "AccessAnalyzer" + CognitoUserPool string = "CognitoUserPool" + CognitoIdentityPool string = "CognitoIdentityPool" + FMS string = "FMS" + Inspector2Finding string = "Inspector2Finding" + Inspector2Coverage string = "Inspector2Coverage" + SecurityHub string = "SecurityHub" + MacieFinding string = "MacieFinding" + MacieJob string = "MacieJob" + MacieSession string = "MacieSession" + NetworkFirewall string = "NetworkFirewall" + NetworkFirewallRuleGroup string = "NetworkFirewallRuleGroup" + OpenSearch string = "OpenSearch" ) diff --git a/collector/aws/collector/inspector2/coverage.go b/collector/aws/collector/inspector2/coverage.go index a7c2dde9..f2c96eff 100644 --- a/collector/aws/collector/inspector2/coverage.go +++ b/collector/aws/collector/inspector2/coverage.go @@ -30,7 +30,7 @@ import ( // GetCoverageResource returns AWS Inspector2 coverage resource definition func GetCoverageResource() schema.Resource { return schema.Resource{ - ResourceType: collector.Inspector2, + ResourceType: collector.Inspector2Coverage, ResourceTypeName: "Inspector2 Coverage", ResourceGroupType: constant.SECURITY, Desc: "https://docs.aws.amazon.com/inspector/v2/APIReference/API_ListCoverage.html", diff --git a/collector/aws/collector/inspector2/finding.go b/collector/aws/collector/inspector2/finding.go index bd2ab5cd..a80ea8af 100644 --- a/collector/aws/collector/inspector2/finding.go +++ b/collector/aws/collector/inspector2/finding.go @@ -30,7 +30,7 @@ import ( // GetFindingResource returns AWS Inspector2 finding resource definition func GetFindingResource() schema.Resource { return schema.Resource{ - ResourceType: collector.Inspector2, + ResourceType: collector.Inspector2Finding, ResourceTypeName: "Inspector2 Finding", ResourceGroupType: constant.SECURITY, Desc: "https://docs.aws.amazon.com/inspector/v2/APIReference/API_ListFindings.html", diff --git a/collector/aws/collector/networkfirewall/rulegroup.go b/collector/aws/collector/networkfirewall/rulegroup.go index 9a7bc738..7feab1c5 100644 --- a/collector/aws/collector/networkfirewall/rulegroup.go +++ b/collector/aws/collector/networkfirewall/rulegroup.go @@ -30,7 +30,7 @@ import ( // GetRuleGroupResource returns AWS Network Firewall Rule Group resource definition func GetRuleGroupResource() schema.Resource { return schema.Resource{ - ResourceType: collector.NetworkFirewall, + ResourceType: collector.NetworkFirewallRuleGroup, ResourceTypeName: "Network Firewall Rule Group", ResourceGroupType: constant.NET, Desc: "https://docs.aws.amazon.com/network-firewall/latest/APIReference/API_RuleGroup.html", diff --git a/collector/aws/collector/services.go b/collector/aws/collector/services.go index ae4a705f..ca7c9582 100644 --- a/collector/aws/collector/services.go +++ b/collector/aws/collector/services.go @@ -177,7 +177,7 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err s.CLB = initCLBClient(cfg) case FSxFileSystem: s.FSx = initFSxClient(cfg) - case AccountSettings, UserGroup, Role, User: + case AccountSettings, UserGroup, Role, User, IAMPolicy: s.IAM = initIAMClient(cfg) case RDS: s.RDS = initRDSClient(cfg) @@ -235,13 +235,13 @@ func (s *Services) InitServices(cloudAccountParam schema.CloudAccountParam) (err s.CognitoIdentity = initCognitoIdentityClient(cfg) case FMS: s.FMS = initFMSClient(cfg) - case Inspector2: + case Inspector2Coverage, Inspector2Finding: s.Inspector2 = initInspector2Client(cfg) case SecurityHub: s.SecurityHub = initSecurityHubClient(cfg) case MacieFinding, MacieJob, MacieSession: s.Macie = initMacieClient(cfg) - case NetworkFirewall: + case NetworkFirewall, NetworkFirewallRuleGroup: s.NetworkFirewall = initNetworkFirewallClient(cfg) case OpenSearch: s.OpenSearch = initOpenSearchClient(cfg)