add logzio grafana upgrade comments, and update alerting version

Author: Jonathan-Eng

go.mod

@@ -519,6 +519,6 @@ replace xorm.io/xorm => ./pkg/util/xorm
 // This is required in order to get notification delivery errors from the receivers API.
 replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20240208102907-e82436ce63e6
 
-replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240925133815-8b8848ed6e8f
+replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240926134858-3220ec2366dc
 
 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible

go.sum

@@ -2892,8 +2892,8 @@ github.com/linkedin/goavro/v2 v2.10.0 h1:eTBIRoInBM88gITGXYtUSqqxLTFXfOsJBiX8ZMW
 github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA=
 github.com/linode/linodego v1.25.0 h1:zYMz0lTasD503jBu3tSRhzEmXHQN1zptCw5o71ibyyU=
 github.com/linode/linodego v1.25.0/go.mod h1:BMZI0pMM/YGjBis7pIXDPbcgYfCZLH0/UvzqtsGtG1c=
-github.com/logzio/data-viz-alerting v0.0.0-20240925133815-8b8848ed6e8f h1:wt2nC68lHnrqc0Gsa2ORHRuo/ydIELIj42eE9cMHDFE=
-github.com/logzio/data-viz-alerting v0.0.0-20240925133815-8b8848ed6e8f/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY=
+github.com/logzio/data-viz-alerting v0.0.0-20240926134858-3220ec2366dc h1:PwLcwpAa5kpbAOX8i6eeEJsLemW84IDopjjY3F6Enrc=
+github.com/logzio/data-viz-alerting v0.0.0-20240926134858-3220ec2366dc/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY=
 github.com/luna-duclos/instrumentedsql v0.0.0-20181127104832-b7d587d28109/go.mod h1:PWUIzhtavmOR965zfawVsHXbEuU1G29BPZ/CB3C7jXk=
 github.com/luna-duclos/instrumentedsql v1.1.2/go.mod h1:4LGbEqDnopzNAiyxPPDXhLspyunZxgPTMJBKtC6U0BQ=
 github.com/luna-duclos/instrumentedsql v1.1.3/go.mod h1:9J1njvFds+zN7y85EDhN9XNQLANWwZt2ULeIC8yMNYs=

pkg/services/ngalert/api/compat_contact_points.go

@@ -105,13 +105,16 @@ func ContactPointToContactPointExport(cp definitions.ContactPoint) (notify.APIRe
 			errs = append(errs, err)
 		}
 	}
+
+	// LOGZ.IO GRAFANA CHANGE :: DEV-46341 - Add support for logzio opsgenie integration
 	for _, i := range cp.LogzioOpsgenie {
 		el, err := marshallIntegration(j, "logzio_opsgenie", i, i.DisableResolveMessage)
 		integration = append(integration, el)
 		if err != nil {
 			errs = append(errs, err)
 		}
 	}
