Skip to content

feat: sync ingester.proto for NetBox 4.7.0 support #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfiedorowicz merged 8 commits into from
Sep 3, 2026
Merged

feat: sync ingester.proto for NetBox 4.7.0 support #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1a2291
feat: sync ingester.proto for NetBox 4.7.0-beta1 support
leoparente Aug 26, 2026
d846a15
Merge branch 'develop' into feat/netbox-4.7-support
leoparente Aug 27, 2026
ee40650
Merge branch 'develop' into feat/netbox-4.7-support
leoparente Aug 27, 2026
f470ceb
chore: regenerate protograph entity mappings from current schema
leoparente Aug 27, 2026
d9a05db
feat: sync ingester schema for NetBox 4.7.0-beta2
leoparente Aug 28, 2026
29ae606
feat: sync ingester schema for NetBox 4.7.0 GA
leoparente Sep 2, 2026
edaa8c5
Merge branch 'develop' into feat/netbox-4.7-support
leoparente Sep 2, 2026
49311a7
fix: bump grpc-go to v1.83.1 (CVE-2026-84304)
leoparente Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,450 changes: 2,342 additions & 108 deletions diode-proto/diode/v1/ingester.proto
View file
Open in desktop

Large diffs are not rendered by default.

5,210 changes: 3,534 additions & 1,676 deletions diode-server/gen/diode/v1/diodepb/ingester.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

4,371 changes: 4,147 additions & 224 deletions diode-server/gen/diode/v1/diodepb/ingester.pb.validate.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions diode-server/gen/diode/v1/diodepb/ingester_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 37 additions & 2 deletions diode-server/gen/netbox/server_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Generated code. DO NOT EDIT.
// Source: NetBox v4.6.0
// Timestamp: 2026-07-08 14:57:56Z
// Source: NetBox v4.7.0
// Timestamp: 2026-09-02 20:52:39Z
package netbox

