fix kusto config renaming

mblaschke · mblaschke · commit 7cab87d11d0f · 2025-05-01T18:49:23.000+02:00
Signed-off-by: Markus Blaschke &lt;mblaschke82@gmail.com&gt;
diff --git a/prometheus/kusto/config.go b/prometheus/kusto/config.go
@@ -33,7 +33,7 @@ type (
 	}
 
 	Query struct {
-		*Metric
+		*QueryMetric
 		QueryMode     string    `json:"queryMode"`
 		Workspaces    *[]string `json:"workspaces"`
 		Metric        string    `json:"metric"`
@@ -43,7 +43,7 @@ type (
 		Subscriptions *[]string `json:"subscriptions"`
 	}
 
-	Metric struct {
+	QueryMetric struct {
 		Value        *float64          `json:"value"`
 		Fields       []MetricField     `json:"fields"`
 		Labels       map[string]string `json:"labels"`
@@ -59,7 +59,7 @@ type (
 		Type    string              `json:"type"`
 		Labels  map[string]string   `json:"labels"`
 		Filters []MetricFieldFilter `json:"filters"`
-		Expand  *Metric             `json:"expand"`
+		Expand  *QueryMetric        `json:"expand"`
 	}
 
 	MetricFieldFilter struct {
@@ -83,22 +83,22 @@ func (c *Config) Validate() error {
 
 	for _, queryConfig := range c.Queries {
 		if err := queryConfig.Validate(); err != nil {
-			return fmt.Errorf("query \"%v\": %w", queryConfig.Metric, err)
+			return fmt.Errorf("query \"%v\": %w", queryConfig.QueryMetric, err)
 		}
 	}
 
 	return nil
 }
 
 func (c *Query) Validate() error {
-	if err := c.Metric.Validate(); err != nil {
+	if err := c.QueryMetric.Validate(); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (c *Metric) Validate() error {
+func (c *QueryMetric) Validate() error {
 	// validate default field
 	c.DefaultField.Name = "default"
 	if err := c.DefaultField.Validate(); err != nil {
@@ -115,7 +115,7 @@ func (c *Metric) Validate() error {
 	return nil
 }
 
-func (c *Metric) IsPublished() bool {
+func (c *QueryMetric) IsPublished() bool {
 	if c.Publish != nil {
 		return *c.Publish
 	}
@@ -180,7 +180,7 @@ func (c *MetricFieldFilter) Validate() error {
 	return nil
 }
 
-func (m *Metric) IsExpand(field string) bool {
+func (m *QueryMetric) IsExpand(field string) bool {
 	for _, fieldConfig := range m.Fields {
 		if fieldConfig.Name == field {
 			if fieldConfig.IsExpand() {
@@ -193,7 +193,7 @@ func (m *Metric) IsExpand(field string) bool {
 	return false
 }
 
-func (m *Metric) GetFieldConfigMap() (list map[string][]MetricField) {
+func (m *QueryMetric) GetFieldConfigMap() (list map[string][]MetricField) {
 	list = map[string][]MetricField{}
 
 	for _, field := range m.Fields {
diff --git a/prometheus/kusto/parse.go b/prometheus/kusto/parse.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-func BuildPrometheusMetricList(name string, metricConfig Metric, row map[string]interface{}) (list map[string][]MetricRow) {
+func BuildPrometheusMetricList(name string, metricConfig QueryMetric, row map[string]interface{}) (list map[string][]MetricRow) {
 	list = map[string][]MetricRow{}
 	idFieldList := map[string]string{}
 
@@ -104,7 +104,7 @@ func BuildPrometheusMetricList(name string, metricConfig Metric, row map[string]
 							fieldConfig.Metric = fmt.Sprintf("%s_%s", name, fieldName)
 						}
 
-						subMetricConfig := Metric{}
+						subMetricConfig := QueryMetric{}
 						if fieldConfig.Expand != nil {
 							subMetricConfig = *fieldConfig.Expand
 						}
diff --git a/prometheus/kusto/parse_test.go b/prometheus/kusto/parse_test.go
@@ -65,7 +65,7 @@ defaultField:
   type: ignore
 `)
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(2)
@@ -129,7 +129,7 @@ defaultField:
   type: ignore
 `)
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(1)
@@ -184,7 +184,7 @@ defaultField:
   type: ignore
 `)
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(2)
@@ -364,7 +364,7 @@ defaultField:
 	foo, _ := json.Marshal(queryConfig)
 	fmt.Println(string(foo))
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(8)
@@ -472,7 +472,7 @@ defaultField:
   type: ignore
 `)
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(1)
@@ -532,7 +532,7 @@ defaultField:
   type: ignore
 `)
 
-	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.Metric, resultRow)
+	metricList := BuildPrometheusMetricList(queryConfig.Metric, *queryConfig.QueryMetric, resultRow)
 
 	metricTestSuite := testingMetricResult{t: t, list: metricList}
 	metricTestSuite.assertMetricNames(2)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type (`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`Query struct {`
`36`		`- *Metric`
	`36`	`+ *QueryMetric`
`37`	`37`	QueryMode string `json:"queryMode"`
`38`	`38`	Workspaces *[]string `json:"workspaces"`
`39`	`39`	Metric string `json:"metric"`
`@@ -43,7 +43,7 @@ type (`
`43`	`43`	Subscriptions *[]string `json:"subscriptions"`
`44`	`44`	`}`
`45`	`45`
`46`		`- Metric struct {`
	`46`	`+ QueryMetric struct {`
`47`	`47`	Value *float64 `json:"value"`
`48`	`48`	Fields []MetricField `json:"fields"`
`49`	`49`	Labels map[string]string `json:"labels"`
`@@ -59,7 +59,7 @@ type (`
`59`	`59`	Type string `json:"type"`
`60`	`60`	Labels map[string]string `json:"labels"`
`61`	`61`	Filters []MetricFieldFilter `json:"filters"`
`62`		- Expand *Metric `json:"expand"`
	`62`	+ Expand *QueryMetric `json:"expand"`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`MetricFieldFilter struct {`
`@@ -83,22 +83,22 @@ func (c *Config) Validate() error {`
`83`	`83`
`84`	`84`	`for _, queryConfig := range c.Queries {`
`85`	`85`	`if err := queryConfig.Validate(); err != nil {`
`86`		`- return fmt.Errorf("query \"%v\": %w", queryConfig.Metric, err)`
	`86`	`+ return fmt.Errorf("query \"%v\": %w", queryConfig.QueryMetric, err)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return nil`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func (c *Query) Validate() error {`
`94`		`- if err := c.Metric.Validate(); err != nil {`
	`94`	`+ if err := c.QueryMetric.Validate(); err != nil {`
`95`	`95`	`return err`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return nil`
`99`	`99`	`}`
`100`	`100`
`101`		`-func (c *Metric) Validate() error {`
	`101`	`+func (c *QueryMetric) Validate() error {`
`102`	`102`	`// validate default field`
`103`	`103`	`c.DefaultField.Name = "default"`
`104`	`104`	`if err := c.DefaultField.Validate(); err != nil {`
`@@ -115,7 +115,7 @@ func (c *Metric) Validate() error {`
`115`	`115`	`return nil`
`116`	`116`	`}`
`117`	`117`
`118`		`-func (c *Metric) IsPublished() bool {`
	`118`	`+func (c *QueryMetric) IsPublished() bool {`
`119`	`119`	`if c.Publish != nil {`
`120`	`120`	`return *c.Publish`
`121`	`121`	`}`
`@@ -180,7 +180,7 @@ func (c *MetricFieldFilter) Validate() error {`
`180`	`180`	`return nil`
`181`	`181`	`}`
`182`	`182`
`183`		`-func (m *Metric) IsExpand(field string) bool {`
	`183`	`+func (m *QueryMetric) IsExpand(field string) bool {`
`184`	`184`	`for _, fieldConfig := range m.Fields {`
`185`	`185`	`if fieldConfig.Name == field {`
`186`	`186`	`if fieldConfig.IsExpand() {`
`@@ -193,7 +193,7 @@ func (m *Metric) IsExpand(field string) bool {`
`193`	`193`	`return false`
`194`	`194`	`}`
`195`	`195`
`196`		`-func (m *Metric) GetFieldConfigMap() (list map[string][]MetricField) {`
	`196`	`+func (m *QueryMetric) GetFieldConfigMap() (list map[string][]MetricField) {`
`197`	`197`	`list = map[string][]MetricField{}`
`198`	`198`
`199`	`199`	`for _, field := range m.Fields {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`)`
`6`	`6`
`7`		`-func BuildPrometheusMetricList(name string, metricConfig Metric, row map[string]interface{}) (list map[string][]MetricRow) {`
	`7`	`+func BuildPrometheusMetricList(name string, metricConfig QueryMetric, row map[string]interface{}) (list map[string][]MetricRow) {`
`8`	`8`	`list = map[string][]MetricRow{}`
`9`	`9`	`idFieldList := map[string]string{}`
`10`	`10`
`@@ -104,7 +104,7 @@ func BuildPrometheusMetricList(name string, metricConfig Metric, row map[string]`
`104`	`104`	`fieldConfig.Metric = fmt.Sprintf("%s_%s", name, fieldName)`
`105`	`105`	`}`
`106`	`106`
`107`		`- subMetricConfig := Metric{}`
	`107`	`+ subMetricConfig := QueryMetric{}`
`108`	`108`	`if fieldConfig.Expand != nil {`
`109`	`109`	`subMetricConfig = *fieldConfig.Expand`
`110`	`110`	`}`