vmalertmanagerconfig: add fields entity, actions and `update_aler…

…ts` for opsgenie_configs according to https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config.

api/v1beta1/vmalertmanagerconfig_types.go

@@ -654,6 +654,13 @@ type OpsGenieConfig struct {
 	// List of responders responsible for notifications.
 	// +optional
 	Responders []OpsGenieConfigResponder `json:"responders,omitempty"`
+	// Optional field that can be used to specify which domain alert is related to.
+	Entity string `json:"entity,omitempty"`
+	// Comma separated list of actions that will be available for the alert.
+	Actions string `json:"actions,omitempty"`
+	// Whether to update message and description of the alert in OpsGenie if it already exists
+	// By default, the alert is never updated in OpsGenie, the new message only appears in activity log.
+	UpdateAlerts bool `json:"update_alerts,omitempty"`
 	// HTTP client configuration.
 	// +optional
 	HTTPConfig *HTTPConfig `json:"http_config,omitempty"`

api/victoriametrics/v1beta1/additional.go

@@ -581,7 +581,7 @@ func (l *License) IsProvided() bool {
 
 // MaybeAddToArgs conditionally adds license commandline args into given args
 func (l *License) MaybeAddToArgs(args []string, secretMountDir string) []string {
-	if !l.IsProvided() {
+	if l == nil || !l.IsProvided() {
 		return args
 	}
 	if l.Key != nil {
@@ -595,7 +595,7 @@ func (l *License) MaybeAddToArgs(args []string, secretMountDir string) []string
 
 // MaybeAddToVolumes conditionally mounts secret with license key into given volumes and mounts
 func (l *License) MaybeAddToVolumes(volumes []v1.Volume, mounts []v1.VolumeMount, secretMountDir string) ([]v1.Volume, []v1.VolumeMount) {
-	if l.KeyRef == nil {
+	if l == nil || l.KeyRef == nil {
 		return volumes, mounts
 	}
 	volumes = append(volumes, v1.Volume{

api/victoriametrics/v1beta1/vmagent_webhook_test.go

@@ -60,6 +60,21 @@ func TestVMAgent_sanityCheck(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "relabeling with if array",
+			spec: VMAgentSpec{
+				RemoteWrite: []VMAgentRemoteWriteSpec{{URL: "http://some-rw"}},
+				InlineRelabelConfig: []RelabelConfig{
+					{
+						Action: "drop_metrics",
+						If: []string{
+							"{job=~\"aaa.*\"}",
+							"{job=~\"bbb.*\"}",
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

api/victoriametrics/v1beta1/vmalertmanagerconfig_types.go

@@ -654,6 +654,13 @@ type OpsGenieConfig struct {
 	// List of responders responsible for notifications.
 	// +optional
 	Responders []OpsGenieConfigResponder `json:"responders,omitempty"`
+	// Optional field that can be used to specify which domain alert is related to.
+	Entity string `json:"entity,omitempty"`
+	// Comma separated list of actions that will be available for the alert.
+	Actions string `json:"actions,omitempty"`
+	// Whether to update message and description of the alert in OpsGenie if it already exists
+	// By default, the alert is never updated in OpsGenie, the new message only appears in activity log.
+	UpdateAlerts bool `json:"update_alerts,omitempty"`
 	// HTTP client configuration.
 	// +optional
 	HTTPConfig *HTTPConfig `json:"http_config,omitempty"`

controllers/factory/alertmanager/config.go

@@ -957,6 +957,9 @@ func (cb *configBuilder) buildOpsGenie(og operatorv1beta1.OpsGenieConfig) error
 	toYamlString("tags", og.Tags)
 	toYamlString("note", og.Note)
 	toYamlString("api_url", og.APIURL)
+	toYamlString("entity", og.Entity)
+	toYamlString("Actions", og.Actions)
+
 	if og.APIURL != "" {
 		err := parseURL(og.APIURL)
 		if err != nil {
@@ -970,6 +973,9 @@ func (cb *configBuilder) buildOpsGenie(og operatorv1beta1.OpsGenieConfig) error
 	if og.SendResolved != nil {
 		temp = append(temp, yaml.MapItem{Key: "send_resolved", Value: *og.SendResolved})
 	}
+	if og.UpdateAlerts {
+		temp = append(temp, yaml.MapItem{Key: "update_alerts", Value: og.UpdateAlerts})
+	}
 
 	var responders []yaml.MapSlice
 	for _, responder := range og.Responders {

docs/CHANGELOG.md

@@ -16,7 +16,7 @@ aliases:
 
 ## Next release
 
-- TODO
+- [vmalertmanagerconfig](./api.html#vmalertmanagerconfig): add fields `entity`, `actions` and `update_alerts` for opsgenie_configs according to https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config.
 
 <a name="v0.39.3"></a>
 ## [v0.39.3](https://github.com/VictoriaMetrics/operator/releases/tag/v0.39.3) - 16 Nov 2023