IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 08:56:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Notifications: InfluxDB - Fix regex to include metrics with hyphen in aliases (#32224)

Browse Source 
* Notifications: InfluxDB - fix regex to include metrics with hyphen

* Add hyphen check in tests
This commit is contained in:
Dimitris Sotirakis 2021-03-23 13:14:21 +02:00 committed by GitHub
parent 89a178dfb4
commit fdaac2b8fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/influxdb/response_parser.go
View File

@ -18,7 +18,7 @@ var (
)
func init() {
legendFormat = regexp.MustCompile(`\[\[(\w+)(\.\w+)*\]\]*|\$\s*(\w+?)*`)
legendFormat = regexp.MustCompile(`\[\[([\w-]+)(\.[\w-]+)*\]\]*|\$\s*([\w-]+?)*`)
}
func (rp *ResponseParser) Parse(response *Response, query *Query) plugins.DataQueryResult {
@ -64,7 +64,6 @@ func (rp *ResponseParser) formatSeriesName(row Row, column string, query *Query)
if query.Alias == "" {
return rp.buildSeriesNameFromQuery(row, column)
}
nameSegment := strings.Split(row.Name, ".")
result := legendFormat.ReplaceAllFunc([]byte(query.Alias), func(in []byte) []byte {

8
pkg/tsdb/influxdb/response_parser_test.go
View File

@ -80,6 +80,7 @@ func TestInfluxdbResponseParser(t *testing.T) {
Tags: map[string]string{
"datacenter": "America",
"dc.region.name": "Northeast",
"cluster-name": "Cluster",
},
Values: [][]interface{}{
{json.Number("111"), json.Number("222"), json.Number("333")},
@ -171,6 +172,13 @@ func TestInfluxdbResponseParser(t *testing.T) {
So(result.Series[0].Name, ShouldEqual, "alias Northeast")
})
Convey("tag alias with hyphens", func() {
query := &Query{Alias: "alias [[tag_cluster-name]]"}
result := parser.Parse(response, query)
So(result.Series[0].Name, ShouldEqual, "alias Cluster")
})
})
})