From cfb9709a338b9f0cbbbc59f2207b0dcacd685f2c Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 2 Nov 2019 15:24:43 +0100 Subject: [PATCH] Update import URLs --- configobject/configobject.go | 2 +- configobject/configsync/configsync.go | 12 +- configobject/configsync/configsync_test.go | 18 +-- configobject/history/history.go | 6 +- configobject/nullrows/nullrows.go | 2 +- .../objecttypes/actionurl/actionurl.go | 6 +- .../objecttypes/checkcommand/checkcommand.go | 6 +- .../checkcommandargument.go | 6 +- .../checkcommandcustomvar.go | 6 +- .../checkcommandenvvar/checkcommandenvvar.go | 6 +- configobject/objecttypes/comment/comment.go | 6 +- .../objecttypes/customvar/customvar.go | 6 +- .../customvar/customvarflat/customvarflat.go | 6 +- configobject/objecttypes/downtime/downtime.go | 6 +- configobject/objecttypes/endpoint/endpoint.go | 6 +- .../objecttypes/eventcommand/eventcommand.go | 6 +- .../eventcommandargument.go | 6 +- .../eventcommandcustomvar.go | 6 +- .../eventcommandenvvar/eventcommandenvvar.go | 6 +- configobject/objecttypes/host/host.go | 6 +- .../host/hostcustomvar/hostcustomvar.go | 6 +- .../objecttypes/host/hoststate/hoststate.go | 6 +- .../objecttypes/hostgroup/hostgroup.go | 6 +- .../hostgroupcustomvar/hostgroupcustomvar.go | 6 +- .../hostgroupmember/hostgroupmember.go | 6 +- .../objecttypes/iconimage/iconimage.go | 6 +- configobject/objecttypes/notesurl/notesurl.go | 6 +- .../objecttypes/notification/notification.go | 6 +- .../notificationcustomvar.go | 6 +- .../notificationuser/notificationuser.go | 6 +- .../notificationusergroup.go | 6 +- .../notificationcommand.go | 6 +- .../notificationcommandargument.go | 6 +- .../notificationcommandcustomvar.go | 6 +- .../notificationcommandenvvar.go | 6 +- configobject/objecttypes/service/service.go | 6 +- .../servicecustomvar/servicecustomvar.go | 6 +- .../service/servicestate/servicestate.go | 6 +- .../objecttypes/servicegroup/servicegroup.go | 6 +- .../servicegroupcustomvar.go | 6 +- .../servicegroupmember/servicegroupmember.go | 6 +- .../objecttypes/timeperiod/timeperiod.go | 6 +- .../timeperiodcustomvar.go | 6 +- .../timeperiodoverrideexclude.go | 6 +- .../timeperiodoverrideinclude.go | 6 +- .../timeperiodrange/timeperiodrange.go | 6 +- configobject/objecttypes/user/user.go | 6 +- .../user/usercustomvar/usercustomvar.go | 6 +- .../objecttypes/usergroup/usergroup.go | 6 +- .../usergroupcustomvar/usergroupcustomvar.go | 6 +- .../usergroupmember/usergroupmember.go | 6 +- configobject/objecttypes/zone/zone.go | 6 +- configobject/statesync/statesync.go | 6 +- connection/mysql.go | 2 +- connection/mysql_test.go | 4 +- connection/redis.go | 2 +- connection/redis_pubsub_test.go | 2 +- connection/redis_test.go | 2 +- ha/ha.go | 4 +- ha/ha_test.go | 8 +- ha/heartbeat.go | 2 +- ha/heartbeat_test.go | 4 +- jsondecoder/json-decoder.go | 2 +- jsondecoder/json-decoder_test.go | 4 +- main.go | 116 +++++++++--------- supervisor/supervisor.go | 4 +- utils/convert.go | 14 +-- 67 files changed, 249 insertions(+), 249 deletions(-) diff --git a/configobject/configobject.go b/configobject/configobject.go index ca7ecc16..6660c891 100644 --- a/configobject/configobject.go +++ b/configobject/configobject.go @@ -1,7 +1,7 @@ package configobject import ( - "git.icinga.com/icingadb/icingadb-main/connection" + "github.com/icinga/icingadb/connection" ) type ObjectInformation struct { diff --git a/configobject/configsync/configsync.go b/configobject/configsync/configsync.go index d5e29265..c3b18f0e 100644 --- a/configobject/configsync/configsync.go +++ b/configobject/configsync/configsync.go @@ -3,13 +3,13 @@ package configsync import ( "encoding/json" "fmt" - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/ha" - "git.icinga.com/icingadb/icingadb-main/jsondecoder" - "git.icinga.com/icingadb/icingadb-main/supervisor" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-redis/redis" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/ha" + "github.com/icinga/icingadb/jsondecoder" + "github.com/icinga/icingadb/supervisor" + "github.com/icinga/icingadb/utils" log "github.com/sirupsen/logrus" "regexp" "sync" diff --git a/configobject/configsync/configsync_test.go b/configobject/configsync/configsync_test.go index e222f877..7434281e 100644 --- a/configobject/configsync/configsync_test.go +++ b/configobject/configsync/configsync_test.go @@ -2,16 +2,16 @@ package configsync import ( "fmt" - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/host" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/connection/mysqld" - "git.icinga.com/icingadb/icingadb-main/connection/redisd" - "git.icinga.com/icingadb/icingadb-main/ha" - "git.icinga.com/icingadb/icingadb-main/jsondecoder" - "git.icinga.com/icingadb/icingadb-main/supervisor" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-redis/redis" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/configobject/objecttypes/host" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/connection/mysqld" + "github.com/icinga/icingadb/connection/redisd" + "github.com/icinga/icingadb/ha" + "github.com/icinga/icingadb/jsondecoder" + "github.com/icinga/icingadb/supervisor" + "github.com/icinga/icingadb/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "sync" diff --git a/configobject/history/history.go b/configobject/history/history.go index 5c62b474..1b95639a 100644 --- a/configobject/history/history.go +++ b/configobject/history/history.go @@ -2,11 +2,11 @@ package history import ( "fmt" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/supervisor" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-redis/redis" "github.com/google/uuid" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/supervisor" + "github.com/icinga/icingadb/utils" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "strconv" diff --git a/configobject/nullrows/nullrows.go b/configobject/nullrows/nullrows.go index bd39e7cc..f69402d8 100644 --- a/configobject/nullrows/nullrows.go +++ b/configobject/nullrows/nullrows.go @@ -1,8 +1,8 @@ package nullrows import ( - "git.icinga.com/icingadb/icingadb-main/supervisor" "github.com/google/uuid" + "github.com/icinga/icingadb/supervisor" log "github.com/sirupsen/logrus" "time" ) diff --git a/configobject/objecttypes/actionurl/actionurl.go b/configobject/objecttypes/actionurl/actionurl.go index c65e4352..930ae1ab 100644 --- a/configobject/objecttypes/actionurl/actionurl.go +++ b/configobject/objecttypes/actionurl/actionurl.go @@ -1,9 +1,9 @@ package actionurl import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/checkcommand/checkcommand.go b/configobject/objecttypes/checkcommand/checkcommand.go index 9dc2085d..e2dc4ac8 100644 --- a/configobject/objecttypes/checkcommand/checkcommand.go +++ b/configobject/objecttypes/checkcommand/checkcommand.go @@ -1,9 +1,9 @@ package checkcommand import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go b/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go index ee2d8704..e83d5c8f 100644 --- a/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go +++ b/configobject/objecttypes/checkcommand/checkcommandargument/checkcommandargument.go @@ -1,9 +1,9 @@ package checkcommandargument import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go b/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go index e3834e37..6dfc4cce 100644 --- a/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go +++ b/configobject/objecttypes/checkcommand/checkcommandcustomvar/checkcommandcustomvar.go @@ -1,9 +1,9 @@ package checkcommandcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go b/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go index 36436d50..d9d871c7 100644 --- a/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go +++ b/configobject/objecttypes/checkcommand/checkcommandenvvar/checkcommandenvvar.go @@ -1,9 +1,9 @@ package checkcommandenvvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/comment/comment.go b/configobject/objecttypes/comment/comment.go index 0ced5830..48106200 100644 --- a/configobject/objecttypes/comment/comment.go +++ b/configobject/objecttypes/comment/comment.go @@ -2,9 +2,9 @@ package comment import ( "fmt" - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/customvar/customvar.go b/configobject/objecttypes/customvar/customvar.go index fc0891aa..90ae4b4f 100644 --- a/configobject/objecttypes/customvar/customvar.go +++ b/configobject/objecttypes/customvar/customvar.go @@ -1,9 +1,9 @@ package customvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/customvar/customvarflat/customvarflat.go b/configobject/objecttypes/customvar/customvarflat/customvarflat.go index bbfd2b7e..26a07d31 100644 --- a/configobject/objecttypes/customvar/customvarflat/customvarflat.go +++ b/configobject/objecttypes/customvar/customvarflat/customvarflat.go @@ -3,9 +3,9 @@ package customvarflat import ( "encoding/json" "fmt" - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" "strconv" ) diff --git a/configobject/objecttypes/downtime/downtime.go b/configobject/objecttypes/downtime/downtime.go index a2f5ef76..ef23248f 100644 --- a/configobject/objecttypes/downtime/downtime.go +++ b/configobject/objecttypes/downtime/downtime.go @@ -1,9 +1,9 @@ package downtime import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/endpoint/endpoint.go b/configobject/objecttypes/endpoint/endpoint.go index 24ad19be..52514841 100644 --- a/configobject/objecttypes/endpoint/endpoint.go +++ b/configobject/objecttypes/endpoint/endpoint.go @@ -1,9 +1,9 @@ package endpoint import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/eventcommand/eventcommand.go b/configobject/objecttypes/eventcommand/eventcommand.go index f0225896..25570b9d 100644 --- a/configobject/objecttypes/eventcommand/eventcommand.go +++ b/configobject/objecttypes/eventcommand/eventcommand.go @@ -1,9 +1,9 @@ package eventcommand import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go b/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go index 0e94bcb7..12fb898d 100644 --- a/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go +++ b/configobject/objecttypes/eventcommand/eventcommandargument/eventcommandargument.go @@ -1,9 +1,9 @@ package eventcommandargument import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go b/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go index 2a0926ba..f13cd579 100644 --- a/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go +++ b/configobject/objecttypes/eventcommand/eventcommandcustomvar/eventcommandcustomvar.go @@ -1,9 +1,9 @@ package eventcommandcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go b/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go index de99a46b..dc6423e3 100644 --- a/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go +++ b/configobject/objecttypes/eventcommand/eventcommandenvvar/eventcommandenvvar.go @@ -1,9 +1,9 @@ package eventcommandenvvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/host/host.go b/configobject/objecttypes/host/host.go index 3db1c751..e74fbcbb 100644 --- a/configobject/objecttypes/host/host.go +++ b/configobject/objecttypes/host/host.go @@ -1,9 +1,9 @@ package host import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go b/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go index d9429f24..7b766944 100644 --- a/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go +++ b/configobject/objecttypes/host/hostcustomvar/hostcustomvar.go @@ -1,9 +1,9 @@ package hostcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/host/hoststate/hoststate.go b/configobject/objecttypes/host/hoststate/hoststate.go index f13e1213..a38cf8c1 100644 --- a/configobject/objecttypes/host/hoststate/hoststate.go +++ b/configobject/objecttypes/host/hoststate/hoststate.go @@ -1,9 +1,9 @@ package hoststate import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/hostgroup/hostgroup.go b/configobject/objecttypes/hostgroup/hostgroup.go index defa102f..f57f746e 100644 --- a/configobject/objecttypes/hostgroup/hostgroup.go +++ b/configobject/objecttypes/hostgroup/hostgroup.go @@ -1,9 +1,9 @@ package hostgroup import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go b/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go index 11177b8b..722eea19 100644 --- a/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go +++ b/configobject/objecttypes/hostgroup/hostgroupcustomvar/hostgroupcustomvar.go @@ -1,9 +1,9 @@ package hostgroupcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go b/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go index 334338cb..54ed1e02 100644 --- a/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go +++ b/configobject/objecttypes/hostgroup/hostgroupmember/hostgroupmember.go @@ -1,9 +1,9 @@ package hostgroupmember import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/iconimage/iconimage.go b/configobject/objecttypes/iconimage/iconimage.go index 470556be..a79a71fc 100644 --- a/configobject/objecttypes/iconimage/iconimage.go +++ b/configobject/objecttypes/iconimage/iconimage.go @@ -1,9 +1,9 @@ package iconimage import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notesurl/notesurl.go b/configobject/objecttypes/notesurl/notesurl.go index 2e3e2e50..72f9ec35 100644 --- a/configobject/objecttypes/notesurl/notesurl.go +++ b/configobject/objecttypes/notesurl/notesurl.go @@ -1,9 +1,9 @@ package notesurl import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notification/notification.go b/configobject/objecttypes/notification/notification.go index baa2f1a9..6cfb1a50 100644 --- a/configobject/objecttypes/notification/notification.go +++ b/configobject/objecttypes/notification/notification.go @@ -1,9 +1,9 @@ package notification import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go b/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go index e538ba29..bb5490c5 100644 --- a/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go +++ b/configobject/objecttypes/notification/notificationcustomvar/notificationcustomvar.go @@ -1,9 +1,9 @@ package notificationcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notification/notificationuser/notificationuser.go b/configobject/objecttypes/notification/notificationuser/notificationuser.go index d39d1b8a..2069e4f5 100644 --- a/configobject/objecttypes/notification/notificationuser/notificationuser.go +++ b/configobject/objecttypes/notification/notificationuser/notificationuser.go @@ -1,9 +1,9 @@ package notificationuser import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go b/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go index 8ea8b75d..1707fcd2 100644 --- a/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go +++ b/configobject/objecttypes/notification/notificationusergroup/notificationusergroup.go @@ -1,9 +1,9 @@ package notificationusergroup import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notificationcommand/notificationcommand.go b/configobject/objecttypes/notificationcommand/notificationcommand.go index 8aeb6aba..47a92f0c 100644 --- a/configobject/objecttypes/notificationcommand/notificationcommand.go +++ b/configobject/objecttypes/notificationcommand/notificationcommand.go @@ -1,9 +1,9 @@ package notificationcommand import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go b/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go index 96210d64..6f9e2b4e 100644 --- a/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go +++ b/configobject/objecttypes/notificationcommand/notificationcommandargument/notificationcommandargument.go @@ -1,9 +1,9 @@ package notificationcommandargument import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go b/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go index 7ea1ef33..d5760624 100644 --- a/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go +++ b/configobject/objecttypes/notificationcommand/notificationcommandcustomvar/notificationcommandcustomvar.go @@ -1,9 +1,9 @@ package notificationcommandcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go b/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go index bfd9984d..5d905166 100644 --- a/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go +++ b/configobject/objecttypes/notificationcommand/notificationcommandenvvar/notificationcommandenvvar.go @@ -1,9 +1,9 @@ package notificationcommandenvvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/service/service.go b/configobject/objecttypes/service/service.go index 5e6fd545..4473c971 100644 --- a/configobject/objecttypes/service/service.go +++ b/configobject/objecttypes/service/service.go @@ -1,9 +1,9 @@ package service import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go b/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go index a07b2791..4bf04a32 100644 --- a/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go +++ b/configobject/objecttypes/service/servicecustomvar/servicecustomvar.go @@ -1,9 +1,9 @@ package servicecustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/service/servicestate/servicestate.go b/configobject/objecttypes/service/servicestate/servicestate.go index db147bec..fec1dd2d 100644 --- a/configobject/objecttypes/service/servicestate/servicestate.go +++ b/configobject/objecttypes/service/servicestate/servicestate.go @@ -1,9 +1,9 @@ package servicestate import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/servicegroup/servicegroup.go b/configobject/objecttypes/servicegroup/servicegroup.go index 1ce3b381..8abd0a39 100644 --- a/configobject/objecttypes/servicegroup/servicegroup.go +++ b/configobject/objecttypes/servicegroup/servicegroup.go @@ -1,9 +1,9 @@ package servicegroup import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go b/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go index 753853d7..f9d0446d 100644 --- a/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go +++ b/configobject/objecttypes/servicegroup/servicegroupcustomvar/servicegroupcustomvar.go @@ -1,9 +1,9 @@ package servicegroupcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go b/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go index cecf6153..3584364a 100644 --- a/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go +++ b/configobject/objecttypes/servicegroup/servicegroupmember/servicegroupmember.go @@ -1,9 +1,9 @@ package servicegroupmember import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/timeperiod/timeperiod.go b/configobject/objecttypes/timeperiod/timeperiod.go index 5a0dee7c..e3e47925 100644 --- a/configobject/objecttypes/timeperiod/timeperiod.go +++ b/configobject/objecttypes/timeperiod/timeperiod.go @@ -1,9 +1,9 @@ package timeperiod import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go b/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go index 90d81f69..af6e6d97 100644 --- a/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go +++ b/configobject/objecttypes/timeperiod/timeperiodcustomvar/timeperiodcustomvar.go @@ -1,9 +1,9 @@ package timeperiodcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go b/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go index 9235d046..8ccf3622 100644 --- a/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go +++ b/configobject/objecttypes/timeperiod/timeperiodoverrideexclude/timeperiodoverrideexclude.go @@ -1,9 +1,9 @@ package timeperiodoverrideexclude import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go b/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go index 11e141a9..630e3e80 100644 --- a/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go +++ b/configobject/objecttypes/timeperiod/timeperiodoverrideinclude/timeperiodoverrideinclude.go @@ -1,9 +1,9 @@ package timeperiodoverrideinclude import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go b/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go index 1a5888a5..24e4470d 100644 --- a/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go +++ b/configobject/objecttypes/timeperiod/timeperiodrange/timeperiodrange.go @@ -1,9 +1,9 @@ package timeperiodrange import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/user/user.go b/configobject/objecttypes/user/user.go index 8a86acd5..624dd796 100644 --- a/configobject/objecttypes/user/user.go +++ b/configobject/objecttypes/user/user.go @@ -1,9 +1,9 @@ package user import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/user/usercustomvar/usercustomvar.go b/configobject/objecttypes/user/usercustomvar/usercustomvar.go index 4a164907..b813a8dd 100644 --- a/configobject/objecttypes/user/usercustomvar/usercustomvar.go +++ b/configobject/objecttypes/user/usercustomvar/usercustomvar.go @@ -1,9 +1,9 @@ package usercustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/usergroup/usergroup.go b/configobject/objecttypes/usergroup/usergroup.go index d8083d5b..c65135ca 100644 --- a/configobject/objecttypes/usergroup/usergroup.go +++ b/configobject/objecttypes/usergroup/usergroup.go @@ -1,9 +1,9 @@ package usergroup import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go b/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go index e7a570e4..7738f63e 100644 --- a/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go +++ b/configobject/objecttypes/usergroup/usergroupcustomvar/usergroupcustomvar.go @@ -1,9 +1,9 @@ package usergroupcustomvar import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go b/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go index 7c2c603e..3101309c 100644 --- a/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go +++ b/configobject/objecttypes/usergroup/usergroupmember/usergroupmember.go @@ -1,9 +1,9 @@ package usergroupmember import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/objecttypes/zone/zone.go b/configobject/objecttypes/zone/zone.go index 073f8598..2c0eb539 100644 --- a/configobject/objecttypes/zone/zone.go +++ b/configobject/objecttypes/zone/zone.go @@ -1,9 +1,9 @@ package zone import ( - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/utils" ) var ( diff --git a/configobject/statesync/statesync.go b/configobject/statesync/statesync.go index dfb4c60c..79d57f4d 100644 --- a/configobject/statesync/statesync.go +++ b/configobject/statesync/statesync.go @@ -2,10 +2,10 @@ package statesync import ( "encoding/hex" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/supervisor" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-redis/redis" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/supervisor" + "github.com/icinga/icingadb/utils" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "sync" diff --git a/connection/mysql.go b/connection/mysql.go index e89ffaee..47c0313f 100644 --- a/connection/mysql.go +++ b/connection/mysql.go @@ -5,7 +5,7 @@ import ( "context" "database/sql" "fmt" - "git.icinga.com/icingadb/icingadb-main/utils" + "github.com/icinga/icingadb/utils" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "strings" diff --git a/connection/mysql_test.go b/connection/mysql_test.go index 042f606f..3a442221 100644 --- a/connection/mysql_test.go +++ b/connection/mysql_test.go @@ -6,9 +6,9 @@ import ( "database/sql" "errors" "fmt" - "git.icinga.com/icingadb/icingadb-main/connection/mysqld" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-sql-driver/mysql" + "github.com/icinga/icingadb/connection/mysqld" + "github.com/icinga/icingadb/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/connection/redis.go b/connection/redis.go index f64a9d74..186b59c5 100644 --- a/connection/redis.go +++ b/connection/redis.go @@ -2,8 +2,8 @@ package connection import ( "fmt" - "git.icinga.com/icingadb/icingadb-main/utils" "github.com/go-redis/redis" + "github.com/icinga/icingadb/utils" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "strings" diff --git a/connection/redis_pubsub_test.go b/connection/redis_pubsub_test.go index d8b0828a..2f79c6f6 100644 --- a/connection/redis_pubsub_test.go +++ b/connection/redis_pubsub_test.go @@ -1,8 +1,8 @@ package connection import ( - "git.icinga.com/icingadb/icingadb-main/connection/redisd" "github.com/go-redis/redis" + "github.com/icinga/icingadb/connection/redisd" "github.com/stretchr/testify/assert" "testing" "time" diff --git a/connection/redis_test.go b/connection/redis_test.go index e6b06458..667cb069 100644 --- a/connection/redis_test.go +++ b/connection/redis_test.go @@ -1,8 +1,8 @@ package connection import ( - "git.icinga.com/icingadb/icingadb-main/connection/redisd" "github.com/go-redis/redis" + "github.com/icinga/icingadb/connection/redisd" "github.com/stretchr/testify/assert" "sync" "sync/atomic" diff --git a/ha/ha.go b/ha/ha.go index 1720dd97..3b34b842 100644 --- a/ha/ha.go +++ b/ha/ha.go @@ -4,10 +4,10 @@ import ( "bytes" "encoding/hex" "errors" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/supervisor" "github.com/go-redis/redis" "github.com/google/uuid" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/supervisor" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "sync" diff --git a/ha/ha_test.go b/ha/ha_test.go index 8269eded..3c079932 100644 --- a/ha/ha_test.go +++ b/ha/ha_test.go @@ -3,12 +3,12 @@ package ha import ( "crypto/sha1" "fmt" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/connection/mysqld" - "git.icinga.com/icingadb/icingadb-main/connection/redisd" - "git.icinga.com/icingadb/icingadb-main/supervisor" "github.com/go-redis/redis" "github.com/google/uuid" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/connection/mysqld" + "github.com/icinga/icingadb/connection/redisd" + "github.com/icinga/icingadb/supervisor" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/ha/heartbeat.go b/ha/heartbeat.go index f2952f52..9db16f44 100644 --- a/ha/heartbeat.go +++ b/ha/heartbeat.go @@ -3,7 +3,7 @@ package ha import ( "crypto/sha1" "encoding/json" - "git.icinga.com/icingadb/icingadb-main/connection" + "github.com/icinga/icingadb/connection" log "github.com/sirupsen/logrus" ) diff --git a/ha/heartbeat_test.go b/ha/heartbeat_test.go index c9f8b9b8..585d8922 100644 --- a/ha/heartbeat_test.go +++ b/ha/heartbeat_test.go @@ -2,8 +2,8 @@ package ha import ( "encoding/json" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/connection/redisd" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/connection/redisd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/jsondecoder/json-decoder.go b/jsondecoder/json-decoder.go index 706d5745..866b4a70 100644 --- a/jsondecoder/json-decoder.go +++ b/jsondecoder/json-decoder.go @@ -1,7 +1,7 @@ package jsondecoder import ( - "git.icinga.com/icingadb/icingadb-main/connection" + "github.com/icinga/icingadb/connection" "github.com/json-iterator/go" ) diff --git a/jsondecoder/json-decoder_test.go b/jsondecoder/json-decoder_test.go index 8d332303..41d3e7e8 100644 --- a/jsondecoder/json-decoder_test.go +++ b/jsondecoder/json-decoder_test.go @@ -1,8 +1,8 @@ package jsondecoder import ( - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/host" - "git.icinga.com/icingadb/icingadb-main/connection" + "github.com/icinga/icingadb/configobject/objecttypes/host" + "github.com/icinga/icingadb/connection" "github.com/stretchr/testify/assert" "testing" ) diff --git a/main.go b/main.go index 5cfb00aa..fc2caf8c 100644 --- a/main.go +++ b/main.go @@ -2,64 +2,64 @@ package main import ( "flag" - "git.icinga.com/icingadb/icingadb-main/config" - "git.icinga.com/icingadb/icingadb-main/configobject" - "git.icinga.com/icingadb/icingadb-main/configobject/configsync" - "git.icinga.com/icingadb/icingadb-main/configobject/history" - "git.icinga.com/icingadb/icingadb-main/configobject/nullrows" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/actionurl" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/checkcommand" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/checkcommand/checkcommandargument" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/checkcommand/checkcommandcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/checkcommand/checkcommandenvvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/comment" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/customvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/customvar/customvarflat" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/downtime" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/endpoint" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/eventcommand" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/eventcommand/eventcommandargument" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/eventcommand/eventcommandcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/eventcommand/eventcommandenvvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/host" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/host/hostcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/host/hoststate" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/hostgroup" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/hostgroup/hostgroupcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/hostgroup/hostgroupmember" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/iconimage" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notesurl" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notification" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notification/notificationcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notification/notificationuser" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notification/notificationusergroup" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notificationcommand" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notificationcommand/notificationcommandargument" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notificationcommand/notificationcommandcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/notificationcommand/notificationcommandenvvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/service" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/service/servicecustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/service/servicestate" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/servicegroup" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/servicegroup/servicegroupcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/servicegroup/servicegroupmember" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/timeperiod" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/timeperiod/timeperiodcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/timeperiod/timeperiodoverrideexclude" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/timeperiod/timeperiodoverrideinclude" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/timeperiod/timeperiodrange" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/user" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/user/usercustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/usergroup" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/usergroup/usergroupcustomvar" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/usergroup/usergroupmember" - "git.icinga.com/icingadb/icingadb-main/configobject/objecttypes/zone" - "git.icinga.com/icingadb/icingadb-main/configobject/statesync" - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/ha" - "git.icinga.com/icingadb/icingadb-main/jsondecoder" - "git.icinga.com/icingadb/icingadb-main/prometheus" - "git.icinga.com/icingadb/icingadb-main/supervisor" + "github.com/icinga/icingadb/config" + "github.com/icinga/icingadb/configobject" + "github.com/icinga/icingadb/configobject/configsync" + "github.com/icinga/icingadb/configobject/history" + "github.com/icinga/icingadb/configobject/nullrows" + "github.com/icinga/icingadb/configobject/objecttypes/actionurl" + "github.com/icinga/icingadb/configobject/objecttypes/checkcommand" + "github.com/icinga/icingadb/configobject/objecttypes/checkcommand/checkcommandargument" + "github.com/icinga/icingadb/configobject/objecttypes/checkcommand/checkcommandcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/checkcommand/checkcommandenvvar" + "github.com/icinga/icingadb/configobject/objecttypes/comment" + "github.com/icinga/icingadb/configobject/objecttypes/customvar" + "github.com/icinga/icingadb/configobject/objecttypes/customvar/customvarflat" + "github.com/icinga/icingadb/configobject/objecttypes/downtime" + "github.com/icinga/icingadb/configobject/objecttypes/endpoint" + "github.com/icinga/icingadb/configobject/objecttypes/eventcommand" + "github.com/icinga/icingadb/configobject/objecttypes/eventcommand/eventcommandargument" + "github.com/icinga/icingadb/configobject/objecttypes/eventcommand/eventcommandcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/eventcommand/eventcommandenvvar" + "github.com/icinga/icingadb/configobject/objecttypes/host" + "github.com/icinga/icingadb/configobject/objecttypes/host/hostcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/host/hoststate" + "github.com/icinga/icingadb/configobject/objecttypes/hostgroup" + "github.com/icinga/icingadb/configobject/objecttypes/hostgroup/hostgroupcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/hostgroup/hostgroupmember" + "github.com/icinga/icingadb/configobject/objecttypes/iconimage" + "github.com/icinga/icingadb/configobject/objecttypes/notesurl" + "github.com/icinga/icingadb/configobject/objecttypes/notification" + "github.com/icinga/icingadb/configobject/objecttypes/notification/notificationcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/notification/notificationuser" + "github.com/icinga/icingadb/configobject/objecttypes/notification/notificationusergroup" + "github.com/icinga/icingadb/configobject/objecttypes/notificationcommand" + "github.com/icinga/icingadb/configobject/objecttypes/notificationcommand/notificationcommandargument" + "github.com/icinga/icingadb/configobject/objecttypes/notificationcommand/notificationcommandcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/notificationcommand/notificationcommandenvvar" + "github.com/icinga/icingadb/configobject/objecttypes/service" + "github.com/icinga/icingadb/configobject/objecttypes/service/servicecustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/service/servicestate" + "github.com/icinga/icingadb/configobject/objecttypes/servicegroup" + "github.com/icinga/icingadb/configobject/objecttypes/servicegroup/servicegroupcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/servicegroup/servicegroupmember" + "github.com/icinga/icingadb/configobject/objecttypes/timeperiod" + "github.com/icinga/icingadb/configobject/objecttypes/timeperiod/timeperiodcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/timeperiod/timeperiodoverrideexclude" + "github.com/icinga/icingadb/configobject/objecttypes/timeperiod/timeperiodoverrideinclude" + "github.com/icinga/icingadb/configobject/objecttypes/timeperiod/timeperiodrange" + "github.com/icinga/icingadb/configobject/objecttypes/user" + "github.com/icinga/icingadb/configobject/objecttypes/user/usercustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/usergroup" + "github.com/icinga/icingadb/configobject/objecttypes/usergroup/usergroupcustomvar" + "github.com/icinga/icingadb/configobject/objecttypes/usergroup/usergroupmember" + "github.com/icinga/icingadb/configobject/objecttypes/zone" + "github.com/icinga/icingadb/configobject/statesync" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/ha" + "github.com/icinga/icingadb/jsondecoder" + "github.com/icinga/icingadb/prometheus" + "github.com/icinga/icingadb/supervisor" log "github.com/sirupsen/logrus" "sync" ) diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go index 089aae99..fb759ff7 100644 --- a/supervisor/supervisor.go +++ b/supervisor/supervisor.go @@ -1,8 +1,8 @@ package supervisor import ( - "git.icinga.com/icingadb/icingadb-main/connection" - "git.icinga.com/icingadb/icingadb-main/jsondecoder" + "github.com/icinga/icingadb/connection" + "github.com/icinga/icingadb/jsondecoder" "sync" ) diff --git a/utils/convert.go b/utils/convert.go index 59c82264..49ece2c9 100644 --- a/utils/convert.go +++ b/utils/convert.go @@ -31,13 +31,13 @@ var ( "FlappingEnd": 256, } NotificationTypesToDbEnumString = map[string]string{ - "1": "downtime_start", - "2": "downtime_end", - "4": "downtime_removed", - "8": "custom", - "16": "acknowledgement", - "32": "problem", - "64": "recovery", + "1": "downtime_start", + "2": "downtime_end", + "4": "downtime_removed", + "8": "custom", + "16": "acknowledgement", + "32": "problem", + "64": "recovery", "128": "flapping_start", "256": "flapping_end", }