Skip to content

Commit cdd134a

Browse files
am97grobinson-grafanagotjosh
authored
Fix descriptions for --enable-feature (#4214)
* Fix descriptions for --enable-feature Signed-off-by: Andrés Maldonado <[email protected]> * Apply suggested changes Co-authored-by: George Robinson <[email protected]> Signed-off-by: am97 <[email protected]> --------- Signed-off-by: Andrés Maldonado <[email protected]> Signed-off-by: am97 <[email protected]> Co-authored-by: George Robinson <[email protected]> Co-authored-by: gotjosh <[email protected]>
1 parent 5fecfde commit cdd134a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cli/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func Execute() {
155155
app.Flag("timeout", "Timeout for the executed command").Default("30s").DurationVar(&timeout)
156156
app.Flag("http.config.file", "HTTP client configuration file for amtool to connect to Alertmanager.").PlaceHolder("<filename>").ExistingFileVar(&httpConfigFile)
157157
app.Flag("version-check", "Check alertmanager version. Use --no-version-check to disable.").Default("true").BoolVar(&versionCheck)
158-
app.Flag("enable-feature", fmt.Sprintf("Experimental features to enable. The flag can be repeated to enable multiple features. Valid options: %s", strings.Join(featurecontrol.AllowedFlags, ", "))).Default("").StringVar(&featureFlags)
158+
app.Flag("enable-feature", fmt.Sprintf("Experimental features to enable, comma separated. Valid options: %s", strings.Join(featurecontrol.AllowedFlags, ", "))).Default("").StringVar(&featureFlags)
159159

160160
app.Version(version.Print("amtool"))
161161
app.GetFlag("help").Short('h')

cmd/alertmanager/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func run() int {
176176
tlsConfigFile = kingpin.Flag("cluster.tls-config", "[EXPERIMENTAL] Path to config yaml file that can enable mutual TLS within the gossip protocol.").Default("").String()
177177
allowInsecureAdvertise = kingpin.Flag("cluster.allow-insecure-public-advertise-address-discovery", "[EXPERIMENTAL] Allow alertmanager to discover and listen on a public IP address.").Bool()
178178
label = kingpin.Flag("cluster.label", "The cluster label is an optional string to include on each packet and stream. It uniquely identifies the cluster and prevents cross-communication issues when sending gossip messages.").Default("").String()
179-
featureFlags = kingpin.Flag("enable-feature", fmt.Sprintf("Experimental features to enable. The flag can be repeated to enable multiple features. Valid options: %s", strings.Join(featurecontrol.AllowedFlags, ", "))).Default("").String()
179+
featureFlags = kingpin.Flag("enable-feature", fmt.Sprintf("Comma-separated experimental features to enable. Valid options: %s", strings.Join(featurecontrol.AllowedFlags, ", "))).Default("").String()
180180
)
181181

182182
promslogflag.AddFlags(kingpin.CommandLine, &promslogConfig)

0 commit comments

Comments
 (0)