upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #61 from lippserd/bugfix/change-id-fields-to-match-sql-schema

Browse source 
Change ID fields to match SQL schema
This commit is contained in:
Noah Hilverling 2021-05-20 10:46:06 +02:00 committed by GitHub
commit 7bbc4e931e
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/icingadb/v1/command.go
View file

@ -57,7 +57,7 @@ type CommandEnvvar struct {
type CommandCustomvar struct {
CustomvarMeta `json:",inline"`
CommandId types.Binary `json:"object_id"`
CommandId types.Binary `json:"command_id"`
}
type Checkcommand struct {

10
pkg/icingadb/v1/host.go
View file

@ -66,12 +66,12 @@ func (ab Address6Bin) Value() (driver.Value, error) {
type HostCustomvar struct {
CustomvarMeta `json:",inline"`
HostId types.Binary `json:"object_id"`
HostId types.Binary `json:"host_id"`
}
type HostState struct {
State `json:",inline"`
HostId types.Binary `json:"object_id"`
HostId types.Binary `json:"host_id"`
}
type Hostgroup struct {
@ -80,13 +80,13 @@ type Hostgroup struct {
type HostgroupCustomvar struct {
CustomvarMeta `json:",inline"`
HostgroupId types.Binary `json:"object_id"`
HostgroupId types.Binary `json:"hostgroup_id"`
}
type HostgroupMember struct {
MemberMeta `json:",inline"`
HostId types.Binary `json:"object_id"`
HostgroupId types.Binary `json:"group_id"`
HostId types.Binary `json:"host_id"`
HostgroupId types.Binary `json:"hostgroup_id"`
}
func NewHost() contracts.Entity {

2
pkg/icingadb/v1/notification.go
View file

@ -42,7 +42,7 @@ type NotificationRecipient struct {
type NotificationCustomvar struct {
CustomvarMeta `json:",inline"`
NotificationId types.Binary `json:"object_id"`
NotificationId types.Binary `json:"notification_id"`
}
func NewNotification() contracts.Entity {

10
pkg/icingadb/v1/service.go
View file

@ -12,12 +12,12 @@ type Service struct {
type ServiceCustomvar struct {
CustomvarMeta `json:",inline"`
ServiceId types.Binary `json:"object_id"`
ServiceId types.Binary `json:"service_id"`
}
type ServiceState struct {
State `json:",inline"`
ServiceId types.Binary `json:"object_id"`
ServiceId types.Binary `json:"service_id"`
}
type Servicegroup struct {
@ -26,13 +26,13 @@ type Servicegroup struct {
type ServicegroupCustomvar struct {
CustomvarMeta `json:",inline"`
ServicegroupId types.Binary `json:"object_id"`
ServicegroupId types.Binary `json:"servicegroup_id"`
}
type ServicegroupMember struct {
MemberMeta `json:",inline"`
ServiceId types.Binary `json:"object_id"`
ServicegroupId types.Binary `json:"group_id"`
ServiceId types.Binary `json:"service_id"`
ServicegroupId types.Binary `json:"servicegroup_id"`
}
func NewService() contracts.Entity {

2
pkg/icingadb/v1/timeperiod.go
View file

@ -38,7 +38,7 @@ type TimeperiodOverrideExclude struct {
type TimeperiodCustomvar struct {
CustomvarMeta `json:",inline"`
TimeperiodId types.Binary `json:"object_id"`
TimeperiodId types.Binary `json:"timeperiod_id"`
}
func NewTimeperiod() contracts.Entity {

6
pkg/icingadb/v1/user.go
View file

@ -21,7 +21,7 @@ type User struct {
type UserCustomvar struct {
CustomvarMeta `json:",inline"`
UserId types.Binary `json:"object_id"`
UserId types.Binary `json:"user_id"`
}
type Usergroup struct {
@ -30,13 +30,13 @@ type Usergroup struct {
type UsergroupCustomvar struct {
CustomvarMeta `json:",inline"`
UsergroupId types.Binary `json:"object_id"`
UsergroupId types.Binary `json:"usergroup_id"`
}
type UsergroupMember struct {
MemberMeta `json:",inline"`
UserId types.Binary `json:"user_id"`
UsergroupId types.Binary `json:"group_id"`
UsergroupId types.Binary `json:"usergroup_id"`
}
func NewUser() contracts.Entity {