From 8773cc4a55a740764eab7d6778dce3bc462965ca Mon Sep 17 00:00:00 2001 From: Jonathan-Eng Date: Tue, 2 Jul 2024 12:54:58 +0300 Subject: [PATCH 1/4] change alerting version to bc8776d --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3b31c8f99db84..aca1eb55741fc 100644 --- a/go.mod +++ b/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-20240620105504-dc7a06109e78 +replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240630144355-bc8776dd0e46 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible diff --git a/go.sum b/go.sum index d8c49fbb9d7e1..71e29330ba108 100644 --- a/go.sum +++ b/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-20240620105504-dc7a06109e78 h1:v1pwCrO1j4T/PgRPLmJreHrLjpNCkRi5DJC3heMVt6Y= -github.com/logzio/data-viz-alerting v0.0.0-20240620105504-dc7a06109e78/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= +github.com/logzio/data-viz-alerting v0.0.0-20240630144355-bc8776dd0e46 h1:ONCnwEpPaAc3S84bA7vB+8USUnes73a9DacdzfrKXf4= +github.com/logzio/data-viz-alerting v0.0.0-20240630144355-bc8776dd0e46/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= From cc998a2f113ac09f0752363b14574f63c48e59d6 Mon Sep 17 00:00:00 2001 From: Jonathan-Eng Date: Tue, 2 Jul 2024 15:29:55 +0300 Subject: [PATCH 2/4] upgrade alerting version to 158181d9d6fa run-test --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index aca1eb55741fc..a1358c5916387 100644 --- a/go.mod +++ b/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-20240630144355-bc8776dd0e46 +replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240702111126-158181d9d6fa exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible diff --git a/go.sum b/go.sum index 71e29330ba108..f3ce11139a9a1 100644 --- a/go.sum +++ b/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-20240630144355-bc8776dd0e46 h1:ONCnwEpPaAc3S84bA7vB+8USUnes73a9DacdzfrKXf4= -github.com/logzio/data-viz-alerting v0.0.0-20240630144355-bc8776dd0e46/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= +github.com/logzio/data-viz-alerting v0.0.0-20240702111126-158181d9d6fa h1:4IWIqGkFz0JIxqh6V/+SgI7cWVVA8cJ9Fr1oqc3U9qg= +github.com/logzio/data-viz-alerting v0.0.0-20240702111126-158181d9d6fa/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= From eec2408e9c016d043f687f153106eaca82838826 Mon Sep 17 00:00:00 2001 From: Jonathan-Eng Date: Mon, 8 Jul 2024 13:59:30 +0300 Subject: [PATCH 3/4] check branch in alerting with orgId query param removed --- go.mod | 4 +++- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a1358c5916387..1999f4c9ba524 100644 --- a/go.mod +++ b/go.mod @@ -519,6 +519,8 @@ 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-20240702111126-158181d9d6fa +replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240708104628-454e32055f5b + +//replace github.com/grafana/alerting => /Users/jonathan/logzio/data-viz-alerting exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible diff --git a/go.sum b/go.sum index f3ce11139a9a1..67be4d8c0c345 100644 --- a/go.sum +++ b/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-20240702111126-158181d9d6fa h1:4IWIqGkFz0JIxqh6V/+SgI7cWVVA8cJ9Fr1oqc3U9qg= -github.com/logzio/data-viz-alerting v0.0.0-20240702111126-158181d9d6fa/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= +github.com/logzio/data-viz-alerting v0.0.0-20240708104628-454e32055f5b h1:+sP5uRuPTw8hhaW3o4ld28BNI/f8Bj2wHTQFIVozJ+s= +github.com/logzio/data-viz-alerting v0.0.0-20240708104628-454e32055f5b/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= From deb9ced44bc0a750e0aad47a13ea57f4a853442e Mon Sep 17 00:00:00 2001 From: Jonathan-Eng Date: Tue, 9 Jul 2024 16:35:02 +0300 Subject: [PATCH 4/4] change alerting version to 5bf841d2c3d3 --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 1999f4c9ba524..c254420d0e0ad 100644 --- a/go.mod +++ b/go.mod @@ -519,8 +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-20240708104628-454e32055f5b - -//replace github.com/grafana/alerting => /Users/jonathan/logzio/data-viz-alerting +replace github.com/grafana/alerting => github.com/logzio/data-viz-alerting v0.0.0-20240709132848-5bf841d2c3d3 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible diff --git a/go.sum b/go.sum index 67be4d8c0c345..b067c7fd16c31 100644 --- a/go.sum +++ b/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-20240708104628-454e32055f5b h1:+sP5uRuPTw8hhaW3o4ld28BNI/f8Bj2wHTQFIVozJ+s= -github.com/logzio/data-viz-alerting v0.0.0-20240708104628-454e32055f5b/go.mod h1:brTFeACal/cSZAR8XO/4LPKs7rzNfS86okl6QjSP1eY= +github.com/logzio/data-viz-alerting v0.0.0-20240709132848-5bf841d2c3d3 h1:fny0mkam3829TczE+J/QHYjsgaZZHYhJf0Z9YadD+kk= +github.com/logzio/data-viz-alerting v0.0.0-20240709132848-5bf841d2c3d3/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=