feat(team): add prometheus_remote_write_metrics_filter

Author: dbonf

sysdig/internal/client/v2/model.go

@@ -35,7 +35,8 @@ type Team struct {
 }
 
 type NamespaceFilters struct {
-	IBMPlatformMetrics *string `json:"ibmPlatformMetrics"`
+	IBMPlatformMetrics    *string `json:"ibmPlatformMetrics,omitempty"`
+	PrometheusRemoteWrite *string `json:"prometheusRemoteWrite,omitempty"`
 }
 
 type UserRoles struct {

sysdig/resource_sysdig_monitor_team.go

@@ -54,6 +54,10 @@ func resourceSysdigMonitorTeam() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"prometheus_remote_write_metrics_filter": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"enable_ibm_platform_metrics": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -192,7 +196,15 @@ func resourceSysdigMonitorTeamRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("user_roles", userMonitorRolesToSet(t.UserRoles))
 	_ = d.Set("entrypoint", entrypointToSet(t.EntryPoint))
 
-	resourceSysdigTeamReadIBM(d, &t)
+	var ibmPlatformMetrics *string
+	var prometheusRemoteWrite *string
+	if t.NamespaceFilters != nil {
+		ibmPlatformMetrics = t.NamespaceFilters.IBMPlatformMetrics
+		prometheusRemoteWrite = t.NamespaceFilters.PrometheusRemoteWrite
+	}
+	_ = d.Set("enable_ibm_platform_metrics", t.CanUseBeaconMetrics)
+	_ = d.Set("ibm_platform_metrics", ibmPlatformMetrics)
+	_ = d.Set("prometheus_remote_write_metrics_filter", prometheusRemoteWrite)
 
 	return nil
 }
@@ -265,7 +277,6 @@ func teamFromResourceData(d *schema.ResourceData, clientType ClientType) v2.Team
 	canUseSysdigCapture := d.Get("can_use_sysdig_capture").(bool)
 	canUseCustomEvents := d.Get("can_see_infrastructure_events").(bool)
 	canUseAwsMetrics := d.Get("can_use_aws_data").(bool)
-	canUseBeaconMetrics := false
 	t := v2.Team{
 		Theme:               d.Get("theme").(string),
 		Name:                d.Get("name").(string),
@@ -275,7 +286,6 @@ func teamFromResourceData(d *schema.ResourceData, clientType ClientType) v2.Team
 		CanUseSysdigCapture: &canUseSysdigCapture,
 		CanUseCustomEvents:  &canUseCustomEvents,
 		CanUseAwsMetrics:    &canUseAwsMetrics,
-		CanUseBeaconMetrics: &canUseBeaconMetrics,
 		DefaultTeam:         d.Get("default_team").(bool),
 	}
 
@@ -295,7 +305,24 @@ func teamFromResourceData(d *schema.ResourceData, clientType ClientType) v2.Team
 		t.EntryPoint.Selection = val.(string)
 	}
 
-	teamFromResourceDataIBM(d, &t)
+	canUseBeaconMetrics := d.Get("enable_ibm_platform_metrics").(bool)
+	t.CanUseBeaconMetrics = &canUseBeaconMetrics
+
+	if v, ok := d.GetOk("ibm_platform_metrics"); ok {
+		metrics := v.(string)
+		if t.NamespaceFilters == nil {
+			t.NamespaceFilters = &v2.NamespaceFilters{}
+		}
+		t.NamespaceFilters.IBMPlatformMetrics = &metrics
+	}
+
+	if v, ok := d.GetOk("prometheus_remote_write_metrics_filter"); ok {
+		metrics := v.(string)
+		if t.NamespaceFilters == nil {
+			t.NamespaceFilters = &v2.NamespaceFilters{}
+		}
+		t.NamespaceFilters.PrometheusRemoteWrite = &metrics
+	}
 
 	return t
 }

sysdig/resource_sysdig_monitor_team_ibm_test.go