import (
Expand Down Expand Up @@ -209,6 +209,16 @@ const (
VirtualMachineTypeObjectTypeName = "Virtual Machine Type"
UserObjectType = "users.user"
UserObjectTypeName = "User"
CoolingFeedObjectType = "dcim.coolingfeed"
CoolingFeedObjectTypeName = "Cooling Feed"
CoolingIntakeObjectType = "dcim.coolingintake"
CoolingIntakeObjectTypeName = "Cooling Intake"
CoolingOutflowObjectType = "dcim.coolingoutflow"
CoolingOutflowObjectTypeName = "Cooling Outflow"
CoolingSourceObjectType = "dcim.coolingsource"
CoolingSourceObjectTypeName = "Cooling Source"
ModuleBayTypeObjectType = "dcim.modulebaytype"
ModuleBayTypeObjectTypeName = "Module Bay Type"
DeviceConfigObjectType = "dcim.deviceconfig"
DeviceConfigObjectTypeName = "Device Config"
)
Expand Down Expand Up @@ -314,6 +324,11 @@ var entityTypeMap = map[reflect.Type]string{
reflect.TypeOf((*pb.Entity_ScriptModule)(nil)): ScriptModuleObjectType,
reflect.TypeOf((*pb.Entity_VirtualMachineType)(nil)): VirtualMachineTypeObjectType,
reflect.TypeOf((*pb.Entity_User)(nil)): UserObjectType,
reflect.TypeOf((*pb.Entity_CoolingFeed)(nil)): CoolingFeedObjectType,
reflect.TypeOf((*pb.Entity_CoolingIntake)(nil)): CoolingIntakeObjectType,
reflect.TypeOf((*pb.Entity_CoolingOutflow)(nil)): CoolingOutflowObjectType,
reflect.TypeOf((*pb.Entity_CoolingSource)(nil)): CoolingSourceObjectType,
reflect.TypeOf((*pb.Entity_ModuleBayType)(nil)): ModuleBayTypeObjectType,
}

func GetObjectType(entity *pb.Entity) (string, error) {
Expand Down Expand Up @@ -524,6 +539,16 @@ func GetObjectTypeName(objectType string) (string, error) {
return VirtualMachineTypeObjectTypeName, nil
case UserObjectType:
return UserObjectTypeName, nil
case CoolingFeedObjectType:
return CoolingFeedObjectTypeName, nil
case CoolingIntakeObjectType:
return CoolingIntakeObjectTypeName, nil
case CoolingOutflowObjectType:
return CoolingOutflowObjectTypeName, nil
case CoolingSourceObjectType:
return CoolingSourceObjectTypeName, nil
case ModuleBayTypeObjectType:
return ModuleBayTypeObjectTypeName, nil
case DeviceConfigObjectType:
return DeviceConfigObjectTypeName, nil
default:
Expand Down Expand Up @@ -561,6 +586,14 @@ func GetPrimaryValue(entity *pb.Entity) (string, error) {
return fmt.Sprintf("%v", e.ContactGroup.Name), nil
case *pb.Entity_ContactRole:
return fmt.Sprintf("%v", e.ContactRole.Name), nil
case *pb.Entity_CoolingFeed:
return fmt.Sprintf("%v", e.CoolingFeed.Name), nil
case *pb.Entity_CoolingIntake:
return fmt.Sprintf("%v", e.CoolingIntake.Name), nil
case *pb.Entity_CoolingOutflow:
return fmt.Sprintf("%v", e.CoolingOutflow.Name), nil
case *pb.Entity_CoolingSource:
return fmt.Sprintf("%v", e.CoolingSource.Name), nil
case *pb.Entity_CustomField:
return fmt.Sprintf("%v", e.CustomField.Name), nil
case *pb.Entity_CustomFieldChoiceSet:
Expand Down Expand Up @@ -607,6 +640,8 @@ func GetPrimaryValue(entity *pb.Entity) (string, error) {
return fmt.Sprintf("%v", e.Manufacturer.Name), nil
case *pb.Entity_ModuleBay:
return fmt.Sprintf("%v", e.ModuleBay.Name), nil
case *pb.Entity_ModuleBayType:
return fmt.Sprintf("%v", e.ModuleBayType.Name), nil
case *pb.Entity_ModuleType:
return fmt.Sprintf("%v", e.ModuleType.Model), nil
case *pb.Entity_ModuleTypeProfile:
Expand Down
92 changes: 90 additions & 2 deletions diode-server/gen/protograph/entity_mappings.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions diode-server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ require (
github.com/testcontainers/testcontainers-go v0.42.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0
go.opentelemetry.io/otel v1.43.0
go.opentelemetry.io/otel v1.44.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0
go.opentelemetry.io/otel/exporters/prometheus v0.58.0
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0
go.opentelemetry.io/otel/metric v1.43.0
go.opentelemetry.io/otel/sdk v1.43.0
go.opentelemetry.io/otel/sdk/metric v1.43.0
go.opentelemetry.io/otel/trace v1.43.0
go.opentelemetry.io/otel/metric v1.44.0
go.opentelemetry.io/otel/sdk v1.44.0
go.opentelemetry.io/otel/sdk/metric v1.44.0
go.opentelemetry.io/otel/trace v1.44.0
golang.org/x/oauth2 v0.36.0
golang.org/x/sync v0.22.0
golang.org/x/text v0.41.0
golang.org/x/time v0.11.0
google.golang.org/grpc v1.82.1
google.golang.org/grpc v1.83.1
google.golang.org/protobuf v1.36.11
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.37.1
Expand Down Expand Up @@ -117,8 +117,8 @@ require (
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
golang.org/x/net v0.58.0 // indirect
golang.org/x/sys v0.47.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
modernc.org/libc v1.65.8 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
Expand Down
34 changes: 18 additions & 16 deletions diode-server/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 h1:zwdo1gS2eH26Rg+CoqVQpEK1h8gvt5qyU5Kk5Bixvow=
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0/go.mod h1:rUKCPscaRWWcqGT6HnEmYrK+YNe5+Sw64xgQTOJ5b30=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0=
Expand All @@ -226,14 +226,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 h1:rixTyDGXFxRy1x
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0/go.mod h1:dowW6UsM9MKbJq5JTz2AMVp3/5iW5I/TStsk8S+CfHw=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0 h1:G8Xec/SgZQricwWBJF/mHZc7A02YHedfFDENwJEdRA0=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0/go.mod h1:PD57idA/AiFD5aqoxGxCvT/ILJPeHy3MjqU/NS7KogY=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=
go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI=
go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
Expand Down Expand Up @@ -269,12 +271,12 @@ golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 h1:yQugLulqltosq0B/f8l4w9VryjV+N/5gcW0jQ3N8Qec=
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478/go.mod h1:C6ADNqOxbgdUUeRTU+LCHDPB9ttAMCTff6auwCVa4uc=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.82.1 h1:NnAxzGRA0677vCa4BUkOAnO5+FfQqVl9iUXeD0IqcGE=
google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.83.1 h1:HIO0+BEtBP6soyqvqC8sNUjZ7bTs+0hFQuFF+RAy++Y=
google.golang.org/grpc v1.83.1/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
Loading
Loading