johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-12 06:24:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

console/query: fix InIfBoundary/OutIfBoundary as dimensions

Browse Source 
Fix #1066
This commit is contained in:
Vincent Bernat
2024-02-01 23:34:22 +01:00
parent 8ad3492579
commit 8df8624a24
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
console/data/docs/99-changelog.md
View File

@@ -17,6 +17,7 @@ identified with a specific icon:
- ✨ *inlet*: static metadata provider can provide exporter and interface metadata - ✨ *inlet*: static metadata provider can provide exporter and interface metadata
- ✨ *inlet*: static metadata provider can fetch its configuration from an HTTP endpoint - ✨ *inlet*: static metadata provider can fetch its configuration from an HTTP endpoint
- 🩹 *cmd*: fix parsing of `inlet`→`metadata`→`provider`→`ports` - 🩹 *cmd*: fix parsing of `inlet`→`metadata`→`provider`→`ports`
- 🩹 *console*: fix use of `InIfBoundary` and `OutIfBoundary` as dimensions
- 🌱 *orchestrator*: add TLS support to connect to ClickHouse database - 🌱 *orchestrator*: add TLS support to connect to ClickHouse database
## 1.9.3 - 2024-01-14 ## 1.9.3 - 2024-01-14

2
console/query/column.go
View File

@@ -104,6 +104,8 @@ func (qc Column) ToSQLSelect(sch *schema.Component) string {
case schema.ColumnSrcAS, schema.ColumnDstAS, schema.ColumnDst1stAS, schema.ColumnDst2ndAS, schema.ColumnDst3rdAS: case schema.ColumnSrcAS, schema.ColumnDstAS, schema.ColumnDst1stAS, schema.ColumnDst2ndAS, schema.ColumnDst3rdAS:
strValue = fmt.Sprintf(`concat(toString(%s), ': ', dictGetOrDefault('asns', 'name', %s, '???'))`, strValue = fmt.Sprintf(`concat(toString(%s), ': ', dictGetOrDefault('asns', 'name', %s, '???'))`,
qc, qc) qc, qc)
case schema.ColumnInIfBoundary, schema.ColumnOutIfBoundary:
strValue = fmt.Sprintf(`toString(%s)`, qc.String())
case schema.ColumnEType: case schema.ColumnEType:
strValue = fmt.Sprintf(`if(EType = %d, 'IPv4', if(EType = %d, 'IPv6', '???'))`, strValue = fmt.Sprintf(`if(EType = %d, 'IPv4', if(EType = %d, 'IPv6', '???'))`,
helpers.ETypeIPv4, helpers.ETypeIPv6) helpers.ETypeIPv4, helpers.ETypeIPv6)

3
console/query/column_test.go
View File

@@ -92,6 +92,9 @@ func TestQueryColumnSQLSelect(t *testing.T) {
}, { }, {
Input: schema.ColumnDstMAC, Input: schema.ColumnDstMAC,
Expected: `MACNumToString(DstMAC)`, Expected: `MACNumToString(DstMAC)`,
}, {
Input: schema.ColumnInIfBoundary,
Expected: `toString(InIfBoundary)`,
}, { }, {
Input: schema.ColumnMPLSLabels, Input: schema.ColumnMPLSLabels,
Expected: `arrayStringConcat(MPLSLabels, ' ')`, Expected: `arrayStringConcat(MPLSLabels, ' ')`,