IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Remove ID from UserGrafanaConfig struct (#84602)

Browse Source 
* Alerting: Remove ID from UserGrafanaConfig struct

* user custom mimir image withoud id in grafana config

* change mimir image name
This commit is contained in:
Santiago
2024-03-19 12:47:13 +01:00
committed by GitHub
parent 365fd2cb72
commit 4ad6d66479
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/ngalert/remote/alertmanager.go
View File

@@ -210,7 +210,6 @@ func (am *Alertmanager) CompareAndSendConfiguration(ctx context.Context, config
ctx,
string(rawDecrypted),
config.ConfigurationHash,
config.ID,
config.CreatedAt,
config.Default,
); err != nil {

3
pkg/services/ngalert/remote/alertmanager_test.go
View File

@@ -285,7 +285,6 @@ func TestIntegrationRemoteAlertmanagerApplyConfigOnlyUploadsOnce(t *testing.T) {
fakeConfigHash := fmt.Sprintf("%x", md5.Sum([]byte(testGrafanaConfig)))
fakeConfigCreatedAt := time.Date(2020, 6, 5, 12, 6, 0, 0, time.UTC).Unix()
fakeConfig := &ngmodels.AlertConfiguration{
ID: 100,
AlertmanagerConfiguration: testGrafanaConfig,
ConfigurationHash: fakeConfigHash,
ConfigurationVersion: "v2",
@@ -340,7 +339,6 @@ func TestIntegrationRemoteAlertmanagerApplyConfigOnlyUploadsOnce(t *testing.T) {
// Next, we need to verify that Mimir received both the configuration and state.
config, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
require.NoError(t, err)
require.Equal(t, int64(100), config.ID)
require.Equal(t, testGrafanaConfig, config.GrafanaAlertmanagerConfig)
require.Equal(t, fakeConfigHash, config.Hash)
require.Equal(t, fakeConfigCreatedAt, config.CreatedAt)
@@ -364,7 +362,6 @@ func TestIntegrationRemoteAlertmanagerApplyConfigOnlyUploadsOnce(t *testing.T) {
// Next, we need to verify that the config that was uploaded remains the same.
config, err := am.mimirClient.GetGrafanaAlertmanagerConfig(ctx)
require.NoError(t, err)
require.Equal(t, int64(100), config.ID)
require.Equal(t, testGrafanaConfig, config.GrafanaAlertmanagerConfig)
require.Equal(t, fakeConfigHash, config.Hash)
require.Equal(t, fakeConfigCreatedAt, config.CreatedAt)

4
pkg/services/ngalert/remote/client/alertmanager_configuration.go
View File

@@ -13,7 +13,6 @@ const (
)
type UserGrafanaConfig struct {
ID int64 `json:"id"`
GrafanaAlertmanagerConfig string `json:"configuration"`
Hash string `json:"configuration_hash"`
CreatedAt int64 `json:"created"`
@@ -39,9 +38,8 @@ func (mc *Mimir) GetGrafanaAlertmanagerConfig(ctx context.Context) (*UserGrafana
return gc, nil
}
func (mc *Mimir) CreateGrafanaAlertmanagerConfig(ctx context.Context, cfg, hash string, id, createdAt int64, isDefault bool) error {
func (mc *Mimir) CreateGrafanaAlertmanagerConfig(ctx context.Context, cfg, hash string, createdAt int64, isDefault bool) error {
payload, err := json.Marshal(&UserGrafanaConfig{
ID: id,
GrafanaAlertmanagerConfig: cfg,
Hash: hash,
CreatedAt: createdAt,

2
pkg/services/ngalert/remote/client/mimir.go
View File

@@ -23,7 +23,7 @@ type MimirClient interface {
DeleteGrafanaAlertmanagerState(ctx context.Context) error
GetGrafanaAlertmanagerConfig(ctx context.Context) (*UserGrafanaConfig, error)
CreateGrafanaAlertmanagerConfig(ctx context.Context, configuration, hash string, id, updatedAt int64, isDefault bool) error
CreateGrafanaAlertmanagerConfig(ctx context.Context, configuration, hash string, createdAt int64, isDefault bool) error
DeleteGrafanaAlertmanagerConfig(ctx context.Context) error
}