update after rebase

Author: dbonf

sysdig/data_source_sysdig_monitor_team.go

@@ -36,6 +36,10 @@ func dataSourceSysdigMonitorTeam() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"prometheus_remote_write_metrics_filter": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"can_use_sysdig_capture": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -48,6 +52,10 @@ func dataSourceSysdigMonitorTeam() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"can_use_agent_cli": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"default_team": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -126,17 +134,21 @@ func dataSourceSysdigMonitorTeamRead(ctx context.Context, d *schema.ResourceData
 	_ = d.Set("can_use_sysdig_capture", team.CanUseSysdigCapture)
 	_ = d.Set("can_see_infrastructure_events", team.CanUseCustomEvents)
 	_ = d.Set("can_use_aws_data", team.CanUseAwsMetrics)
+	_ = d.Set("can_use_agent_cli", team.CanUseAgentCli)
 	_ = d.Set("default_team", team.DefaultTeam)
 	_ = d.Set("user_roles", userMonitorRolesToSet(team.UserRoles))
 	_ = d.Set("entrypoint", entrypointToSet(team.EntryPoint))
 	_ = d.Set("version", team.Version)
 
 	var ibmPlatformMetrics *string
+	var prometheusRemoteWrite *string
 	if team.NamespaceFilters != nil {
 		ibmPlatformMetrics = team.NamespaceFilters.IBMPlatformMetrics
+		prometheusRemoteWrite = team.NamespaceFilters.PrometheusRemoteWrite
 	}
 	_ = d.Set("enable_ibm_platform_metrics", team.CanUseBeaconMetrics)
 	_ = d.Set("ibm_platform_metrics", ibmPlatformMetrics)
+	_ = d.Set("prometheus_remote_write_metrics_filter", prometheusRemoteWrite)
 
 	return nil
 }

sysdig/data_source_sysdig_monitor_team_test.go

@@ -32,6 +32,8 @@ func TestAccDataSourceSysdigMonitorTeam(t *testing.T) {
 					resource.TestCheckResourceAttr("data.sysdig_monitor_team.test", "can_use_sysdig_capture", "true"),
 					resource.TestCheckResourceAttr("data.sysdig_monitor_team.test", "can_see_infrastructure_events", "true"),
 					resource.TestCheckResourceAttr("data.sysdig_monitor_team.test", "can_use_aws_data", "true"),
+					resource.TestCheckResourceAttr("data.sysdig_monitor_team.test", "can_use_agent_cli", "false"),
+					resource.TestCheckResourceAttr("data.sysdig_monitor_team.test", "prometheus_remote_write_metrics_filter", "kube_cluster_name in (\"test-cluster\")"),
 				),
 			},
 		},
@@ -48,9 +50,10 @@ resource "sysdig_monitor_team" "sample" {
   can_use_sysdig_capture 		= true
   can_see_infrastructure_events = true
   can_use_aws_data = true
-  
+  can_use_agent_cli = false
+  prometheus_remote_write_metrics_filter = "kube_cluster_name in (\"test-cluster\")"
   entrypoint {
-	type = "Dashboards"
+    type = "Dashboards"
   }
 }
 

sysdig/data_source_sysdig_secure_team.go

@@ -40,6 +40,14 @@ func dataSourceSysdigSecureTeam() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"can_use_agent_cli": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"can_use_rapid_response": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"default_team": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -103,6 +111,8 @@ func dataSourceSysdigSecureTeamRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("scope_by", team.Show)
 	_ = d.Set("filter", team.Filter)
 	_ = d.Set("use_sysdig_capture", team.CanUseSysdigCapture)
+	_ = d.Set("can_use_agent_cli", team.CanUseAgentCli)
+	_ = d.Set("can_use_rapid_response", team.CanUseRapidResponse)
 	_ = d.Set("default_team", team.DefaultTeam)
 	_ = d.Set("user_roles", userSecureRolesToSet(team.UserRoles))
 	_ = d.Set("version", team.Version)

