Merge pull request #103 from gdashboard/threshold-style

Support thresholds style

docs/data-sources/bar_gauge.md

@@ -242,6 +242,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--field--thresholds--step))
 
 <a id="nestedblock--field--thresholds--step"></a>
@@ -407,6 +408,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_name--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_name--field--thresholds--step"></a>
@@ -531,6 +533,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_query_id--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_query_id--field--thresholds--step"></a>
@@ -655,6 +658,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_regex--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_regex--field--thresholds--step"></a>
@@ -779,6 +783,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_type--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_type--field--thresholds--step"></a>

docs/data-sources/gauge.md

@@ -280,6 +280,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--field--thresholds--step))
 
 <a id="nestedblock--field--thresholds--step"></a>
@@ -445,6 +446,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_name--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_name--field--thresholds--step"></a>
@@ -569,6 +571,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_query_id--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_query_id--field--thresholds--step"></a>
@@ -693,6 +696,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_regex--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_regex--field--thresholds--step"></a>
@@ -817,6 +821,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_type--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_type--field--thresholds--step"></a>

docs/data-sources/stat.md

@@ -275,6 +275,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--field--thresholds--step))
 
 <a id="nestedblock--field--thresholds--step"></a>
@@ -442,6 +443,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_name--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_name--field--thresholds--step"></a>
@@ -566,6 +568,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_query_id--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_query_id--field--thresholds--step"></a>
@@ -690,6 +693,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_regex--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_regex--field--thresholds--step"></a>
@@ -814,6 +818,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_type--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_type--field--thresholds--step"></a>

docs/data-sources/table.md

@@ -303,6 +303,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--field--thresholds--step))
 
 <a id="nestedblock--field--thresholds--step"></a>
@@ -477,6 +478,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_name--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_name--field--thresholds--step"></a>
@@ -601,6 +603,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_query_id--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_query_id--field--thresholds--step"></a>
@@ -725,6 +728,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_regex--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_regex--field--thresholds--step"></a>
@@ -849,6 +853,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_type--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_type--field--thresholds--step"></a>

docs/data-sources/timeseries.md

@@ -312,6 +312,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--field--thresholds--step))
 
 <a id="nestedblock--field--thresholds--step"></a>
@@ -472,6 +473,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_name--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_name--field--thresholds--step"></a>
@@ -596,6 +598,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_query_id--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_query_id--field--thresholds--step"></a>
@@ -720,6 +723,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_regex--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_regex--field--thresholds--step"></a>
@@ -844,6 +848,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--overrides--by_type--field--thresholds--step))
 
 <a id="nestedblock--overrides--by_type--field--thresholds--step"></a>

docs/index.md

@@ -241,6 +241,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--defaults--bar_gauge--field--thresholds--step))
 
 <a id="nestedblock--defaults--bar_gauge--field--thresholds--step"></a>
@@ -414,6 +415,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--defaults--gauge--field--thresholds--step))
 
 <a id="nestedblock--defaults--gauge--field--thresholds--step"></a>
@@ -567,6 +569,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--defaults--stat--field--thresholds--step))
 
 <a id="nestedblock--defaults--stat--field--thresholds--step"></a>
@@ -721,6 +724,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) Unused by this panel type. Ignore, please.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--defaults--table--field--thresholds--step))
 
 <a id="nestedblock--defaults--table--field--thresholds--step"></a>
@@ -869,6 +873,7 @@ Optional:
 - `mode` (String) The threshold mode. The choices are:
 1) `absolute` - defined based on a number; for example, 80 on a scale of 1 to 150. 
 2) `percentage` - defined relative to minimum or maximum; for example, 80 percent.
