From 9f8fd87ecab2c60dc861d5bd27a0a1dd46c0bbf9 Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 26 Apr 2018 16:37:59 +0900 Subject: [PATCH] ing --- .../config => config/external}/external.go | 2 +- {external/config => config/external}/grpc.go | 2 +- {external/config => config/external}/kafka.go | 2 +- {external/config => config/external}/redis.go | 2 +- .../config => config/noauthprobe}/auth.go | 2 +- .../constants => config/noauthprobe}/path.go | 2 +- .../noauthprobe}/protocol.go | 2 +- {probe/config => config/probe}/account.go | 2 +- {probe/config => config/probe}/central.go | 2 +- .../constants => config/probe}/container.go | 2 +- {probe/constants => config/probe}/path.go | 2 +- {probe/config => config/probe}/probe.go | 2 +- {probe/constants => config/probe}/protocol.go | 2 +- .../discovery}/DiscoveryHost.go | 2 +- .../discovery}/DiscoveryPort.go | 2 +- .../discovery}/DiscoveryService.go | 2 +- .../discovery}/DiscoveryZone.go | 2 +- {discovery/model => model/discovery}/Host.go | 2 +- {discovery/model => model/discovery}/Port.go | 2 +- .../model => model/discovery}/Service.go | 2 +- {discovery/model => model/discovery}/Zone.go | 2 +- {domain/model => model/domain}/Domain.go | 2 +- .../model => model/domain}/DomainMember.go | 4 ++-- {infra/model => model/infra}/Infra.go | 8 +++---- {infra/model => model/infra}/InfraHost.go | 2 +- {infra/model => model/infra}/InfraMachine.go | 2 +- {infra/model => model/infra}/InfraOS.go | 4 ++-- .../infra}/InfraOSApplication.go | 2 +- {infra/model => model/infra}/InfraOSDaemon.go | 2 +- {infra/model => model/infra}/InfraOSPort.go | 4 ++-- .../infra}/InfraServiceApplication.go | 4 ++-- {member/model => model/member}/Member.go | 4 ++-- {meta/model => model/meta}/MetaContainer.go | 2 +- {meta/model => model/meta}/MetaCrawler.go | 2 +- {meta/model => model/meta}/MetaHistoryType.go | 2 +- {meta/model => model/meta}/MetaInfraType.go | 2 +- {meta/model => model/meta}/MetaInfraVendor.go | 2 +- .../model => model/meta}/MetaMemberStatus.go | 2 +- .../meta}/MetaNoAuthProbeStatus.go | 2 +- {meta/model => model/meta}/MetaProbeStatus.go | 2 +- .../model => model/meta}/MetaProbeTaskType.go | 2 +- .../meta}/MetaSensorDisplayItem.go | 2 +- {meta/model => model/meta}/MetaSensorItem.go | 2 +- .../model => model/meta}/MetaSensorItemKey.go | 2 +- .../meta}/MetaSensorItemType.go | 2 +- .../meta}/MetaSensorItemUnit.go | 2 +- .../model => model/meta}/MetaSensorStatus.go | 2 +- .../noauthprobe}/NoAuthProbe.go | 8 +++---- .../noauthprobe}/NoAuthProbeDescription.go | 2 +- .../NoAuthProbeDescriptionHost.go | 2 +- .../NoAuthProbeDescriptionNetwork.go | 2 +- .../notification}/Notification.go | 4 ++-- {probe/model => model/probe}/Probe.go | 8 +++---- {probe/model => model/probe}/ProbeTask.go | 4 ++-- {sensor/model => model/sensor}/Sensor.go | 6 +++--- {sensor/model => model/sensor}/SensorItem.go | 4 ++-- .../sensor}/SensorItemDependency.go | 4 ++-- .../sensorconfig}/Connection.go | 2 +- .../model => model/sensorconfig}/Crawler.go | 2 +- .../model => model/sensorconfig}/Item.go | 2 +- .../model => model/sensorconfig}/Keys.go | 2 +- .../sensorconfig}/MappingInfo.go | 2 +- .../model => model/sensorconfig}/QueryInfo.go | 2 +- .../model => model/sensorconfig}/ResultSet.go | 2 +- .../sensorconfig}/ResultSetCol.go | 2 +- .../sensorconfig}/ResultSetRow.go | 2 +- .../model => model/sensorconfig}/Schedule.go | 2 +- .../sensorconfig}/SensorConfig.go | 2 +- .../model => model/sensorconfig}/Target.go | 2 +- {target/model => model/target}/Target.go | 2 +- service/container/CrawlerService.go | 6 ++++++ service/container/ProbeService.go | 4 ++++ service/container/SensorConfigService.go | 10 +++++++++ .../container/discovery/DiscoveryService.go | 11 ++++++++++ service/probe/CollectorService.go | 4 ++++ service/probe/ContainerService.go | 4 ++++ service/probe/CrawlerService.go | 4 ++++ service/probe/DataClientService.go | 4 ++++ service/probe/DiscoveryService.go | 21 +++++++++++++++++++ service/probe/SensorConfigService.go | 6 ++++++ 80 files changed, 164 insertions(+), 90 deletions(-) rename {external/config => config/external}/external.go (89%) rename {external/config => config/external}/grpc.go (86%) rename {external/config => config/external}/kafka.go (86%) rename {external/config => config/external}/redis.go (86%) rename {noauthprobe/config => config/noauthprobe}/auth.go (96%) rename {noauthprobe/constants => config/noauthprobe}/path.go (67%) rename {noauthprobe/constants => config/noauthprobe}/protocol.go (96%) rename {probe/config => config/probe}/account.go (90%) rename {probe/config => config/probe}/central.go (95%) rename {probe/constants => config/probe}/container.go (98%) rename {probe/constants => config/probe}/path.go (91%) rename {probe/config => config/probe}/probe.go (95%) rename {probe/constants => config/probe}/protocol.go (95%) rename {discovery/model => model/discovery}/DiscoveryHost.go (94%) rename {discovery/model => model/discovery}/DiscoveryPort.go (97%) rename {discovery/model => model/discovery}/DiscoveryService.go (84%) rename {discovery/model => model/discovery}/DiscoveryZone.go (89%) rename {discovery/model => model/discovery}/Host.go (95%) rename {discovery/model => model/discovery}/Port.go (96%) rename {discovery/model => model/discovery}/Service.go (96%) rename {discovery/model => model/discovery}/Zone.go (96%) rename {domain/model => model/domain}/Domain.go (94%) rename {domain/model => model/domain}/DomainMember.go (81%) rename {infra/model => model/infra}/Infra.go (69%) rename {infra/model => model/infra}/InfraHost.go (95%) rename {infra/model => model/infra}/InfraMachine.go (93%) rename {infra/model => model/infra}/InfraOS.go (83%) rename {infra/model => model/infra}/InfraOSApplication.go (94%) rename {infra/model => model/infra}/InfraOSDaemon.go (94%) rename {infra/model => model/infra}/InfraOSPort.go (88%) rename {infra/model => model/infra}/InfraServiceApplication.go (88%) rename {member/model => model/member}/Member.go (91%) rename {meta/model => model/meta}/MetaContainer.go (95%) rename {meta/model => model/meta}/MetaCrawler.go (96%) rename {meta/model => model/meta}/MetaHistoryType.go (95%) rename {meta/model => model/meta}/MetaInfraType.go (95%) rename {meta/model => model/meta}/MetaInfraVendor.go (95%) rename {meta/model => model/meta}/MetaMemberStatus.go (91%) rename {meta/model => model/meta}/MetaNoAuthProbeStatus.go (91%) rename {meta/model => model/meta}/MetaProbeStatus.go (91%) rename {meta/model => model/meta}/MetaProbeTaskType.go (96%) rename {meta/model => model/meta}/MetaSensorDisplayItem.go (97%) rename {meta/model => model/meta}/MetaSensorItem.go (96%) rename {meta/model => model/meta}/MetaSensorItemKey.go (97%) rename {meta/model => model/meta}/MetaSensorItemType.go (96%) rename {meta/model => model/meta}/MetaSensorItemUnit.go (95%) rename {meta/model => model/meta}/MetaSensorStatus.go (91%) rename {noauthprobe/model => model/noauthprobe}/NoAuthProbe.go (78%) rename {noauthprobe/model => model/noauthprobe}/NoAuthProbeDescription.go (89%) rename {noauthprobe/model => model/noauthprobe}/NoAuthProbeDescriptionHost.go (95%) rename {noauthprobe/model => model/noauthprobe}/NoAuthProbeDescriptionNetwork.go (92%) rename {notification/model => model/notification}/Notification.go (87%) rename {probe/model => model/probe}/Probe.go (83%) rename {probe/model => model/probe}/ProbeTask.go (91%) rename {sensor/model => model/sensor}/Sensor.go (82%) rename {sensor/model => model/sensor}/SensorItem.go (84%) rename {sensor/model => model/sensor}/SensorItemDependency.go (80%) rename {sensorconfig/model => model/sensorconfig}/Connection.go (92%) rename {sensorconfig/model => model/sensorconfig}/Crawler.go (84%) rename {sensorconfig/model => model/sensorconfig}/Item.go (89%) rename {sensorconfig/model => model/sensorconfig}/Keys.go (92%) rename {sensorconfig/model => model/sensorconfig}/MappingInfo.go (92%) rename {sensorconfig/model => model/sensorconfig}/QueryInfo.go (86%) rename {sensorconfig/model => model/sensorconfig}/ResultSet.go (97%) rename {sensorconfig/model => model/sensorconfig}/ResultSetCol.go (98%) rename {sensorconfig/model => model/sensorconfig}/ResultSetRow.go (98%) rename {sensorconfig/model => model/sensorconfig}/Schedule.go (77%) rename {sensorconfig/model => model/sensorconfig}/SensorConfig.go (94%) rename {sensorconfig/model => model/sensorconfig}/Target.go (87%) rename {target/model => model/target}/Target.go (95%) create mode 100644 service/container/CrawlerService.go create mode 100644 service/container/ProbeService.go create mode 100644 service/container/SensorConfigService.go create mode 100644 service/container/discovery/DiscoveryService.go create mode 100644 service/probe/CollectorService.go create mode 100644 service/probe/ContainerService.go create mode 100644 service/probe/CrawlerService.go create mode 100644 service/probe/DataClientService.go create mode 100644 service/probe/DiscoveryService.go create mode 100644 service/probe/SensorConfigService.go diff --git a/external/config/external.go b/config/external/external.go similarity index 89% rename from external/config/external.go rename to config/external/external.go index 7e35f96..79ca44c 100644 --- a/external/config/external.go +++ b/config/external/external.go @@ -1,4 +1,4 @@ -package config +package external type External struct { GRPC *GRPC `json:"grpc,omitempty"` diff --git a/external/config/grpc.go b/config/external/grpc.go similarity index 86% rename from external/config/grpc.go rename to config/external/grpc.go index dd03615..1e490b6 100644 --- a/external/config/grpc.go +++ b/config/external/grpc.go @@ -1,4 +1,4 @@ -package config +package external type GRPC struct { Network string `json:"network,omitempty"` diff --git a/external/config/kafka.go b/config/external/kafka.go similarity index 86% rename from external/config/kafka.go rename to config/external/kafka.go index 6e7a698..53fa7fb 100644 --- a/external/config/kafka.go +++ b/config/external/kafka.go @@ -1,4 +1,4 @@ -package config +package external type Kafka struct { Network string `json:"network,omitempty"` diff --git a/external/config/redis.go b/config/external/redis.go similarity index 86% rename from external/config/redis.go rename to config/external/redis.go index 21eeb97..43d1875 100644 --- a/external/config/redis.go +++ b/config/external/redis.go @@ -1,4 +1,4 @@ -package config +package external type Redis struct { Network string `json:"network,omitempty"` diff --git a/noauthprobe/config/auth.go b/config/noauthprobe/auth.go similarity index 96% rename from noauthprobe/config/auth.go rename to config/noauthprobe/auth.go index f5d86ad..e6b36ff 100644 --- a/noauthprobe/config/auth.go +++ b/config/noauthprobe/auth.go @@ -1,4 +1,4 @@ -package config +package noauthprobe import "time" diff --git a/noauthprobe/constants/path.go b/config/noauthprobe/path.go similarity index 67% rename from noauthprobe/constants/path.go rename to config/noauthprobe/path.go index 9a2bb43..7fa8145 100644 --- a/noauthprobe/constants/path.go +++ b/config/noauthprobe/path.go @@ -1,4 +1,4 @@ -package constants +package noauthprobe const ( ConfigFileName = "auth.json" diff --git a/noauthprobe/constants/protocol.go b/config/noauthprobe/protocol.go similarity index 96% rename from noauthprobe/constants/protocol.go rename to config/noauthprobe/protocol.go index bcd3fc6..97fb868 100644 --- a/noauthprobe/constants/protocol.go +++ b/config/noauthprobe/protocol.go @@ -1,4 +1,4 @@ -package constants +package noauthprobe const ( HTTPEntry_Auth = "/auth" diff --git a/probe/config/account.go b/config/probe/account.go similarity index 90% rename from probe/config/account.go rename to config/probe/account.go index 205649a..9751af0 100644 --- a/probe/config/account.go +++ b/config/probe/account.go @@ -1,4 +1,4 @@ -package config +package probe type Account struct { Name string `required:"true" json:"name,omitempty"` diff --git a/probe/config/central.go b/config/probe/central.go similarity index 95% rename from probe/config/central.go rename to config/probe/central.go index cfe6d2f..064cd07 100644 --- a/probe/config/central.go +++ b/config/probe/central.go @@ -1,4 +1,4 @@ -package config +package probe import ( csswc "git.loafle.net/commons/server-go/socket/web/client" diff --git a/probe/constants/container.go b/config/probe/container.go similarity index 98% rename from probe/constants/container.go rename to config/probe/container.go index 3489687..4887555 100644 --- a/probe/constants/container.go +++ b/config/probe/container.go @@ -1,4 +1,4 @@ -package constants +package probe import ( "encoding/json" diff --git a/probe/constants/path.go b/config/probe/path.go similarity index 91% rename from probe/constants/path.go rename to config/probe/path.go index 2fef12d..506200f 100644 --- a/probe/constants/path.go +++ b/config/probe/path.go @@ -1,4 +1,4 @@ -package constants +package probe const ( ConfigFileName = "config.json" diff --git a/probe/config/probe.go b/config/probe/probe.go similarity index 95% rename from probe/config/probe.go rename to config/probe/probe.go index a0a5d35..dd11d6b 100644 --- a/probe/config/probe.go +++ b/config/probe/probe.go @@ -1,4 +1,4 @@ -package config +package probe type ProbeStateType int diff --git a/probe/constants/protocol.go b/config/probe/protocol.go similarity index 95% rename from probe/constants/protocol.go rename to config/probe/protocol.go index 8165a29..ee652ff 100644 --- a/probe/constants/protocol.go +++ b/config/probe/protocol.go @@ -1,4 +1,4 @@ -package constants +package probe const ( HTTPEntry_Probe = "/probe" diff --git a/discovery/model/DiscoveryHost.go b/model/discovery/DiscoveryHost.go similarity index 94% rename from discovery/model/DiscoveryHost.go rename to model/discovery/DiscoveryHost.go index 691b419..2bc62de 100644 --- a/discovery/model/DiscoveryHost.go +++ b/model/discovery/DiscoveryHost.go @@ -1,4 +1,4 @@ -package model +package discovery type DiscoveryHost struct { FirstScanRange string `json:"firstScanRange,omitempty"` diff --git a/discovery/model/DiscoveryPort.go b/model/discovery/DiscoveryPort.go similarity index 97% rename from discovery/model/DiscoveryPort.go rename to model/discovery/DiscoveryPort.go index 1368116..395cf03 100644 --- a/discovery/model/DiscoveryPort.go +++ b/model/discovery/DiscoveryPort.go @@ -1,4 +1,4 @@ -package model +package discovery type DiscoveryPort struct { FirstScanRange int `json:"firstScanRange,omitempty"` diff --git a/discovery/model/DiscoveryService.go b/model/discovery/DiscoveryService.go similarity index 84% rename from discovery/model/DiscoveryService.go rename to model/discovery/DiscoveryService.go index e518e8e..239d3fa 100644 --- a/discovery/model/DiscoveryService.go +++ b/model/discovery/DiscoveryService.go @@ -1,4 +1,4 @@ -package model +package discovery type DiscoveryService struct { IncludeServices []string `json:"includeServices,omitempty"` diff --git a/discovery/model/DiscoveryZone.go b/model/discovery/DiscoveryZone.go similarity index 89% rename from discovery/model/DiscoveryZone.go rename to model/discovery/DiscoveryZone.go index 90b8bac..dd9dce6 100644 --- a/discovery/model/DiscoveryZone.go +++ b/model/discovery/DiscoveryZone.go @@ -1,4 +1,4 @@ -package model +package discovery type DiscoveryZone struct { ExcludePatterns []string `json:"excludePatterns,omitempty"` diff --git a/discovery/model/Host.go b/model/discovery/Host.go similarity index 95% rename from discovery/model/Host.go rename to model/discovery/Host.go index e6f1d53..676a164 100644 --- a/discovery/model/Host.go +++ b/model/discovery/Host.go @@ -1,4 +1,4 @@ -package model +package discovery import ( "encoding/json" diff --git a/discovery/model/Port.go b/model/discovery/Port.go similarity index 96% rename from discovery/model/Port.go rename to model/discovery/Port.go index 2ae3097..28ac1cb 100644 --- a/discovery/model/Port.go +++ b/model/discovery/Port.go @@ -1,4 +1,4 @@ -package model +package discovery import ( "encoding/json" diff --git a/discovery/model/Service.go b/model/discovery/Service.go similarity index 96% rename from discovery/model/Service.go rename to model/discovery/Service.go index 08a4b07..5465e9c 100644 --- a/discovery/model/Service.go +++ b/model/discovery/Service.go @@ -1,4 +1,4 @@ -package model +package discovery import ( "encoding/json" diff --git a/discovery/model/Zone.go b/model/discovery/Zone.go similarity index 96% rename from discovery/model/Zone.go rename to model/discovery/Zone.go index 13b8b4a..e37f2ce 100644 --- a/discovery/model/Zone.go +++ b/model/discovery/Zone.go @@ -1,4 +1,4 @@ -package model +package discovery import ( "encoding/json" diff --git a/domain/model/Domain.go b/model/domain/Domain.go similarity index 94% rename from domain/model/Domain.go rename to model/domain/Domain.go index 7377532..a58526b 100644 --- a/domain/model/Domain.go +++ b/model/domain/Domain.go @@ -1,4 +1,4 @@ -package model +package domain import ( "encoding/json" diff --git a/domain/model/DomainMember.go b/model/domain/DomainMember.go similarity index 81% rename from domain/model/DomainMember.go rename to model/domain/DomainMember.go index c71124f..379a575 100644 --- a/domain/model/DomainMember.go +++ b/model/domain/DomainMember.go @@ -1,10 +1,10 @@ -package model +package domain import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - member "git.loafle.net/overflow/commons-go/member/model" + "git.loafle.net/overflow/commons-go/model/member" ) type DomainMember struct { diff --git a/infra/model/Infra.go b/model/infra/Infra.go similarity index 69% rename from infra/model/Infra.go rename to model/infra/Infra.go index c3db4ea..05c9348 100644 --- a/infra/model/Infra.go +++ b/model/infra/Infra.go @@ -1,12 +1,12 @@ -package model +package infra import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" - probe "git.loafle.net/overflow/commons-go/probe/model" - target "git.loafle.net/overflow/commons-go/target/model" + "git.loafle.net/overflow/commons-go/model/meta" + "git.loafle.net/overflow/commons-go/model/probe" + "git.loafle.net/overflow/commons-go/model/target" ) type Infra struct { diff --git a/infra/model/InfraHost.go b/model/infra/InfraHost.go similarity index 95% rename from infra/model/InfraHost.go rename to model/infra/InfraHost.go index 7ee3a57..485a954 100644 --- a/infra/model/InfraHost.go +++ b/model/infra/InfraHost.go @@ -1,4 +1,4 @@ -package model +package infra import ( "encoding/json" diff --git a/infra/model/InfraMachine.go b/model/infra/InfraMachine.go similarity index 93% rename from infra/model/InfraMachine.go rename to model/infra/InfraMachine.go index 312ea7d..c72ca93 100644 --- a/infra/model/InfraMachine.go +++ b/model/infra/InfraMachine.go @@ -1,4 +1,4 @@ -package model +package infra import "git.loafle.net/overflow/commons-go/core/util" diff --git a/infra/model/InfraOS.go b/model/infra/InfraOS.go similarity index 83% rename from infra/model/InfraOS.go rename to model/infra/InfraOS.go index db45cec..7623b43 100644 --- a/infra/model/InfraOS.go +++ b/model/infra/InfraOS.go @@ -1,8 +1,8 @@ -package model +package infra import ( "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type InfraOS struct { diff --git a/infra/model/InfraOSApplication.go b/model/infra/InfraOSApplication.go similarity index 94% rename from infra/model/InfraOSApplication.go rename to model/infra/InfraOSApplication.go index 60b4e7d..38ccb1d 100644 --- a/infra/model/InfraOSApplication.go +++ b/model/infra/InfraOSApplication.go @@ -1,4 +1,4 @@ -package model +package infra import "git.loafle.net/overflow/commons-go/core/util" diff --git a/infra/model/InfraOSDaemon.go b/model/infra/InfraOSDaemon.go similarity index 94% rename from infra/model/InfraOSDaemon.go rename to model/infra/InfraOSDaemon.go index 84b9e75..9acaf12 100644 --- a/infra/model/InfraOSDaemon.go +++ b/model/infra/InfraOSDaemon.go @@ -1,4 +1,4 @@ -package model +package infra import ( "git.loafle.net/overflow/commons-go/core/util" diff --git a/infra/model/InfraOSPort.go b/model/infra/InfraOSPort.go similarity index 88% rename from infra/model/InfraOSPort.go rename to model/infra/InfraOSPort.go index f84eb5d..9c32ae1 100644 --- a/infra/model/InfraOSPort.go +++ b/model/infra/InfraOSPort.go @@ -1,10 +1,10 @@ -package model +package infra import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type InfraOSPort struct { diff --git a/infra/model/InfraServiceApplication.go b/model/infra/InfraServiceApplication.go similarity index 88% rename from infra/model/InfraServiceApplication.go rename to model/infra/InfraServiceApplication.go index 92f46eb..c104e7c 100644 --- a/infra/model/InfraServiceApplication.go +++ b/model/infra/InfraServiceApplication.go @@ -1,10 +1,10 @@ -package model +package infra import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type InfraServiceApplication struct { diff --git a/member/model/Member.go b/model/member/Member.go similarity index 91% rename from member/model/Member.go rename to model/member/Member.go index 3856f25..24ef033 100644 --- a/member/model/Member.go +++ b/model/member/Member.go @@ -1,10 +1,10 @@ -package model +package member import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type Member struct { diff --git a/meta/model/MetaContainer.go b/model/meta/MetaContainer.go similarity index 95% rename from meta/model/MetaContainer.go rename to model/meta/MetaContainer.go index f0aefbf..bbcbe14 100644 --- a/meta/model/MetaContainer.go +++ b/model/meta/MetaContainer.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaCrawler.go b/model/meta/MetaCrawler.go similarity index 96% rename from meta/model/MetaCrawler.go rename to model/meta/MetaCrawler.go index d3742ba..2f57395 100644 --- a/meta/model/MetaCrawler.go +++ b/model/meta/MetaCrawler.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaHistoryType.go b/model/meta/MetaHistoryType.go similarity index 95% rename from meta/model/MetaHistoryType.go rename to model/meta/MetaHistoryType.go index 04bc56b..b000282 100644 --- a/meta/model/MetaHistoryType.go +++ b/model/meta/MetaHistoryType.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaInfraType.go b/model/meta/MetaInfraType.go similarity index 95% rename from meta/model/MetaInfraType.go rename to model/meta/MetaInfraType.go index 8655349..99ac0d1 100644 --- a/meta/model/MetaInfraType.go +++ b/model/meta/MetaInfraType.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaInfraVendor.go b/model/meta/MetaInfraVendor.go similarity index 95% rename from meta/model/MetaInfraVendor.go rename to model/meta/MetaInfraVendor.go index 135b8ae..cbbc554 100644 --- a/meta/model/MetaInfraVendor.go +++ b/model/meta/MetaInfraVendor.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaMemberStatus.go b/model/meta/MetaMemberStatus.go similarity index 91% rename from meta/model/MetaMemberStatus.go rename to model/meta/MetaMemberStatus.go index 72abe0a..7687c4f 100644 --- a/meta/model/MetaMemberStatus.go +++ b/model/meta/MetaMemberStatus.go @@ -1,4 +1,4 @@ -package model +package meta import "encoding/json" diff --git a/meta/model/MetaNoAuthProbeStatus.go b/model/meta/MetaNoAuthProbeStatus.go similarity index 91% rename from meta/model/MetaNoAuthProbeStatus.go rename to model/meta/MetaNoAuthProbeStatus.go index fdff9a4..1a9264d 100644 --- a/meta/model/MetaNoAuthProbeStatus.go +++ b/model/meta/MetaNoAuthProbeStatus.go @@ -1,4 +1,4 @@ -package model +package meta import "encoding/json" diff --git a/meta/model/MetaProbeStatus.go b/model/meta/MetaProbeStatus.go similarity index 91% rename from meta/model/MetaProbeStatus.go rename to model/meta/MetaProbeStatus.go index 3135543..34b5c94 100644 --- a/meta/model/MetaProbeStatus.go +++ b/model/meta/MetaProbeStatus.go @@ -1,4 +1,4 @@ -package model +package meta import "encoding/json" diff --git a/meta/model/MetaProbeTaskType.go b/model/meta/MetaProbeTaskType.go similarity index 96% rename from meta/model/MetaProbeTaskType.go rename to model/meta/MetaProbeTaskType.go index d0e9f69..f880a80 100644 --- a/meta/model/MetaProbeTaskType.go +++ b/model/meta/MetaProbeTaskType.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorDisplayItem.go b/model/meta/MetaSensorDisplayItem.go similarity index 97% rename from meta/model/MetaSensorDisplayItem.go rename to model/meta/MetaSensorDisplayItem.go index 7f6f243..332a098 100644 --- a/meta/model/MetaSensorDisplayItem.go +++ b/model/meta/MetaSensorDisplayItem.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorItem.go b/model/meta/MetaSensorItem.go similarity index 96% rename from meta/model/MetaSensorItem.go rename to model/meta/MetaSensorItem.go index 2777e19..8d9645b 100644 --- a/meta/model/MetaSensorItem.go +++ b/model/meta/MetaSensorItem.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorItemKey.go b/model/meta/MetaSensorItemKey.go similarity index 97% rename from meta/model/MetaSensorItemKey.go rename to model/meta/MetaSensorItemKey.go index e14de82..2c3621d 100644 --- a/meta/model/MetaSensorItemKey.go +++ b/model/meta/MetaSensorItemKey.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorItemType.go b/model/meta/MetaSensorItemType.go similarity index 96% rename from meta/model/MetaSensorItemType.go rename to model/meta/MetaSensorItemType.go index 5e134a3..cad0a70 100644 --- a/meta/model/MetaSensorItemType.go +++ b/model/meta/MetaSensorItemType.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorItemUnit.go b/model/meta/MetaSensorItemUnit.go similarity index 95% rename from meta/model/MetaSensorItemUnit.go rename to model/meta/MetaSensorItemUnit.go index b636d73..9529a16 100644 --- a/meta/model/MetaSensorItemUnit.go +++ b/model/meta/MetaSensorItemUnit.go @@ -1,4 +1,4 @@ -package model +package meta import ( "encoding/json" diff --git a/meta/model/MetaSensorStatus.go b/model/meta/MetaSensorStatus.go similarity index 91% rename from meta/model/MetaSensorStatus.go rename to model/meta/MetaSensorStatus.go index 7678e18..62598c8 100644 --- a/meta/model/MetaSensorStatus.go +++ b/model/meta/MetaSensorStatus.go @@ -1,4 +1,4 @@ -package model +package meta import "encoding/json" diff --git a/noauthprobe/model/NoAuthProbe.go b/model/noauthprobe/NoAuthProbe.go similarity index 78% rename from noauthprobe/model/NoAuthProbe.go rename to model/noauthprobe/NoAuthProbe.go index c5ddc1e..2df666c 100644 --- a/noauthprobe/model/NoAuthProbe.go +++ b/model/noauthprobe/NoAuthProbe.go @@ -1,12 +1,12 @@ -package model +package noauthprobe import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - domain "git.loafle.net/overflow/commons-go/domain/model" - meta "git.loafle.net/overflow/commons-go/meta/model" - probe "git.loafle.net/overflow/commons-go/probe/model" + "git.loafle.net/overflow/commons-go/model/domain" + "git.loafle.net/overflow/commons-go/model/meta" + "git.loafle.net/overflow/commons-go/model/probe" ) type NoAuthProbe struct { diff --git a/noauthprobe/model/NoAuthProbeDescription.go b/model/noauthprobe/NoAuthProbeDescription.go similarity index 89% rename from noauthprobe/model/NoAuthProbeDescription.go rename to model/noauthprobe/NoAuthProbeDescription.go index 5196ca7..6727de7 100644 --- a/noauthprobe/model/NoAuthProbeDescription.go +++ b/model/noauthprobe/NoAuthProbeDescription.go @@ -1,4 +1,4 @@ -package model +package noauthprobe type NoAuthProbeDescription struct { Host *NoAuthProbeDescriptionHost `json:"host,omitempty"` diff --git a/noauthprobe/model/NoAuthProbeDescriptionHost.go b/model/noauthprobe/NoAuthProbeDescriptionHost.go similarity index 95% rename from noauthprobe/model/NoAuthProbeDescriptionHost.go rename to model/noauthprobe/NoAuthProbeDescriptionHost.go index f84177f..67d6b6d 100644 --- a/noauthprobe/model/NoAuthProbeDescriptionHost.go +++ b/model/noauthprobe/NoAuthProbeDescriptionHost.go @@ -1,4 +1,4 @@ -package model +package noauthprobe type NoAuthProbeDescriptionHost struct { Name string `json:"name,omitempty"` diff --git a/noauthprobe/model/NoAuthProbeDescriptionNetwork.go b/model/noauthprobe/NoAuthProbeDescriptionNetwork.go similarity index 92% rename from noauthprobe/model/NoAuthProbeDescriptionNetwork.go rename to model/noauthprobe/NoAuthProbeDescriptionNetwork.go index 6563f16..68a4bcc 100644 --- a/noauthprobe/model/NoAuthProbeDescriptionNetwork.go +++ b/model/noauthprobe/NoAuthProbeDescriptionNetwork.go @@ -1,4 +1,4 @@ -package model +package noauthprobe type NoAuthProbeDescriptionNetwork struct { Name string `json:"name,omitempty"` diff --git a/notification/model/Notification.go b/model/notification/Notification.go similarity index 87% rename from notification/model/Notification.go rename to model/notification/Notification.go index 0e8b906..d233aec 100644 --- a/notification/model/Notification.go +++ b/model/notification/Notification.go @@ -1,10 +1,10 @@ -package model +package notification import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - member "git.loafle.net/overflow/commons-go/member/model" + "git.loafle.net/overflow/commons-go/model/member" ) type Notification struct { diff --git a/probe/model/Probe.go b/model/probe/Probe.go similarity index 83% rename from probe/model/Probe.go rename to model/probe/Probe.go index 6989be2..7c75ccb 100644 --- a/probe/model/Probe.go +++ b/model/probe/Probe.go @@ -1,12 +1,12 @@ -package model +package probe import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - domain "git.loafle.net/overflow/commons-go/domain/model" - member "git.loafle.net/overflow/commons-go/member/model" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/domain" + "git.loafle.net/overflow/commons-go/model/member" + "git.loafle.net/overflow/commons-go/model/meta" ) type Probe struct { diff --git a/probe/model/ProbeTask.go b/model/probe/ProbeTask.go similarity index 91% rename from probe/model/ProbeTask.go rename to model/probe/ProbeTask.go index e68d83e..a95f42f 100644 --- a/probe/model/ProbeTask.go +++ b/model/probe/ProbeTask.go @@ -1,10 +1,10 @@ -package model +package probe import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type ProbeTask struct { diff --git a/sensor/model/Sensor.go b/model/sensor/Sensor.go similarity index 82% rename from sensor/model/Sensor.go rename to model/sensor/Sensor.go index 3dc9fae..c11e9fb 100644 --- a/sensor/model/Sensor.go +++ b/model/sensor/Sensor.go @@ -1,11 +1,11 @@ -package model +package sensor import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" - target "git.loafle.net/overflow/commons-go/target/model" + "git.loafle.net/overflow/commons-go/model/meta" + "git.loafle.net/overflow/commons-go/model/target" ) type Sensor struct { diff --git a/sensor/model/SensorItem.go b/model/sensor/SensorItem.go similarity index 84% rename from sensor/model/SensorItem.go rename to model/sensor/SensorItem.go index 898fb16..a140389 100644 --- a/sensor/model/SensorItem.go +++ b/model/sensor/SensorItem.go @@ -1,10 +1,10 @@ -package model +package sensor import ( "encoding/json" "git.loafle.net/overflow/commons-go/core/util" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type SensorItem struct { diff --git a/sensor/model/SensorItemDependency.go b/model/sensor/SensorItemDependency.go similarity index 80% rename from sensor/model/SensorItemDependency.go rename to model/sensor/SensorItemDependency.go index 1cfd9b2..a935300 100644 --- a/sensor/model/SensorItemDependency.go +++ b/model/sensor/SensorItemDependency.go @@ -1,9 +1,9 @@ -package model +package sensor import ( "encoding/json" - meta "git.loafle.net/overflow/commons-go/meta/model" + "git.loafle.net/overflow/commons-go/model/meta" ) type SensorItemDependency struct { diff --git a/sensorconfig/model/Connection.go b/model/sensorconfig/Connection.go similarity index 92% rename from sensorconfig/model/Connection.go rename to model/sensorconfig/Connection.go index df342d4..67f2fe9 100644 --- a/sensorconfig/model/Connection.go +++ b/model/sensorconfig/Connection.go @@ -1,4 +1,4 @@ -package model +package sensorconfig import "encoding/json" diff --git a/sensorconfig/model/Crawler.go b/model/sensorconfig/Crawler.go similarity index 84% rename from sensorconfig/model/Crawler.go rename to model/sensorconfig/Crawler.go index 1da5fd7..49c1d59 100644 --- a/sensorconfig/model/Crawler.go +++ b/model/sensorconfig/Crawler.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type Crawler struct { Name string `json:"name,omitempty"` diff --git a/sensorconfig/model/Item.go b/model/sensorconfig/Item.go similarity index 89% rename from sensorconfig/model/Item.go rename to model/sensorconfig/Item.go index d2dc88c..5bfb7bc 100644 --- a/sensorconfig/model/Item.go +++ b/model/sensorconfig/Item.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type Item struct { Keys []Keys `json:"keys,omitempty"` diff --git a/sensorconfig/model/Keys.go b/model/sensorconfig/Keys.go similarity index 92% rename from sensorconfig/model/Keys.go rename to model/sensorconfig/Keys.go index 7a1ad70..675a22e 100644 --- a/sensorconfig/model/Keys.go +++ b/model/sensorconfig/Keys.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type Keys struct { Metric string `json:"metric,omitempty"` diff --git a/sensorconfig/model/MappingInfo.go b/model/sensorconfig/MappingInfo.go similarity index 92% rename from sensorconfig/model/MappingInfo.go rename to model/sensorconfig/MappingInfo.go index f3b535b..4cbf76c 100644 --- a/sensorconfig/model/MappingInfo.go +++ b/model/sensorconfig/MappingInfo.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type MappingInfo struct { ParseDirection string `json:"parseDirection,omitempty"` diff --git a/sensorconfig/model/QueryInfo.go b/model/sensorconfig/QueryInfo.go similarity index 86% rename from sensorconfig/model/QueryInfo.go rename to model/sensorconfig/QueryInfo.go index 0a0a257..c78a85d 100644 --- a/sensorconfig/model/QueryInfo.go +++ b/model/sensorconfig/QueryInfo.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type QueryInfo struct { Query string `json:"query,omitempty"` diff --git a/sensorconfig/model/ResultSet.go b/model/sensorconfig/ResultSet.go similarity index 97% rename from sensorconfig/model/ResultSet.go rename to model/sensorconfig/ResultSet.go index f5da3ee..c51e487 100644 --- a/sensorconfig/model/ResultSet.go +++ b/model/sensorconfig/ResultSet.go @@ -1,4 +1,4 @@ -package model +package sensorconfig import "encoding/json" diff --git a/sensorconfig/model/ResultSetCol.go b/model/sensorconfig/ResultSetCol.go similarity index 98% rename from sensorconfig/model/ResultSetCol.go rename to model/sensorconfig/ResultSetCol.go index c165093..fbe154a 100644 --- a/sensorconfig/model/ResultSetCol.go +++ b/model/sensorconfig/ResultSetCol.go @@ -1,4 +1,4 @@ -package model +package sensorconfig import ( "encoding/json" diff --git a/sensorconfig/model/ResultSetRow.go b/model/sensorconfig/ResultSetRow.go similarity index 98% rename from sensorconfig/model/ResultSetRow.go rename to model/sensorconfig/ResultSetRow.go index c8555bd..512403a 100644 --- a/sensorconfig/model/ResultSetRow.go +++ b/model/sensorconfig/ResultSetRow.go @@ -1,4 +1,4 @@ -package model +package sensorconfig import ( "encoding/json" diff --git a/sensorconfig/model/Schedule.go b/model/sensorconfig/Schedule.go similarity index 77% rename from sensorconfig/model/Schedule.go rename to model/sensorconfig/Schedule.go index 6d6c3b3..ace18aa 100644 --- a/sensorconfig/model/Schedule.go +++ b/model/sensorconfig/Schedule.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type Schedule struct { Interval string `json:"interval,omitempty"` diff --git a/sensorconfig/model/SensorConfig.go b/model/sensorconfig/SensorConfig.go similarity index 94% rename from sensorconfig/model/SensorConfig.go rename to model/sensorconfig/SensorConfig.go index 45d5dd4..119ddbc 100644 --- a/sensorconfig/model/SensorConfig.go +++ b/model/sensorconfig/SensorConfig.go @@ -1,4 +1,4 @@ -package model +package sensorconfig import "encoding/json" diff --git a/sensorconfig/model/Target.go b/model/sensorconfig/Target.go similarity index 87% rename from sensorconfig/model/Target.go rename to model/sensorconfig/Target.go index b9dcdfb..e21ee7f 100644 --- a/sensorconfig/model/Target.go +++ b/model/sensorconfig/Target.go @@ -1,4 +1,4 @@ -package model +package sensorconfig type Target struct { Auth map[string]interface{} `json:"auth,omitempty"` diff --git a/target/model/Target.go b/model/target/Target.go similarity index 95% rename from target/model/Target.go rename to model/target/Target.go index fa0d433..0ba1de2 100644 --- a/target/model/Target.go +++ b/model/target/Target.go @@ -1,4 +1,4 @@ -package model +package target import ( "encoding/json" diff --git a/service/container/CrawlerService.go b/service/container/CrawlerService.go new file mode 100644 index 0000000..00e2b3e --- /dev/null +++ b/service/container/CrawlerService.go @@ -0,0 +1,6 @@ +package container + +type CrawlerService interface { + Auth(crawlerName string, auth map[string]interface{}) error + Get(sensorConfigID string) (map[string]string, error) +} diff --git a/service/container/ProbeService.go b/service/container/ProbeService.go new file mode 100644 index 0000000..30d4abd --- /dev/null +++ b/service/container/ProbeService.go @@ -0,0 +1,4 @@ +package container + +type ProbeService interface { +} diff --git a/service/container/SensorConfigService.go b/service/container/SensorConfigService.go new file mode 100644 index 0000000..1165157 --- /dev/null +++ b/service/container/SensorConfigService.go @@ -0,0 +1,10 @@ +package container + +import "git.loafle.net/overflow/commons-go/model/sensorconfig" + +type SensorConfigService interface { + InitConfig(sensorConfigs []*sensorconfig.SensorConfig) error + AddConfig(sensorConfig *sensorconfig.SensorConfig) error + UpdateConfig(sensorConfig *sensorconfig.SensorConfig) error + RemoveConfig(sensorConfigID string) error +} diff --git a/service/container/discovery/DiscoveryService.go b/service/container/discovery/DiscoveryService.go new file mode 100644 index 0000000..854755d --- /dev/null +++ b/service/container/discovery/DiscoveryService.go @@ -0,0 +1,11 @@ +package discovery + +import "git.loafle.net/overflow/commons-go/model/discovery" + +type DiscoveryService interface { + DiscoverZone(requesterID string, dz *discovery.DiscoveryZone) error + DiscoverHost(requesterID string, zone *discovery.Zone, dh *discovery.DiscoveryHost) error + DiscoverPort(requesterID string, host *discovery.Host, dp *discovery.DiscoveryPort) error + DiscoverService(requesterID string, port *discovery.Port, ds *discovery.DiscoveryService) error + StopRequest(requesterID string) error +} diff --git a/service/probe/CollectorService.go b/service/probe/CollectorService.go new file mode 100644 index 0000000..4bd45a3 --- /dev/null +++ b/service/probe/CollectorService.go @@ -0,0 +1,4 @@ +package probe + +type CollectorService interface { +} diff --git a/service/probe/ContainerService.go b/service/probe/ContainerService.go new file mode 100644 index 0000000..a3c9ca6 --- /dev/null +++ b/service/probe/ContainerService.go @@ -0,0 +1,4 @@ +package probe + +type ContainerService interface { +} diff --git a/service/probe/CrawlerService.go b/service/probe/CrawlerService.go new file mode 100644 index 0000000..5bafce0 --- /dev/null +++ b/service/probe/CrawlerService.go @@ -0,0 +1,4 @@ +package probe + +type CrawlerService interface { +} diff --git a/service/probe/DataClientService.go b/service/probe/DataClientService.go new file mode 100644 index 0000000..558e132 --- /dev/null +++ b/service/probe/DataClientService.go @@ -0,0 +1,4 @@ +package probe + +type DataClientService interface { +} diff --git a/service/probe/DiscoveryService.go b/service/probe/DiscoveryService.go new file mode 100644 index 0000000..e08dc67 --- /dev/null +++ b/service/probe/DiscoveryService.go @@ -0,0 +1,21 @@ +package probe + +import ( + "git.loafle.net/overflow/commons-go/core/util" + "git.loafle.net/overflow/commons-go/model/discovery" +) + +type DiscoveryService interface { + // By Central + DiscoverZone(requesterID string, dz *discovery.DiscoveryZone) error + DiscoverHost(requesterID string, zone *discovery.Zone, dh *discovery.DiscoveryHost) error + DiscoverPort(requesterID string, host *discovery.Host, dp *discovery.DiscoveryPort) error + DiscoverService(requesterID string, port *discovery.Port, dService *discovery.DiscoveryService) error + // By Container + DiscoveryStart(requesterID string, t *util.Timestamp) error + DiscoveryStop(requesterID string, t *util.Timestamp) error + DiscoveredZone(requesterID string, zone *discovery.Zone) error + DiscoveredHost(requesterID string, host *discovery.Host) error + DiscoveredPort(requesterID string, port *discovery.Port) error + DiscoveredService(requesterID string, service *discovery.Service) error +} diff --git a/service/probe/SensorConfigService.go b/service/probe/SensorConfigService.go new file mode 100644 index 0000000..e40c06a --- /dev/null +++ b/service/probe/SensorConfigService.go @@ -0,0 +1,6 @@ +package probe + +type SensorConfigService interface { + AddConfig(tempFilePath string) error + RemoveConfig(sensorConfigID string) error +}