monitoringdashboard: add dashboardFilters

apis/monitoring/v1beta1/monitoringdashboard_types.go

@@ -810,10 +810,10 @@ type MonitoringDashboardSpec struct {
 	//  arranged vertically.
 	ColumnLayout *ColumnLayout `json:"columnLayout,omitempty"`
 
-	/*NOTYET
 	// Filters to reduce the amount of data charted based on the filter criteria.
 	DashboardFilters []DashboardFilter `json:"dashboardFilters,omitempty"`
 
+	/*NOTYET
 	// Labels applied to the dashboard
 	Labels []Dashboard_LabelsEntry `json:"labels,omitempty"`
 	*/

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_monitoringdashboards.monitoring.cnrm.cloud.google.com.yaml

@@ -2942,6 +2942,29 @@ spec:
                       type: object
                     type: array
                 type: object
+              dashboardFilters:
+                description: Filters to reduce the amount of data charted based on
+                  the filter criteria.
+                items:
+                  properties:
+                    filterType:
+                      description: The specified filter type
+                      type: string
+                    labelKey:
+                      description: Required. The key for the label
+                      type: string
+                    stringValue:
+                      description: A variable-length string value.
+                      type: string
+                    templateVariable:
+                      description: The placeholder text that can be referenced in
+                        a filter string or MQL query. If omitted, the dashboard filter
+                        will be applied to all relevant widgets in the dashboard.
+                      type: string
+                  required:
+                  - labelKey
+                  type: object
+                type: array
               displayName:
                 description: Required. The mutable, human-readable name.
                 type: string

docs/releasenotes/release-1.120.md

@@ -29,6 +29,7 @@ output fields from GCP APIs are in `status.observedState.*`
 
 * `MonitoringDashboard`
 
+  * Added `dashboardFilters` support.
   * Added `alertChart` widgets.
   * Added `collapsibleGroup` widgets.
   * Added `pieChart` widgets.

pkg/controller/direct/monitoring/dashboard_generated.mappings.go

@@ -109,33 +109,30 @@ func ColumnLayout_Column_ToProto(mapCtx *MapContext, in *krm.ColumnLayout_Column
 	out.Widgets = Slice_ToProto(mapCtx, in.Widgets, Widget_ToProto)
 	return out
 }
-
-// func DashboardFilter_FromProto(mapCtx *MapContext, in *pb.DashboardFilter) *krm.DashboardFilter {
-// 	if in == nil {
-// 		return nil
-// 	}
-// 	out := &krm.DashboardFilter{}
-// 	out.LabelKey = LazyPtr(in.GetLabelKey())
-// 	out.TemplateVariable = LazyPtr(in.GetTemplateVariable())
-// 	out.StringValue = LazyPtr(in.GetStringValue())
-// 	out.FilterType = Enum_FromProto(mapCtx, in.FilterType)
-// 	return out
-// }
-
-// func DashboardFilter_ToProto(mapCtx *MapContext, in *krm.DashboardFilter) *pb.DashboardFilter {
-// 	if in == nil {
-// 		return nil
-// 	}
-// 	out := &pb.DashboardFilter{}
-// 	out.LabelKey = ValueOf(in.LabelKey)
-// 	out.TemplateVariable = ValueOf(in.TemplateVariable)
-// 	if oneof := DashboardFilter_StringValue_ToProto(mapCtx, in.StringValue); oneof != nil {
-// 		out.DefaultValue = oneof
-// 	}
-// 	out.FilterType = Enum_ToProto[pb.DashboardFilter_FilterType](mapCtx, in.FilterType)
-// 	return out
-// }
-
+func DashboardFilter_FromProto(mapCtx *MapContext, in *pb.DashboardFilter) *krm.DashboardFilter {
+	if in == nil {
+		return nil
+	}
+	out := &krm.DashboardFilter{}
+	out.LabelKey = LazyPtr(in.GetLabelKey())
+	out.TemplateVariable = LazyPtr(in.GetTemplateVariable())
+	out.StringValue = LazyPtr(in.GetStringValue())
+	out.FilterType = Enum_FromProto(mapCtx, in.FilterType)
+	return out
+}
+func DashboardFilter_ToProto(mapCtx *MapContext, in *krm.DashboardFilter) *pb.DashboardFilter {
+	if in == nil {
+		return nil
+	}
+	out := &pb.DashboardFilter{}
+	out.LabelKey = ValueOf(in.LabelKey)
+	out.TemplateVariable = ValueOf(in.TemplateVariable)
+	if oneof := DashboardFilter_StringValue_ToProto(mapCtx, in.StringValue); oneof != nil {
+		out.DefaultValue = oneof
+	}
+	out.FilterType = Enum_ToProto[pb.DashboardFilter_FilterType](mapCtx, in.FilterType)
+	return out
+}
 func GridLayout_FromProto(mapCtx *MapContext, in *pb.GridLayout) *krm.GridLayout {
 	if in == nil {
 		return nil
@@ -205,7 +202,7 @@ func MonitoringDashboardSpec_FromProto(mapCtx *MapContext, in *pb.Dashboard) *kr
 	out.MosaicLayout = MosaicLayout_FromProto(mapCtx, in.GetMosaicLayout())
 	out.RowLayout = RowLayout_FromProto(mapCtx, in.GetRowLayout())
 	out.ColumnLayout = ColumnLayout_FromProto(mapCtx, in.GetColumnLayout())
-	// MISSING: DashboardFilters
+	out.DashboardFilters = Slice_FromProto(mapCtx, in.DashboardFilters, DashboardFilter_FromProto)
 	// MISSING: Labels
 	return out
 }
@@ -229,7 +226,7 @@ func MonitoringDashboardSpec_ToProto(mapCtx *MapContext, in *krm.MonitoringDashb
 	if oneof := ColumnLayout_ToProto(mapCtx, in.ColumnLayout); oneof != nil {
 		out.Layout = &pb.Dashboard_ColumnLayout{ColumnLayout: oneof}
 	}
-	// MISSING: DashboardFilters
+	out.DashboardFilters = Slice_ToProto(mapCtx, in.DashboardFilters, DashboardFilter_ToProto)
 	// MISSING: Labels
 	return out
 }

pkg/controller/direct/monitoring/dashboard_mappings.go

@@ -217,6 +217,14 @@ func TimeSeriesTable_ColumnSettings_FromProto(mapCtx *MapContext, in *pb.TimeSer
 	// We want to always output the visible field, i.e. `visible: false`
 	// We probably can automate this, because the visible field is required.
 	out.Visible = PtrTo(in.GetVisible())
+	return out
+}
 
+func DashboardFilter_StringValue_ToProto(mapCtx *MapContext, in *string) *pb.DashboardFilter_StringValue {
+	if in == nil {
+		return nil
+	}
+	out := &pb.DashboardFilter_StringValue{}
+	out.StringValue = *in
 	return out
 }

pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardfull/_generated_export_monitoringdashboardfull.golden

@@ -120,6 +120,13 @@ spec:
                   resource.type="gce_instance"
           metricVisualization: NUMBER
         title: TimeSeriesTable Widget
+  dashboardFilters:
+  - filterType: RESOURCE_LABEL
+    labelKey: instance_id
+    stringValue: "3133577226154888113"
+    templateVariable: iid
+  - filterType: RESOURCE_LABEL
+    labelKey: zone
   displayName: monitoringdashboard-full
   projectRef:
     external: ${projectId}

pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardfull/_generated_object_monitoringdashboardfull.golden.yaml

@@ -128,6 +128,13 @@ spec:
                   resource.type="gce_instance"
           metricVisualization: NUMBER
         title: TimeSeriesTable Widget
+  dashboardFilters:
+  - filterType: RESOURCE_LABEL
+    labelKey: instance_id
+    stringValue: "3133577226154888113"
+    templateVariable: iid
+  - filterType: RESOURCE_LABEL
+    labelKey: zone
   displayName: monitoringdashboard-full
   projectRef:
     external: ${projectId}