feat: allow setting the vector image as a global property
This commit is contained in:
@@ -18,8 +18,9 @@ var (
|
||||
|
||||
// GlobalProperties is a map of all valid global logs properties
|
||||
GlobalProperties = map[string]bool{
|
||||
"max-size": true,
|
||||
"vector-sink": true,
|
||||
"max-size": true,
|
||||
"vector-image": true,
|
||||
"vector-sink": true,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -11,11 +11,12 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
|
||||
}
|
||||
|
||||
flags := map[string]common.ReportFunc{
|
||||
"--logs-computed-max-size": reportComputedMaxSize,
|
||||
"--logs-global-max-size": reportGlobalMaxSize,
|
||||
"--logs-global-vector-sink": reportGlobalVectorSink,
|
||||
"--logs-max-size": reportMaxSize,
|
||||
"--logs-vector-sink": reportVectorSink,
|
||||
"--logs-computed-max-size": reportComputedMaxSize,
|
||||
"--logs-global-max-size": reportGlobalMaxSize,
|
||||
"--logs-global-vector-sink": reportGlobalVectorSink,
|
||||
"--logs-max-size": reportMaxSize,
|
||||
"--logs-vector-global-image": reportVectorGlobalImage,
|
||||
"--logs-vector-sink": reportVectorSink,
|
||||
}
|
||||
|
||||
flagKeys := []string{}
|
||||
@@ -42,6 +43,10 @@ func reportGlobalMaxSize(appName string) string {
|
||||
return common.PropertyGetDefault("logs", "--global", "max-size", MaxSize)
|
||||
}
|
||||
|
||||
func reportVectorGlobalImage(appName string) string {
|
||||
return common.PropertyGetDefault("logs", "--global", "vector-image", VectorImage)
|
||||
}
|
||||
|
||||
func reportGlobalVectorSink(appName string) string {
|
||||
return common.PropertyGet("logs", "--global", "vector-sink")
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ func main() {
|
||||
err = logs.CommandVectorLogs(*num, *tail)
|
||||
case "vector-start":
|
||||
args := flag.NewFlagSet("logs:vector-start", flag.ExitOnError)
|
||||
vectorImage := args.String("vector-image", logs.VectorImage, "--vector-image: the name of the docker image to run for vector")
|
||||
vectorImage := args.String("vector-image", "", "--vector-image: the name of the docker image to run for vector")
|
||||
args.Parse(os.Args[2:])
|
||||
err = logs.CommandVectorStart(*vectorImage)
|
||||
case "vector-stop":
|
||||
|
||||
@@ -103,6 +103,10 @@ func CommandVectorStart(vectorImage string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if vectorImage == "" {
|
||||
vectorImage = common.PropertyGet("logs", "--global", "vector-image")
|
||||
}
|
||||
|
||||
if common.ContainerExists(vectorContainerName) {
|
||||
if common.ContainerIsRunning(vectorContainerName) {
|
||||
common.LogVerbose("Vector container is running")
|
||||
|
||||
Reference in New Issue
Block a user