add log options to cli

krzko · Feb 24, 2024 · 7a9592f · 7a9592f
1 parent 2518bbf
commit 7a9592f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/internal/cli/clean.go b/internal/cli/clean.go
@@ -32,7 +32,7 @@ func genCleanCommand() *cli.Command {
 
 			homeDir := getHomeDir()
 			targetDir := filepath.Join(homeDir, ".run-o11y-run")
-			err := files.ExtractFiles(targetDir)
+			err := files.ExtractFiles(targetDir, files.ServicesConfig{})
 			if err != nil {
 				fmt.Println("Error extracting files:", err)
 				return err

diff --git a/internal/cli/start.go b/internal/cli/start.go
@@ -46,6 +46,15 @@ func genStartCommand() *cli.Command {
 				Usage: "apply the :latest tag to all images. Caution: This may result in breaking changes to the setup",
 				Value: false,
 			},
+			&cli.BoolFlag{
+				Name:  "local-log-files",
+				Usage: "include all local log files in the collector",
+				Value: false,
+			},
+			&cli.StringFlag{
+				Name:  "follow-log-file",
+				Usage: "regex of log files to track in the collector",
+			},
 		},
 		Action: func(c *cli.Context) error {
 			fmt.Println("✨ Starting...")
@@ -57,7 +66,12 @@ func genStartCommand() *cli.Command {
 
 			homeDir := getHomeDir()
 			targetDir := filepath.Join(homeDir, ".run-o11y-run")
-			err := files.ExtractFiles(targetDir)
+			svcConfig := files.ServicesConfig{
+				LocalLogFiles: c.Bool("local-log-files"),
+				LogFilePath:   c.String("follow-log-file"),
+				LogFiles:      (c.Bool("local-log-files") || c.String("follow-log-file") != ""),
+			}
+			err := files.ExtractFiles(targetDir, svcConfig)
 			if err != nil {
 				fmt.Println("Error extracting files:", err)
 				return err

diff --git a/internal/cli/stop.go b/internal/cli/stop.go
@@ -25,7 +25,7 @@ func genStopCommand() *cli.Command {
 
 			homeDir := getHomeDir()
 			targetDir := filepath.Join(homeDir, ".run-o11y-run")
-			err := files.ExtractFiles(targetDir)
+			err := files.ExtractFiles(targetDir, files.ServicesConfig{})
 			if err != nil {
 				fmt.Println("Error extracting files:", err)
 				return err

diff --git a/internal/files/files.go b/internal/files/files.go
@@ -14,11 +14,13 @@ import (
 var files embed.FS
 
 type ServicesConfig struct {
-	LocalLogFiles bool
+	LocalLogFiles bool   // follow local log files
+	LogFilePath   string // follow specified log file
+	LogFiles      bool   // true if LocalLogFiles or LogFilePath
 }
 
 // ExtractFiles extracts the files from the embedded filesystem to the target directory
-func ExtractFiles(targetDir string) error {
+func ExtractFiles(targetDir string, svcConfig ServicesConfig) error {
 	err := os.MkdirAll(targetDir, os.ModePerm)
 	if err != nil {
 		return err
@@ -38,13 +40,12 @@ func ExtractFiles(targetDir string) error {
 			return err
 		}
 		if filepath.Ext(path) == ".tmpl" {
-			servicesConfig := ServicesConfig{LocalLogFiles: false}
 			serviceTemplate, err := template.New("serviceTemplateConfigFile").Parse(string(data))
 			if err != nil {
 				return err
 			}
 			var hydratedContent bytes.Buffer
-			err = serviceTemplate.Execute(&hydratedContent, servicesConfig)
+			err = serviceTemplate.Execute(&hydratedContent, svcConfig)
 			if err != nil {
 				return err
 			}

diff --git a/internal/files/files/grafana/shared/otel-collector.yaml.tmpl b/internal/files/files/grafana/shared/otel-collector.yaml.tmpl
@@ -1,9 +1,14 @@
 receivers:
   filelog:
-    {{- if .LocalLogFiles }}
+    {{- if .LogFiles }}
     include:
+      {{- if .LocalLogFiles }}
       - /app/*.log
       - /var/log/*.log
+      {{- end }}
+      {{- if .LogFilePath }}
+      - {{ .LogFilePath }}
+      {{- end }}
     {{- end }}
     include_file_name: true
     include_file_path: true
@@ -41,7 +46,7 @@ exporters:
 service:
   pipelines:
     logs:
-    {{- if .LocalLogFiles }}
+    {{- if .LogFiles }}
       receivers: [filelog, otlp, syslog]
     {{- else }}
       receivers: [otlp, syslog]