sysdig/data_source_sysdig_secure_team_test.go

@@ -31,6 +31,8 @@ func TestAccDataSourceSysdigSecureTeam(t *testing.T) {
 					resource.TestCheckResourceAttr("data.sysdig_secure_team.test", "version", "0"),
 					resource.TestCheckResourceAttr("data.sysdig_secure_team.test", "use_sysdig_capture", "true"),
 					resource.TestCheckResourceAttr("data.sysdig_secure_team.test", "all_zones", "true"),
+					resource.TestCheckResourceAttr("data.sysdig_secure_team.test", "can_use_agent_cli", "false"),
+					resource.TestCheckResourceAttr("data.sysdig_secure_team.test", "can_use_rapid_response", "true"),
 				),
 			},
 		},
@@ -40,12 +42,14 @@ func TestAccDataSourceSysdigSecureTeam(t *testing.T) {
 func secureTeamAndDatasource(name string) string {
 	return fmt.Sprintf(`
 resource "sysdig_secure_team" "sample" {
-  name               = "%s"
-  description        = "A test secure team"
-  scope_by           = "container"
-  use_sysdig_capture = true
-  filter             = "container.image.repo = \"sysdig/agent\""
-  all_zones          = true
+  name                   = "%s"
+  description            = "A test secure team"
+  scope_by               = "container"
+  use_sysdig_capture     = true
+  filter                 = "container.image.repo = \"sysdig/agent\""
+  all_zones              = true
+  can_use_agent_cli      = false
+	can_use_rapid_response = true
 }
 
 data "sysdig_secure_team" "test" {

website/docs/d/monitor_team.md

@@ -28,9 +28,11 @@ data "sysdig_monitor_team" "example" {
 - `description` - The description of the monitor team.
 - `entrypoint` - The entrypoint configuration for the team.
 - `filter` - The filter applied to the team.
+- `prometheus_remote_write_metrics_filter` - The Prometheus remote write metrics filter for the team.
 - `scope_by` - The scope of the team.
 - `can_use_sysdig_capture` - Whether the team can use Sysdig capture.
 - `can_see_infrastructure_events` - Whether the team can see infrastructure events.
+- `can_use_agent_cli` - Whether the team can use the agent CLI.
 - `can_use_aws_data` - Whether the team can use AWS data.
 - `default_team` - Whether the team is the default team.
 - `user_roles` - The roles assigned to users in the team.

website/docs/d/secure_team.md

@@ -29,10 +29,11 @@ data "sysdig_secure_team" "example" {
 - `filter` - The filter applied to the team.
 - `scope_by` - The scope of the team.
 - `use_sysdig_capture` - Whether the team can use Sysdig capture.
+- `can_use_agent_cli` - Whether the team can use the agent CLI.
+- `can_use_rapid_response` - Whether the team can use rapid response.
 - `default_team` - Whether the team is the default team.
 - `user_roles` - The roles assigned to users in the team.
 - `zone_ids` - The IDs of the zones associated with the team.
 - `all_zones` - Whether the team has access to all zones.
 - `version` - The version of the secure team.
 - `theme` - The theme of the secure team.
-

website/docs/r/monitor_team.md

@@ -67,7 +67,7 @@ data "sysdig_custom_role" "custom_role" {
 
 * `prometheus_remote_write_metrics_filter` - (Optional) Use this option to select which Prometheus Remote Write data users of this team can view. Not setting it will allow users to see all Prometheus Remote Write data.
 
-* `use_sysdig_capture` - (Optional) Defines if the team is able to create Sysdig Capture files.  Default: true.
+* `can_use_sysdig_capture` - (Optional) Defines if the team is able to create Sysdig Capture files.  Default: true.
 
 * `can_see_infrastructure_events` - (Optional) Enable this option to allow this team to view all Infrastructure and Custom Events from every user and agent. Otherwise, this team will only see infrastructure events sent specifically to this team. Default: false.