Alerting: Remove ID from UserGrafanaConfig struct (#84602)

* Alerting: Remove ID from UserGrafanaConfig struct * user custom mimir image withoud id in grafana config * change mimir image name
2025-02-25 18:55:37 -06:00 · 2024-03-19 12:47:13 +01:00 · 2024-03-19 12:47:13 +01:00 · 4ad6d66479
commit 4ad6d66479
parent 365fd2cb72
7 changed files with 11 additions and 17 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -877,7 +877,7 @@ services:
 - commands:
  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
  environment: {}
-  image: grafana/mimir:r274-1780c50
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  name: mimir_backend
 - environment: {}
  image: redis:6.2.11-alpine
@ -1325,7 +1325,7 @@ services:
 - commands:
  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
  environment: {}
-  image: grafana/mimir:r274-1780c50
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  name: mimir_backend
 - environment: {}
  image: redis:6.2.11-alpine
@ -2326,7 +2326,7 @@ services:
 - commands:
  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
  environment: {}
-  image: grafana/mimir:r274-1780c50
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  name: mimir_backend
 - environment: {}
  image: redis:6.2.11-alpine
@ -4124,7 +4124,7 @@ services:
 - commands:
  - /bin/mimir -target=backend -alertmanager.grafana-alertmanager-compatibility-enabled
  environment: {}
-  image: grafana/mimir:r274-1780c50
+  image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  name: mimir_backend
 - environment: {}
  image: redis:6.2.11-alpine
@ -4642,7 +4642,7 @@ steps:
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir:r274-1780c50
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine
@ -4677,7 +4677,7 @@ steps:
  - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
  - trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8
  - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
-  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir:r274-1780c50
+  - trivy --exit-code 1 --severity HIGH,CRITICAL us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
  - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
  - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32
  - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine
@ -4922,6 +4922,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: feb0603ccd1169c54e142a4b0105bc6d2805e5e0f4d8f0e1b0edd95d41d450b9
+hmac: 474420078e68f3b51a76abb99ba723671130f524ed00c42e66169c6912b6fbba

 ...
--- a/devenv/docker/blocks/mimir_backend/docker-compose.yaml
+++ b/devenv/docker/blocks/mimir_backend/docker-compose.yaml
@ -1,5 +1,5 @@
  mimir_backend:
-    image: grafana/mimir:r274-1780c50
+    image: us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP
    container_name: mimir_backend
    command:
      - -target=backend
--- a/pkg/services/ngalert/remote/alertmanager.go
+++ b/pkg/services/ngalert/remote/alertmanager.go
@ -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 {
--- a/pkg/services/ngalert/remote/alertmanager_test.go
+++ b/pkg/services/ngalert/remote/alertmanager_test.go
@ -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)
--- a/pkg/services/ngalert/remote/client/alertmanager_configuration.go
+++ b/pkg/services/ngalert/remote/client/alertmanager_configuration.go
@ -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,
--- a/pkg/services/ngalert/remote/client/mimir.go
+++ b/pkg/services/ngalert/remote/client/mimir.go
@ -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
 }

--- a/scripts/drone/utils/images.star
+++ b/scripts/drone/utils/images.star
@ -20,7 +20,7 @@ images = {
    "plugins_slack": "plugins/slack",
    "python": "python:3.8",
    "postgres_alpine": "postgres:12.3-alpine",
-    "mimir": "grafana/mimir:r274-1780c50",
+    "mimir": "us.gcr.io/kubernetes-dev/mimir:santihernandezc-remove_id_from_grafana_config-d3826b4f8-WIP",
    "mysql5": "mysql:5.7.39",
    "mysql8": "mysql:8.0.32",
    "redis_alpine": "redis:6.2.11-alpine",