feat(hhfab): allow injecting extra o11y on build/vlabup

Fixes #1072

Signed-off-by: Sergei Lukianov <[email protected]>

Author: Frostman

cmd/hhfab/main.go

@@ -63,6 +63,7 @@ const (
 	FlagNameBuildMode             = "build-mode"
 	FlagNameBuildControls         = "build-controls"
 	FlagNameBuildGateways         = "build-gateways"
+	FlagNameObservabilityTargets  = "o11y-targets"
 	FlagNameAutoUpgrade           = "auto-upgrade"
 	FlagNameFailFast              = "fail-fast"
 	FlagNameReady                 = "ready"
@@ -395,14 +396,19 @@ func Run(ctx context.Context) error {
 		},
 	}
 
-	buildModeFlags := []cli.Flag{
+	builFlags := []cli.Flag{
 		&cli.StringFlag{
 			Name:    FlagNameBuildMode,
 			Aliases: []string{"mode", "m"},
 			Usage:   "build mode: one of " + strings.Join(buildModes, ", "),
 			EnvVars: []string{"HHFAB_BUILD_MODE"},
 			Value:   string(recipe.BuildModeISO),
 		},
+		&cli.StringFlag{
+			Name:    FlagNameObservabilityTargets,
+			Usage:   "inject extra observability targets",
+			EnvVars: []string{"HHFAB_O11Y_TARGETS"},
+		},
 	}
 
 	var joinToken string
@@ -708,7 +714,7 @@ func Run(ctx context.Context) error {
 			{
 				Name:  "build",
 				Usage: "build installers",
-				Flags: flatten(defaultFlags, hModeFlags, buildModeFlags, joinTokenFlags, []cli.Flag{
+				Flags: flatten(defaultFlags, hModeFlags, builFlags, joinTokenFlags, []cli.Flag{
 					&cli.BoolFlag{
 						Name:    FlagNameBuildControls,
 						Aliases: []string{"controls"},
@@ -725,11 +731,12 @@ func Run(ctx context.Context) error {
 				Before: before(false),
 				Action: func(c *cli.Context) error {
 					if err := hhfab.Build(ctx, workDir, cacheDir, hhfab.BuildOpts{
-						HydrateMode:   hhfab.HydrateMode(hydrateMode),
-						BuildMode:     recipe.BuildMode(c.String(FlagNameBuildMode)),
-						BuildControls: c.Bool(FlagNameBuildControls),
-						BuildGateways: c.Bool(FlagNameBuildGateways),
-						SetJoinToken:  joinToken,
+						HydrateMode:          hhfab.HydrateMode(hydrateMode),
+						BuildMode:            recipe.BuildMode(c.String(FlagNameBuildMode)),
+						BuildControls:        c.Bool(FlagNameBuildControls),
+						BuildGateways:        c.Bool(FlagNameBuildGateways),
+						SetJoinToken:         joinToken,
+						ObservabilityTargets: c.String(FlagNameObservabilityTargets),
 					}); err != nil {
 						return fmt.Errorf("building: %w", err)
 					}
@@ -780,7 +787,7 @@ func Run(ctx context.Context) error {
 					{
 						Name:  "up",
 						Usage: "run VLAB",
-						Flags: flatten(defaultFlags, hModeFlags, buildModeFlags, joinTokenFlags, []cli.Flag{
+						Flags: flatten(defaultFlags, hModeFlags, builFlags, joinTokenFlags, []cli.Flag{
 							&cli.BoolFlag{
 								Name:    FlagNameReCreate,
 								Aliases: []string{"f"},
@@ -845,10 +852,11 @@ func Run(ctx context.Context) error {
 							}
 
 							if err := hhfab.VLABUp(ctx, workDir, cacheDir, hhfab.VLABUpOpts{
-								HydrateMode:  hhfab.HydrateMode(hydrateMode),
-								ReCreate:     c.Bool(FlagNameReCreate),
-								BuildMode:    recipe.BuildMode(c.String(FlagNameBuildMode)),
-								SetJoinToken: joinToken,
+								HydrateMode:          hhfab.HydrateMode(hydrateMode),
+								ReCreate:             c.Bool(FlagNameReCreate),
+								BuildMode:            recipe.BuildMode(c.String(FlagNameBuildMode)),
+								SetJoinToken:         joinToken,
+								ObservabilityTargets: c.String(FlagNameObservabilityTargets),
 								VLABRunOpts: hhfab.VLABRunOpts{
 									KillStale:          c.Bool(FlagNameKillStale),
 									ControlsRestricted: c.Bool(FlagNameControlsRestricted),

pkg/hhfab/cmdbuild.go

@@ -13,14 +13,17 @@ import (
 	fabapi "go.githedgehog.com/fabricator/api/fabricator/v1beta1"
 	"go.githedgehog.com/fabricator/pkg/artificer"
 	"go.githedgehog.com/fabricator/pkg/fab/recipe"
+	"go.githedgehog.com/libmeta/pkg/alloy"
+	kyaml "sigs.k8s.io/yaml"
 )
 
 type BuildOpts struct {
-	HydrateMode   HydrateMode
-	BuildMode     recipe.BuildMode
-	BuildControls bool
-	BuildGateways bool
-	SetJoinToken  string
+	HydrateMode          HydrateMode
+	BuildMode            recipe.BuildMode
+	BuildControls        bool
+	BuildGateways        bool
+	SetJoinToken         string
+	ObservabilityTargets string
 }
 
 func Build(ctx context.Context, workDir, cacheDir string, opts BuildOpts) error {
@@ -43,6 +46,36 @@ func (c *Config) build(ctx context.Context, opts BuildOpts) error {
 		}
 	}
 
+	targets := alloy.Targets{}
+	if err := kyaml.Unmarshal([]byte(opts.ObservabilityTargets), &targets); err != nil {
+		return fmt.Errorf("unmarshaling extra observability targets: %w", err)
+	}
+
+	if c.Fab.Spec.Config.Observability.Targets.Prometheus == nil {
+		c.Fab.Spec.Config.Observability.Targets.Prometheus = map[string]alloy.PrometheusTarget{}
+	}
+	for name, target := range targets.Prometheus {
+		if _, ok := c.Fab.Spec.Config.Observability.Targets.Prometheus[name]; ok {
+			slog.Warn("Skipping extra Prometheus target that is already defined in Fabricator", "name", name)
+
+			continue
+		}
+		slog.Debug("Adding extra Prometheus target", "name", name)
+		c.Fab.Spec.Config.Observability.Targets.Prometheus[name] = target
+	}
+	if c.Fab.Spec.Config.Observability.Targets.Loki == nil {
+		c.Fab.Spec.Config.Observability.Targets.Loki = map[string]alloy.LokiTarget{}
+	}
+	for name, target := range targets.Loki {
+		if _, ok := c.Fab.Spec.Config.Observability.Targets.Loki[name]; ok {
+			slog.Warn("Skipping extra Loki target that is already defined in Fabricator", "name", name)
+
+			continue
+		}
+		slog.Debug("Adding extra Loki target", "name", name)
+		c.Fab.Spec.Config.Observability.Targets.Loki[name] = target
+	}
+
 	d, err := artificer.NewDownloaderWithDockerCreds(c.CacheDir, c.Repo, c.Prefix)
 	if err != nil {
 		return fmt.Errorf("creating downloader: %w", err)

pkg/hhfab/cmdvlab.go

@@ -61,11 +61,12 @@ func VLABGenerate(ctx context.Context, workDir, cacheDir string, builder VLABBui
 }
 
 type VLABUpOpts struct {
-	HydrateMode  HydrateMode
-	NoCreate     bool
-	ReCreate     bool
-	BuildMode    recipe.BuildMode
-	SetJoinToken string
+	HydrateMode          HydrateMode
+	NoCreate             bool
+	ReCreate             bool
+	BuildMode            recipe.BuildMode
+	SetJoinToken         string
+	ObservabilityTargets string
 	VLABRunOpts
 }
 
@@ -101,10 +102,11 @@ func VLABUp(ctx context.Context, workDir, cacheDir string, opts VLABUpOpts) erro
 	}
 
 	if err := c.build(ctx, BuildOpts{
-		HydrateMode:   opts.HydrateMode,
-		BuildMode:     opts.BuildMode,
-		BuildControls: true,
-		BuildGateways: buildGateways,
+		HydrateMode:          opts.HydrateMode,
+		BuildMode:            opts.BuildMode,
+		BuildControls:        true,
+		BuildGateways:        buildGateways,
+		ObservabilityTargets: opts.ObservabilityTargets,
 	}); err != nil {
 		return fmt.Errorf("building: %w", err)
 	}