Merge branch 'master' into v1.6244.0

jremy42 · web-flow · commit f1122592a6f2 · 2025-03-17T09:57:16.000+01:00
diff --git a/internal/namespaces/cockpit/v1/cockpit_cli.go b/internal/namespaces/cockpit/v1/cockpit_cli.go
@@ -1018,7 +1018,7 @@ If you need to receive alerts for other receivers, you can create additional con
 				Positional: false,
 			},
 			{
-				Name:       "receive-resolved-notifications",
+				Name:       "send-resolved-notifications",
 				Short:      `Send an email notification when an alert is marked as resolved`,
 				Required:   false,
 				Deprecated: false,

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ If you need to receive alerts for other receivers, you can create additional con`
`1018`	`1018`	`Positional: false,`
`1019`	`1019`	`},`
`1020`	`1020`	`{`
`1021`		`- Name: "receive-resolved-notifications",`
	`1021`	`+ Name: "send-resolved-notifications",`
`1022`	`1022`	Short: `Send an email notification when an alert is marked as resolved`,
`1023`	`1023`	`Required: false,`
`1024`	`1024`	`Deprecated: false,`