+- `show_as` (String) How the thresholds must be shown. The choices are: `line`, `dashed`, `area`, `line+area`, `dashed+area`.
 - `step` (Block List) The threshold steps. (see [below for nested schema](#nestedblock--defaults--timeseries--field--thresholds--step))
 
 <a id="nestedblock--defaults--timeseries--field--thresholds--step"></a>

internal/provider/bar_gauge_data_source.go

@@ -116,9 +116,9 @@ func (d *BarGaugeDataSource) Schema(ctx context.Context, req datasource.SchemaRe
 
 		Blocks: map[string]schema.Block{
 			"queries":   queryBlock(),
-			"field":     fieldBlock(),
+			"field":     fieldBlock(false),
 			"graph":     barGaugeGraphBlock(),
-			"overrides": fieldOverrideBlock(),
+			"overrides": fieldOverrideBlock(false),
 			"transform": transformationsBlock(),
 		},
 

internal/provider/gauge_data_source.go

@@ -108,9 +108,9 @@ func (d *GaugeDataSource) Schema(ctx context.Context, req datasource.SchemaReque
 
 		Blocks: map[string]schema.Block{
 			"queries":   queryBlock(),
-			"field":     fieldBlock(),
+			"field":     fieldBlock(false),
 			"graph":     gaugeGraphBlock(),
-			"overrides": fieldOverrideBlock(),
+			"overrides": fieldOverrideBlock(false),
 			"transform": transformationsBlock(),
 		},
 

internal/provider/provider.go

@@ -124,7 +124,7 @@ func (p *GrafanaDashboardBuilderProvider) Schema(ctx context.Context, req provid
 								Blocks: map[string]schema.Block{
 									"legend":  timeseriesLegendBlock(),
 									"tooltip": timeseriesTooltipBlock(),
-									"field":   fieldBlock(),
+									"field":   fieldBlock(true),
 									"axis":    axisBlock(),
 									"graph":   timeseriesGraphBlock(),
 								},
@@ -137,7 +137,7 @@ func (p *GrafanaDashboardBuilderProvider) Schema(ctx context.Context, req provid
 							Description: "Bar gauge defaults.",
 							NestedObject: schema.NestedBlockObject{
 								Blocks: map[string]schema.Block{
-									"field": fieldBlock(),
+									"field": fieldBlock(false),
 									"graph": barGaugeGraphBlock(),
 								},
 							},
@@ -149,7 +149,7 @@ func (p *GrafanaDashboardBuilderProvider) Schema(ctx context.Context, req provid
 							Description: "Stat defaults.",
 							NestedObject: schema.NestedBlockObject{
 								Blocks: map[string]schema.Block{
-									"field": fieldBlock(),
+									"field": fieldBlock(false),
 									"graph": statGraphBlock(),
 								},
 							},
@@ -161,7 +161,7 @@ func (p *GrafanaDashboardBuilderProvider) Schema(ctx context.Context, req provid
 							Description: "Gauge defaults.",
 							NestedObject: schema.NestedBlockObject{
 								Blocks: map[string]schema.Block{
-									"field": fieldBlock(),
+									"field": fieldBlock(false),
 									"graph": gaugeGraphBlock(),
 								},
 							},
@@ -173,7 +173,7 @@ func (p *GrafanaDashboardBuilderProvider) Schema(ctx context.Context, req provid
 							Description: "Table defaults.",
 							NestedObject: schema.NestedBlockObject{
 								Blocks: map[string]schema.Block{
-									"field": fieldBlock(),
+									"field": fieldBlock(false),
 								},
 							},
 							Validators: []validator.List{
@@ -515,6 +515,10 @@ func updateFieldDefaults(defaults *FieldDefaults, opts []FieldOptions) {
 				defaults.Thresholds.Mode = threshold.Mode.ValueString()
 			}
 
+			if !threshold.ShowAs.IsNull() {
+				defaults.Thresholds.ShowAs = threshold.ShowAs.ValueString()
+			}
+
 			for i, step := range threshold.Steps {
 				s := ThresholdStepDefaults{
 					Color: step.Color.ValueString(),

internal/provider/stat_data_source.go

@@ -136,9 +136,9 @@ func (d *StatDataSource) Schema(ctx context.Context, req datasource.SchemaReques
 
 		Blocks: map[string]schema.Block{
 			"queries":   queryBlock(),
-			"field":     fieldBlock(),
+			"field":     fieldBlock(false),
 			"graph":     statGraphBlock(),
-			"overrides": fieldOverrideBlock(),
+			"overrides": fieldOverrideBlock(false),
 			"transform": transformationsBlock(),
 		},
 

internal/provider/table_data_source.go

@@ -206,9 +206,9 @@ func (d *TableDataSource) Schema(ctx context.Context, req datasource.SchemaReque
 
 		Blocks: map[string]schema.Block{
 			"queries":   queryBlock(),
-			"field":     fieldBlock(),
+			"field":     fieldBlock(false),
 			"graph":     tableGraphBlock(),
-			"overrides": fieldOverrideBlock(),
+			"overrides": fieldOverrideBlock(false),
 			"transform": transformationsBlock(),
 		},