Merge pull request #27 from grafana/feat-add-geo-asn

feat: Rename geo network Attirbutes
grafana · Jan 16, 2025 · d6a2afe · d6a2afe
2 parents 79b6161 + f9695cc
commit d6a2afe
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,11 @@ The repository consists of
 - [OpenAPI specification](./spec/gen/faro.gen.yaml)
 - Packages with HTTP Models generated from the OpenAPI specification
 
+## Requirements
+
+- [OpenAPI Codegen](https://github.com/oapi-codegen/oapi-codegen)
+- [Python YQ](https://pypi.org/project/yq/)
+
 ## Packages
 
 ### Go

diff --git a/pkg/go/faro.gen.go b/pkg/go/faro.gen.go
diff --git a/pkg/translator/faro/internal/payload.go b/pkg/translator/faro/internal/payload.go
@@ -237,8 +237,8 @@ func GeoToKeyVal(g faroTypes.Geo) *KeyVal {
 	KeyValAdd(kv, "country_iso", g.CountryISOCode)
 	KeyValAdd(kv, "subdivision_iso", g.SubdivisionISO)
 	KeyValAdd(kv, "city", g.City)
-	KeyValAdd(kv, "connection_type", g.ConnectionType)
-	KeyValAdd(kv, "carrier", g.Carrier)
+	KeyValAdd(kv, "asn_org", g.ASNOrg)
+	KeyValAdd(kv, "asn_id", g.ASNId)
 	return kv
 }
 

diff --git a/pkg/translator/faro/logs_to_faro.go b/pkg/translator/faro/logs_to_faro.go
@@ -451,11 +451,11 @@ func extractGeoFromKeyVal(kv map[string]string) faroTypes.Geo {
 	if city, ok := kv["geo_city"]; ok {
 		geo.City = city
 	}
-	if connectionType, ok := kv["geo_connection_type"]; ok {
-		geo.ConnectionType = connectionType
+	if asnOrg, ok := kv["geo_asn_org"]; ok {
+		geo.ASNOrg = asnOrg
 	}
-	if carrier, ok := kv["geo_carrier"]; ok {
-		geo.Carrier = carrier
+	if asnID, ok := kv["geo_asn_id"]; ok {
+		geo.ASNID = asnID
 	}
 
 	return geo

diff --git a/spec/components/schemas/geo.yaml b/spec/components/schemas/geo.yaml
@@ -19,10 +19,12 @@ components:
         city:
           type: string
           x-go-type-skip-optional-pointer: true
-        connection_type:
+        asn_org:
           type: string
           x-go-type-skip-optional-pointer: true
-        carrier:
+          x-go-name: ASNOrg
+        asn_id:
           type: string
           x-go-type-skip-optional-pointer: true
+          x-go-name: ASNID
       x-go-type-skip-optional-pointer: true
diff --git a/spec/gen/faro.gen.yaml b/spec/gen/faro.gen.yaml
@@ -489,12 +489,14 @@ components:
         city:
           type: string
           x-go-type-skip-optional-pointer: true
-        connection_type:
+        asn_org:
           type: string
           x-go-type-skip-optional-pointer: true
-        carrier:
+          x-go-name: ASNOrg
+        asn_id:
           type: string
           x-go-type-skip-optional-pointer: true
+          x-go-name: ASNID
       x-go-type-skip-optional-pointer: true
     Traces:
       type: object