Skip to content

feat(cscli): add network flag for dashboard setup #3112

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(cscli): add network flag for dashboard setup #3112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df6d51c
feat(cscli): add network flag for dashboard setup
quantumsheep Jul 5, 2024
beee1a2
Merge branch 'master' into feat/cscli-network-flag
LaurenceJJones Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions cmd/crowdsec-cli/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ var (
metabaseConfigFile = "metabase.yaml"
metabaseImage = "metabase/metabase:v0.46.6.1"
/**/
metabaseListenAddress = "127.0.0.1"
metabaseListenPort = "3000"
metabaseContainerID = "crowdsec-metabase"
crowdsecGroup = "crowdsec"
metabaseListenAddress = "127.0.0.1"
metabaseListenPort = "3000"
metabaseContainerID = "crowdsec-metabase"
metabaseContainerNetworks []string
crowdsecGroup = "crowdsec"

forceYes bool

Expand Down Expand Up @@ -166,7 +167,7 @@ cscli dashboard setup -l 0.0.0.0 -p 443 --password <password>
if err = cli.chownDatabase(dockerGroup.Gid); err != nil {
return err
}
mb, err := metabase.SetupMetabase(cli.cfg().API.Server.DbConfig, metabaseListenAddress, metabaseListenPort, metabaseUser, metabasePassword, metabaseDBPath, dockerGroup.Gid, metabaseContainerID, metabaseImage)
mb, err := metabase.SetupMetabase(cli.cfg().API.Server.DbConfig, metabaseListenAddress, metabaseListenPort, metabaseUser, metabasePassword, metabaseDBPath, dockerGroup.Gid, metabaseContainerID, metabaseImage, metabaseContainerNetworks)
if err != nil {
return err
}
Expand All @@ -193,6 +194,7 @@ cscli dashboard setup -l 0.0.0.0 -p 443 --password <password>
flags.BoolVarP(&forceYes, "yes", "y", false, "force yes")
// flags.StringVarP(&metabaseUser, "user", "u", "crowdsec@crowdsec.net", "metabase user")
flags.StringVar(&metabasePassword, "password", "", "metabase password")
flags.StringSliceVar(&metabaseContainerNetworks, "network", nil, "Network to attach to the container")

return cmd
}
Expand Down
11 changes: 10 additions & 1 deletion pkg/metabase/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ type Container struct {
CLI *client.Client
MBDBUri string
DockerGroupID string
Networks []string
}

func NewContainer(listenAddr string, listenPort string, sharedFolder string, containerName string, image string, mbDBURI string, dockerGroupID string) (*Container, error) {
func NewContainer(listenAddr string, listenPort string, sharedFolder string, containerName string, image string, mbDBURI string, dockerGroupID string, networks []string) (*Container, error) {
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
if err != nil {
return nil, fmt.Errorf("failed to create docker client : %s", err)
Expand All @@ -41,6 +42,7 @@ func NewContainer(listenAddr string, listenPort string, sharedFolder string, con
CLI: cli,
MBDBUri: mbDBURI,
DockerGroupID: dockerGroupID,
Networks: networks,
}, nil
}

Expand Down Expand Up @@ -100,6 +102,13 @@ func (c *Container) Create() error {
}
c.ID = resp.ID

for _, network := range c.Networks {
log.Infof("connecting container '%s' to network '%s'", c.Name, network)
if err := c.CLI.NetworkConnect(ctx, network, c.ID, nil); err != nil {
return fmt.Errorf("failed to connect container to network : %s", err)
}
}

return nil
}

Expand Down
6 changes: 4 additions & 2 deletions pkg/metabase/metabase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type Config struct {
DBPath string `yaml:"metabase_db_path"`
DockerGroupID string `yaml:"-"`
Image string `yaml:"image"`
Networks []string `yaml:"networks"`
}

var (
Expand Down Expand Up @@ -88,7 +89,7 @@ func (m *Metabase) Init(containerName string, image string) error {
if err != nil {
return err
}
m.Container, err = NewContainer(m.Config.ListenAddr, m.Config.ListenPort, m.Config.DBPath, containerName, image, DBConnectionURI, m.Config.DockerGroupID)
m.Container, err = NewContainer(m.Config.ListenAddr, m.Config.ListenPort, m.Config.DBPath, containerName, image, DBConnectionURI, m.Config.DockerGroupID, m.Config.Networks)
if err != nil {
return fmt.Errorf("container init: %w", err)
}
Expand Down Expand Up @@ -140,7 +141,7 @@ func (m *Metabase) LoadConfig(configPath string) error {

}

func SetupMetabase(dbConfig *csconfig.DatabaseCfg, listenAddr string, listenPort string, username string, password string, mbDBPath string, dockerGroupID string, containerName string, image string) (*Metabase, error) {
func SetupMetabase(dbConfig *csconfig.DatabaseCfg, listenAddr string, listenPort string, username string, password string, mbDBPath string, dockerGroupID string, containerName string, image string, containerNetworks []string) (*Metabase, error) {
metabase := &Metabase{
Config: &Config{
Database: dbConfig,
Expand All @@ -152,6 +153,7 @@ func SetupMetabase(dbConfig *csconfig.DatabaseCfg, listenAddr string, listenPort
DBPath: mbDBPath,
DockerGroupID: dockerGroupID,
Image: image,
Networks: containerNetworks,
},
}
if err := metabase.Init(containerName, image); err != nil {
Expand Down
Loading