Implement an initial version of the support bundle in Alloy

CHANGELOG.md

@@ -28,6 +28,8 @@ v1.5.0-rc.0
 
 ### Features
 
+- Add support bundle generation via the API endpoint /-/support (@dehaansa)
+
 - Add the function `path_join` to the stdlib. (@wildum)
 - Add `pyroscope.receive_http` component to receive and forward Pyroscope profiles (@marcsanmi)
 

docs/sources/reference/cli/run.md

@@ -42,6 +42,7 @@ The following flags are supported:
 * `--server.http.ui-path-prefix`: Base path where the UI is exposed (default `/`).
 * `--storage.path`: Base directory where components can store data (default `data-alloy/`).
 * `--disable-reporting`: Disable [data collection][] (default `false`).
+* `--disable-support-bundle`: Disable [support bundle][] endpoint (default `false`).
 * `--cluster.enabled`: Start {{< param "PRODUCT_NAME" >}} in clustered mode (default `false`).
 * `--cluster.node-name`: The name to use for this node (defaults to the environment's hostname).
 * `--cluster.join-addresses`: Comma-separated list of addresses to join the cluster at (default `""`). Mutually exclusive with `--cluster.discover-peers`.
@@ -178,6 +179,7 @@ Refer to [alloy convert][] for more details on how `extra-args` work.
 [go-discover]: https://github.com/hashicorp/go-discover
 [in-memory HTTP traffic]: ../../../get-started/component_controller/#in-memory-traffic
 [data collection]: ../../../data-collection/
+[support bundle]: ../../../troubleshoot/support_bundle
 [components]: ../../get-started/components/
 [component controller]: ../../../get-started/component_controller/
 [UI]: ../../../troubleshoot/debug/#clustering-page

docs/sources/troubleshoot/support_bundle.md

@@ -0,0 +1,44 @@
+---
+canonical: https://grafana.com/docs/alloy/latest/troubleshoot/support_bundle/
+description: Learn how to generate a support bundle
+title: Generate a Support Bundle
+menuTitle: Generate Support Bundle
+weight: 300
+---
+
+# Generate Support Bundle
+
+The `/-/support?duration=N` endpoint returns a 'support bundle', a zip file that contains information
+about a running {{< param "PRODUCT_NAME" >}} instance, and can be used as a baseline of information when trying
+to debug an issue.
+
+{{< admonition type="note" >}}
+This endpoint is enabled by default, but may be disabled using the `--disable-support-bundle` runtime flag.
+{{< /admonition >}}
+
+The duration parameter is optional, must be less than or equal to the
+configured HTTP server write timeout, and if not provided, defaults to it.
+The endpoint is only exposed to the {{< param "PRODUCT_NAME" >}} HTTP server listen address, which
+defaults to `localhost:12345`.
+
+The support bundle contains all information in plain text, so you can
+inspect it before sharing to verify that no sensitive information has leaked.
+
+In addition, you can inspect the [supportbundle implementation](https://github.com/grafana/alloy/tree/internal/service/http/supportbundle.go)
+to verify the code used to generate these bundles.
+
+A support bundle contains the following data:
+* `alloy-components.json` contains information about the [components][components] running on this {{< param "PRODUCT_NAME" >}} instance, generated by the 
+`/api/v0/web/components` endpoint.
+* `alloy-logs.txt` contains the logs during the bundle generation.
+* `alloy-metadata.yaml` contains the {{< param "PRODUCT_NAME" >}} build version and the installation's operating system, architecture, and uptime.
+* `alloy-metrics.txt` contains a snapshot of {{< param "PRODUCT_NAME" >}}'s internal metrics.
+* `alloy-peers.json` contains information about the identified cluster peers of this {{< param "PRODUCT_NAME" >}} instance, generated by the 
+`/api/v0/web/peers` endpoint.
+* `alloy-runtime-flags.txt` contains the values of the runtime flags available in {{< param "PRODUCT_NAME" >}}.
+* The `pprof/` directory contains Go runtime profiling data (CPU, heap, goroutine, mutex, block profiles) as exported by the pprof package. See the [profile][profile]
+ documentation for more details on how to use this information.
+
+[profile]: ../profile
+[components]: ../../get-started/components/
+[alloy-repo]: https://github.com/grafana/alloy/issues

go.mod

@@ -842,6 +842,8 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect
 )
 
+require github.com/mackerelio/go-osstat v0.2.5
+
 // NOTE: replace directives below must always be *temporary*.
 //
 // Adding a replace directive to change a module to a fork of a module will

go.sum

@@ -1702,6 +1702,8 @@ github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMn
 github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
 github.com/lyft/protoc-gen-validate v0.0.0-20180911180927-64fcb82c878e/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/mackerelio/go-osstat v0.2.5 h1:+MqTbZUhoIt4m8qzkVoXUJg1EuifwlAJSk4Yl2GXh+o=
+github.com/mackerelio/go-osstat v0.2.5/go.mod h1:atxwWF+POUZcdtR1wnsUcQxTytoHG4uhl2AKKzrOajY=
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
 github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

internal/alloycli/cmd_run.go

@@ -23,6 +23,7 @@ import (
 	"github.com/grafana/ckit/peer"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"go.opentelemetry.io/otel"
 	"golang.org/x/exp/maps"
 
@@ -64,6 +65,7 @@ func runCommand() *cobra.Command {
 		clusterAdvInterfaces:  advertise.DefaultInterfaces,
 		clusterMaxJoinPeers:   5,
 		clusterRejoinInterval: 60 * time.Second,
+		disableSupportBundle:  false,
 	}
 
 	cmd := &cobra.Command{
@@ -100,7 +102,7 @@ depending on the nature of the reload error.
 		SilenceUsage: true,
 
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return r.Run(args[0])
+			return r.Run(cmd, args[0])
 		},
 	}
 
@@ -111,6 +113,8 @@ depending on the nature of the reload error.
 	cmd.Flags().StringVar(&r.uiPrefix, "server.http.ui-path-prefix", r.uiPrefix, "Prefix to serve the HTTP UI at")
 	cmd.Flags().
 		BoolVar(&r.enablePprof, "server.http.enable-pprof", r.enablePprof, "Enable /debug/pprof profiling endpoints.")
+	cmd.Flags().
+		BoolVar(&r.disableSupportBundle, "server.http.disable-support-bundle", r.disableSupportBundle, "Disable /-/support support bundle retrieval.")
 
 	// Cluster flags
 	cmd.Flags().
@@ -184,9 +188,10 @@ type alloyRun struct {
 	configBypassConversionErrors bool
 	configExtraArgs              string
 	enableCommunityComps         bool
+	disableSupportBundle         bool
 }
 
-func (fr *alloyRun) Run(configPath string) error {
+func (fr *alloyRun) Run(cmd *cobra.Command, configPath string) error {
 	var wg sync.WaitGroup
 	defer wg.Wait()
 
@@ -275,17 +280,28 @@ func (fr *alloyRun) Run(configPath string) error {
 		return err
 	}
 
+	var runtimeFlags []byte
+	if !fr.disableSupportBundle {
+		b := strings.Builder{}
+		cmd.Flags().VisitAll(func(f *pflag.Flag) {
+			b.WriteString(fmt.Sprintf("%s=%s\n", f.Name, f.Value.String()))
+		})
+		runtimeFlags = []byte(b.String())
+	}
+
 	httpService := httpservice.New(httpservice.Options{
-		Logger:   log.With(l, "service", "http"),
+		Logger:   l,
 		Tracer:   t,
 		Gatherer: prometheus.DefaultGatherer,
 
 		ReadyFunc:  func() bool { return ready() },
 		ReloadFunc: func() (*alloy_runtime.Source, error) { return reload() },
 
-		HTTPListenAddr:   fr.httpListenAddr,
-		MemoryListenAddr: fr.inMemoryAddr,
-		EnablePProf:      fr.enablePprof,
+		HTTPListenAddr:       fr.httpListenAddr,
+		MemoryListenAddr:     fr.inMemoryAddr,
+		EnablePProf:          fr.enablePprof,
+		DisableSupportBundle: fr.disableSupportBundle,
+		RuntimeFlags:         runtimeFlags,
 	})
 
 	remoteCfgService, err := remotecfgservice.New(remotecfgservice.Options{

internal/runtime/logging/logger.go

@@ -55,6 +55,12 @@ func New(w io.Writer, o Options) (*Logger, error) {
 	return l, nil
 }
 
+// NewNop returns a logger that does nothing
+func NewNop() *Logger {
+	l, _ := NewDeferred(io.Discard)
+	return l
+}
+
 // NewDeferred creates a new logger with the default log level and format.
 // The logger is not updated during initialization.
 func NewDeferred(w io.Writer) (*Logger, error) {
@@ -63,7 +69,6 @@ func NewDeferred(w io.Writer) (*Logger, error) {
 		format  formatVar
 		writer  writerVar
 	)
-
 	l := &Logger{
 		inner: w,
 
@@ -104,11 +109,10 @@ func (l *Logger) Update(o Options) error {
 	l.level.Set(slogLevel(o.Level).Level())
 	l.format.Set(o.Format)
 
-	newWriter := l.inner
+	l.writer.innerWriter = l.inner
 	if len(o.WriteTo) > 0 {
-		newWriter = io.MultiWriter(l.inner, &lokiWriter{o.WriteTo})
+		l.writer.lokiWriter = &lokiWriter{o.WriteTo}
 	}
-	l.writer.Set(newWriter)
 
 	// Build all our deferred handlers
 	if l.deferredSlog != nil {
@@ -133,6 +137,14 @@ func (l *Logger) Update(o Options) error {
 	return nil
 }
 
+func (l *Logger) SetTemporaryWriter(w io.Writer) {
+	l.writer.SetTemporaryWriter(w)
+}
+
+func (l *Logger) RemoveTemporaryWriter() {
+	l.writer.RemoveTemporaryWriter()
+}
+
 // Log implements log.Logger.
 func (l *Logger) Log(kvps ...interface{}) error {
 	// Buffer logs before confirming log format is configured in `logging` block
@@ -215,24 +227,51 @@ func (f *formatVar) Set(format Format) {
 
 type writerVar struct {
 	mut sync.RWMutex
-	w   io.Writer
+
+	lokiWriter  *lokiWriter
+	innerWriter io.Writer
+	tmpWriter   io.Writer
 }
 
-func (w *writerVar) Set(inner io.Writer) {
+func (w *writerVar) SetTemporaryWriter(writer io.Writer) {
 	w.mut.Lock()
 	defer w.mut.Unlock()
-	w.w = inner
+	w.tmpWriter = writer
 }
 
-func (w *writerVar) Write(p []byte) (n int, err error) {
+func (w *writerVar) RemoveTemporaryWriter() {
+	w.mut.Lock()
+	defer w.mut.Unlock()
+	w.tmpWriter = nil
+}
+
+func (w *writerVar) Write(p []byte) (int, error) {
 	w.mut.RLock()
 	defer w.mut.RUnlock()
 
-	if w.w == nil {
+	if w.innerWriter == nil {
 		return 0, fmt.Errorf("no writer available")
 	}
 
-	return w.w.Write(p)
+	// The following is effectively an io.Multiwriter, but without updating
+	// the Multiwriter each time tmpWriter is added or removed.
+	if _, err := w.innerWriter.Write(p); err != nil {
+		return 0, err
+	}
+
+	if w.lokiWriter != nil {
+		if _, err := w.lokiWriter.Write(p); err != nil {
+			return 0, err
+		}
+	}
+
+	if w.tmpWriter != nil {
+		if _, err := w.tmpWriter.Write(p); err != nil {
+			return 0, err
+		}
+	}
+
+	return len(p), nil
 }
 
 type bufferedItem struct {