ing

config/external/external.go

@@ -1,4 +1,4 @@
-package config
+package external
 
 type External struct {
 	GRPC  *GRPC  `json:"grpc,omitempty"`

config/external/grpc.go

@@ -1,4 +1,4 @@
-package config
+package external
 
 type GRPC struct {
 	Network string `json:"network,omitempty"`

config/external/kafka.go

@@ -1,4 +1,4 @@
-package config
+package external
 
 type Kafka struct {
 	Network string `json:"network,omitempty"`

config/external/redis.go

@@ -1,4 +1,4 @@
-package config
+package external
 
 type Redis struct {
 	Network string `json:"network,omitempty"`

config/noauthprobe/auth.go

@@ -1,4 +1,4 @@
-package config
+package noauthprobe
 
 import "time"
 

config/noauthprobe/path.go

@@ -1,4 +1,4 @@
-package constants
+package noauthprobe
 
 const (
 	ConfigFileName = "auth.json"

config/noauthprobe/protocol.go

@@ -1,4 +1,4 @@
-package constants
+package noauthprobe
 
 const (
 	HTTPEntry_Auth = "/auth"

config/probe/account.go

@@ -1,4 +1,4 @@
-package config
+package probe
 
 type Account struct {
 	Name   string `required:"true" json:"name,omitempty"`

config/probe/central.go

@@ -1,4 +1,4 @@
-package config
+package probe
 
 import (
 	csswc "git.loafle.net/commons/server-go/socket/web/client"

config/probe/container.go

@@ -1,4 +1,4 @@
-package constants
+package probe
 
 import (
 	"encoding/json"

config/probe/path.go

@@ -1,4 +1,4 @@
-package constants
+package probe
 
 const (
 	ConfigFileName        = "config.json"

config/probe/probe.go

@@ -1,4 +1,4 @@
-package config
+package probe
 
 type ProbeStateType int
 

config/probe/protocol.go

@@ -1,4 +1,4 @@
-package constants
+package probe
 
 const (
 	HTTPEntry_Probe = "/probe"

model/discovery/DiscoveryHost.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 type DiscoveryHost struct {
 	FirstScanRange string   `json:"firstScanRange,omitempty"`

model/discovery/DiscoveryPort.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 type DiscoveryPort struct {
 	FirstScanRange int   `json:"firstScanRange,omitempty"`

model/discovery/DiscoveryService.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 type DiscoveryService struct {
 	IncludeServices []string `json:"includeServices,omitempty"`

model/discovery/DiscoveryZone.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 type DiscoveryZone struct {
 	ExcludePatterns []string `json:"excludePatterns,omitempty"`

model/discovery/Host.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 import (
 	"encoding/json"

model/discovery/Port.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 import (
 	"encoding/json"

model/discovery/Service.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 import (
 	"encoding/json"

model/discovery/Zone.go

@@ -1,4 +1,4 @@
-package model
+package discovery
 
 import (
 	"encoding/json"

model/domain/Domain.go

@@ -1,4 +1,4 @@
-package model
+package domain
 
 import (
 	"encoding/json"

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 {

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 {

model/infra/InfraHost.go

@@ -1,4 +1,4 @@
-package model
+package infra
 
 import (
 	"encoding/json"

model/infra/InfraMachine.go

@@ -1,4 +1,4 @@
-package model
+package infra
 
 import "git.loafle.net/overflow/commons-go/core/util"
 

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 {

model/infra/InfraOSApplication.go

@@ -1,4 +1,4 @@
-package model
+package infra
 
 import "git.loafle.net/overflow/commons-go/core/util"
 

model/infra/InfraOSDaemon.go

@@ -1,4 +1,4 @@
-package model
+package infra
 
 import (
 	"git.loafle.net/overflow/commons-go/core/util"

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 {

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 {

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 {

model/meta/MetaContainer.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaCrawler.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaHistoryType.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaInfraType.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaInfraVendor.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaMemberStatus.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import "encoding/json"
 

model/meta/MetaNoAuthProbeStatus.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import "encoding/json"
 

model/meta/MetaProbeStatus.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import "encoding/json"
 

model/meta/MetaProbeTaskType.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorDisplayItem.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorItem.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorItemKey.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorItemType.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorItemUnit.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import (
 	"encoding/json"

model/meta/MetaSensorStatus.go

@@ -1,4 +1,4 @@
-package model
+package meta
 
 import "encoding/json"
 

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 {

model/noauthprobe/NoAuthProbeDescription.go

@@ -1,4 +1,4 @@
-package model
+package noauthprobe
 
 type NoAuthProbeDescription struct {
 	Host    *NoAuthProbeDescriptionHost    `json:"host,omitempty"`

model/noauthprobe/NoAuthProbeDescriptionHost.go

@@ -1,4 +1,4 @@
-package model
+package noauthprobe
 
 type NoAuthProbeDescriptionHost struct {
 	Name            string `json:"name,omitempty"`

model/noauthprobe/NoAuthProbeDescriptionNetwork.go

@@ -1,4 +1,4 @@
-package model
+package noauthprobe
 
 type NoAuthProbeDescriptionNetwork struct {
 	Name       string `json:"name,omitempty"`

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 {

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 {

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 {

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 {

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 {

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 {

model/sensorconfig/Connection.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 import "encoding/json"
 

model/sensorconfig/Crawler.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type Crawler struct {
 	Name      string `json:"name,omitempty"`

model/sensorconfig/Item.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type Item struct {
 	Keys        []Keys       `json:"keys,omitempty"`

model/sensorconfig/Keys.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type Keys struct {
 	Metric string `json:"metric,omitempty"`

model/sensorconfig/MappingInfo.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type MappingInfo struct {
 	ParseDirection string   `json:"parseDirection,omitempty"`

model/sensorconfig/QueryInfo.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type QueryInfo struct {
 	Query  string                 `json:"query,omitempty"`

model/sensorconfig/ResultSet.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 import "encoding/json"
 

model/sensorconfig/ResultSetCol.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 import (
 	"encoding/json"

model/sensorconfig/ResultSetRow.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 import (
 	"encoding/json"

model/sensorconfig/Schedule.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type Schedule struct {
 	Interval string `json:"interval,omitempty"`

model/sensorconfig/SensorConfig.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 import "encoding/json"
 

model/sensorconfig/Target.go

@@ -1,4 +1,4 @@
-package model
+package sensorconfig
 
 type Target struct {
 	Auth       map[string]interface{} `json:"auth,omitempty"`

model/target/Target.go

@@ -1,4 +1,4 @@
-package model
+package target
 
 import (
 	"encoding/json"

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)
+}

service/container/ProbeService.go

@@ -0,0 +1,4 @@
+package container
+
+type ProbeService interface {
+}

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
+}

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
+}

service/probe/CollectorService.go

@@ -0,0 +1,4 @@
+package probe
+
+type CollectorService interface {
+}

service/probe/ContainerService.go

@@ -0,0 +1,4 @@
+package probe
+
+type ContainerService interface {
+}

service/probe/CrawlerService.go

@@ -0,0 +1,4 @@
+package probe
+
+type CrawlerService interface {
+}

service/probe/DataClientService.go

@@ -0,0 +1,4 @@
+package probe
+
+type DataClientService interface {
+}

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
+}

service/probe/SensorConfigService.go

@@ -0,0 +1,6 @@
+package probe
+
+type SensorConfigService interface {
+	AddConfig(tempFilePath string) error
+	RemoveConfig(sensorConfigID string) error
+}