From 6e2047ebcb09e1d2d9ced7cac8981da3ab371723 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 21 Mar 2025 18:54:39 +0530 Subject: [PATCH 1/2] fix in CreateGrafanaDataSource --- pkg/cluster/ClusterServiceExtended.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cluster/ClusterServiceExtended.go b/pkg/cluster/ClusterServiceExtended.go index 6ae1fe00bd..eb556b3fae 100644 --- a/pkg/cluster/ClusterServiceExtended.go +++ b/pkg/cluster/ClusterServiceExtended.go @@ -294,7 +294,7 @@ func (impl *ClusterServiceImplExtended) CreateGrafanaDataSource(clusterBean *bea if grafanaDatasourceId == 0 { //starts grafana creation createDatasourceReq := grafana.CreateDatasourceRequest{ - Name: "Prometheus-" + env.Name, + Name: "Prometheus-" + env.Name + "-EnvId-" + fmt.Sprint(env.Id), Type: "prometheus", Url: clusterBean.PrometheusUrl, Access: "proxy", From 45fc38ced6a7ffd27827ab8bc6d90eebcb4c6136 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Fri, 21 Mar 2025 18:59:32 +0530 Subject: [PATCH 2/2] fix in CreateGrafanaDataSource --- pkg/cluster/ClusterServiceExtended.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/cluster/ClusterServiceExtended.go b/pkg/cluster/ClusterServiceExtended.go index eb556b3fae..cbd673cd60 100644 --- a/pkg/cluster/ClusterServiceExtended.go +++ b/pkg/cluster/ClusterServiceExtended.go @@ -293,8 +293,10 @@ func (impl *ClusterServiceImplExtended) CreateGrafanaDataSource(clusterBean *bea grafanaDatasourceId := env.GrafanaDatasourceId if grafanaDatasourceId == 0 { //starts grafana creation + // appending envId to ensure unique datasource name for each environment (ex- env got deleted and created with same name) + DataSourceName := "Prometheus-" + env.Name + "-EnvId-" + fmt.Sprint(env.Id) createDatasourceReq := grafana.CreateDatasourceRequest{ - Name: "Prometheus-" + env.Name + "-EnvId-" + fmt.Sprint(env.Id), + Name: DataSourceName, Type: "prometheus", Url: clusterBean.PrometheusUrl, Access: "proxy",