+	// LOGZ.IO GRAFANA CHANGE :: end
 	for _, i := range cp.Pagerduty {
 		el, err := marshallIntegration(j, "pagerduty", i, i.DisableResolveMessage)
 		integration = append(integration, el)
@@ -271,11 +274,13 @@ func parseIntegration(json jsoniter.API, result *definitions.ContactPoint, recei
 		if err = json.Unmarshal(data, &integration); err == nil {
 			result.Opsgenie = append(result.Opsgenie, integration)
 		}
+	// LOGZ.IO GRAFANA CHANGE :: DEV-46341 - Add support for logzio opsgenie integration
 	case "logzio_opsgenie":
 		integration := definitions.LogzioOpsgenieIntegration{DisableResolveMessage: disable}
 		if err = json.Unmarshal(data, &integration); err == nil {
 			result.LogzioOpsgenie = append(result.LogzioOpsgenie, integration)
 		}
+	// LOGZ.IO GRAFANA CHANGE :: end
 	case "pagerduty":
 		integration := definitions.PagerdutyIntegration{DisableResolveMessage: disable}
 		if err = json.Unmarshal(data, &integration); err == nil {

pkg/services/ngalert/api/tooling/definitions/contact_points.go

@@ -121,6 +121,7 @@ type OpsgenieIntegration struct {
 	Responders       []OpsgenieIntegrationResponder `json:"responders,omitempty" yaml:"responders,omitempty" hcl:"responders,block"`
 }
 
+// LOGZ.IO GRAFANA CHANGE :: DEV-46341: Add Logzio Opsgenie Integration
 type LogzioOpsgenieIntegration struct {
 	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
 
@@ -134,6 +135,8 @@ type LogzioOpsgenieIntegration struct {
 	SendTagsAs       *string `json:"sendTagsAs,omitempty" yaml:"sendTagsAs,omitempty" hcl:"send_tags_as"`
 }
 
+// LOGZ.IO GRAFANA CHANGE :: end
+
 type PagerdutyIntegration struct {
 	DisableResolveMessage *bool `json:"-" yaml:"-" hcl:"disable_resolve_message"`
 
@@ -291,7 +294,7 @@ type ContactPoint struct {
 	Kafka          []KafkaIntegration          `json:"kafka" yaml:"kafka" hcl:"kafka,block"`
 	Line           []LineIntegration           `json:"line" yaml:"line" hcl:"line,block"`
 	Opsgenie       []OpsgenieIntegration       `json:"opsgenie" yaml:"opsgenie" hcl:"opsgenie,block"`
-	LogzioOpsgenie []LogzioOpsgenieIntegration `json:"logzio_opsgenie" yaml:"logzio_opsgenie" hcl:"logzio_opsgenie,block"`
+	LogzioOpsgenie []LogzioOpsgenieIntegration `json:"logzio_opsgenie" yaml:"logzio_opsgenie" hcl:"logzio_opsgenie,block"` // LOGZ.IO GRAFANA CHANGE :: DEV-46341: Add Logzio Opsgenie Integration
 	Pagerduty      []PagerdutyIntegration      `json:"pagerduty" yaml:"pagerduty" hcl:"pagerduty,block"`
 	OnCall         []OnCallIntegration         `json:"oncall" yaml:"oncall" hcl:"oncall,block"`
 	Pushover       []PushoverIntegration       `json:"pushover" yaml:"pushover" hcl:"pushover,block"`

pkg/services/ngalert/api/tooling/definitions/provisioning_contactpoints.go

@@ -99,7 +99,7 @@ type EmbeddedContactPoint struct {
 	Name string `json:"name" binding:"required"`
 	// required: true
 	// example: webhook
-	// enum: alertmanager, dingding, discord, email, googlechat, kafka, line, opsgenie, logzio_opsgenie, pagerduty, pushover, sensugo, slack, teams, telegram, threema, victorops, webhook, wecom
+	// enum: alertmanager, dingding, discord, email, googlechat, kafka, line, opsgenie, logzio_opsgenie, pagerduty, pushover, sensugo, slack, teams, telegram, threema, victorops, webhook, wecom	// LOGZ.IO GRAFANA CHANGE :: DEV-46341 - Add support for logzio opsgenie integration
 	Type string `json:"type" binding:"required"`
 	// required: true
 	Settings *simplejson.Json `json:"settings" binding:"required"`

pkg/services/ngalert/notifier/channels_config/available_channels.go

@@ -1339,6 +1339,7 @@ func GetAvailableNotifiers() []*NotifierPlugin {
 				},
 			},
 		},
+		// LOGZ.IO GRAFANA CHANGE :: DEV-46341 - Add support for logzio opsgenie integration
 		{
 			Type:        "logzio_opsgenie",
 			Name:        "LogzioOpsGenie",
@@ -1368,6 +1369,7 @@ func GetAvailableNotifiers() []*NotifierPlugin {
 				},
 			},
 		},
+		// LOGZ.IO GRAFANA CHANGE :: end
 		{
 			Type:        "webex",
 			Name:        "Cisco Webex Teams",

public/app/plugins/datasource/alertmanager/consts.ts

@@ -3,7 +3,7 @@ export const receiverTypeNames: Record<string, string> = {
   pushover: 'Pushover',
   slack: 'Slack',
   opsgenie: 'OpsGenie',
-  logzio_opsgenie: 'LogzioOpsGenie',
+  logzio_opsgenie: 'LogzioOpsGenie',  // LOGZ.IO GRAFANA CHANGE :: DEV-46341 - Add Logz.io OpsGenie integration
   webhook: 'Webhook',
   victorops: 'VictorOps',
   wechat: 'WeChat',