@@ -41,6 +41,9 @@ func TestAccMonitorIBMTeam(t *testing.T) {
 			{
 				Config: monitorTeamWithPlatformMetricsIBM(rText()),
 			},
+			{
+				Config: monitorTeamWithPlatformMetricsAndPrwMetricsIBM(rText()),
+			},
 			{
 				ResourceName:      "sysdig_monitor_team.sample",
 				ImportState:       true,
@@ -57,9 +60,10 @@ resource "sysdig_monitor_team" "sample" {
   description        			= "%s"
   scope_by           			= "host"
   filter             			= "container.image.repo = \"sysdig/agent\""
+	prometheus_remote_write_metrics_filter = "kube_cluster_name in (\"test-cluster\", \"test-k8s-data\") and kube_deployment_name  = \"coredns\" and my_metric starts with \"prefix\" and not my_metric contains \"prefix-test\""
   can_use_sysdig_capture 		= true
   can_see_infrastructure_events = true
-  
+
   entrypoint {
 	type = "Dashboards"
   }
@@ -78,3 +82,16 @@ resource "sysdig_monitor_team" "sample" {
   }
 }`, name)
 }
+
+func monitorTeamWithPlatformMetricsAndPrwMetricsIBM(name string) string {
+	return fmt.Sprintf(`
+resource "sysdig_monitor_team" "sample" {
+  name = "sample-%s"
+  enable_ibm_platform_metrics = true
+	prometheus_remote_write_metrics_filter = "kube_cluster_name in (\"test-cluster\", \"test-k8s-data\") and kube_deployment_name  = \"coredns\" and my_metric starts with \"prefix\" and not my_metric contains \"prefix-test\""
+
+  entrypoint {
+	type = "Dashboards"
+  }
+}`, name)
+}

sysdig/resource_sysdig_monitor_team_test.go

@@ -54,10 +54,11 @@ resource "sysdig_monitor_team" "sample" {
   description        			= "%s"
   scope_by           			= "host"
   filter             			= "container.image.repo = \"sysdig/agent\""
+  prometheus_remote_write_metrics_filter = "kube_cluster_name in (\"test-cluster\", \"test-k8s-data\") and kube_deployment_name  = \"coredns\" and my_metric starts with \"prefix\" and not my_metric contains \"prefix-test\""
   can_use_sysdig_capture 		= true
   can_see_infrastructure_events = true
   can_use_aws_data 				= true
-  
+
   entrypoint {
 	type = "Dashboards"
   }

sysdig/resource_sysdig_secure_team.go

@@ -200,7 +200,12 @@ func resourceSysdigSecureTeamRead(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	resourceSysdigTeamReadIBM(d, &t)
+	var ibmPlatformMetrics *string
+	if t.NamespaceFilters != nil {
+		ibmPlatformMetrics = t.NamespaceFilters.IBMPlatformMetrics
+	}
+	_ = d.Set("enable_ibm_platform_metrics", t.CanUseBeaconMetrics)
+	_ = d.Set("ibm_platform_metrics", ibmPlatformMetrics)
 
 	return nil
 }
@@ -288,7 +293,16 @@ func secureTeamFromResourceData(d *schema.ResourceData, clientType ClientType) v
 		t.ZoneIDs[i] = z.(int)
 	}
 
-	teamFromResourceDataIBM(d, &t)
+	canUseBeaconMetrics := d.Get("enable_ibm_platform_metrics").(bool)
+	t.CanUseBeaconMetrics = &canUseBeaconMetrics
+
+	if v, ok := d.GetOk("ibm_platform_metrics"); ok {
+		metrics := v.(string)
+		if t.NamespaceFilters == nil {
+			t.NamespaceFilters = &v2.NamespaceFilters{}
+		}
+		t.NamespaceFilters.IBMPlatformMetrics = &metrics
+	}
 
 	return t
 }

sysdig/resource_sysdig_team_common.go

@@ -21,7 +21,7 @@ resource "sysdig_monitor_team" "devops" {
   entrypoint {
 	type = "Explore"
   }
-  
+
   user_roles {
     email = data.sysdig_current_user.me.email
     role = "ROLE_TEAM_MANAGER"
@@ -36,8 +36,11 @@ resource "sysdig_monitor_team" "devops" {
     email = "[email protected]"
     role = data.sysdig_custom_role.custom_role.id
   }
+
+  filter = "kubernetes.namespace.name in (\"kube-system\") and kubernetes.deployment.name in (\"coredns\")"
+  prometheus_remote_write_metrics_filter = "kube_cluster_name in (\"test-cluster\", \"test-k8s-data\") and kube_deployment_name  = \"coredns\" and my_metric starts with \"prefix\" and not my_metric contains \"prefix-test\""
 }
- 
+
 data "sysdig_current_user" "me" {
 }
 
@@ -50,21 +53,22 @@ data "sysdig_custom_role" "custom_role" {
 
 * `name` - (Required) The name of the Monitor Team. It must be unique and must not exist in Secure.
 
-* `entrypoint` - (Required) Main entry point for the current team in the product. 
+* `entrypoint` - (Required) Main entry point for the current team in the product.
                  See the Entrypoint argument reference section for more information.
 
 * `description` - (Optional) A description of the team.
 
 * `theme` - (Optional) Colour of the team. Default: "#73A1F7".
 
-* `scope_by` - (Optional) Scope for the team. Default: "container".
+* `scope_by` - (Optional) Scope for the team, either "container" or "host". Default: "container". If set to host, Team members can see all Host-level and Container-level information. If set to Container, Team members can see only Container-level information.
 
-* `filter` - (Optional) If the team can only see some resources, 
-             write down a filter of such resources.
-             
-* `use_sysdig_capture` - (Optional) Defines if the team is able to create Sysdig Capture files. 
+* `filter` - (Optional) Use this option to select which Agent Metrics data users of this team can view. Not setting it will allow users to see all Agent Metrics data.
+
+* `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_see_infrastructure_events` - (Optional) TODO. Default: false.
 
 * `can_use_aws_data` - (Optional) TODO. Default: false.
@@ -99,9 +103,9 @@ In addition to all arguments above, the following attributes are exported:
 
 ### IBM Cloud Monitoring arguments
 
-* `enable_ibm_platform_metrics` - (Optional) Enable platform metrics on IBM Cloud Monitoring.
+* `enable_ibm_platform_metrics` - (Optional) Enable Platform Metrics on IBM Cloud Monitoring.
 
-* `ibm_platform_metrics` - (Optional) Define platform metrics on IBM Cloud Monitoring.
+* `ibm_platform_metrics` - (Optional) Use this option to select which Platform Metrics data users of this team can view. Not setting it will allow users to see all Platform Metrics data.
 
 ## Import