Merge pull request #6518 from devtron-labs/main-sync-develop-14apr

vikramdevtron · web-flow · commit aebe5d3fe534 · 2025-04-14T13:33:24.000+05:30
sync: Main sync develop
diff --git a/api/cluster/EnvironmentRestHandler.go b/api/cluster/EnvironmentRestHandler.go
@@ -51,6 +51,7 @@ const ENV_DELETE_SUCCESS_RESP = "Environment deleted successfully."
 type EnvironmentRestHandler interface {
 	Create(w http.ResponseWriter, r *http.Request)
 	Get(w http.ResponseWriter, r *http.Request)
+	GetDataSourceName(w http.ResponseWriter, r *http.Request)
 	GetAll(w http.ResponseWriter, r *http.Request)
 	GetAllActive(w http.ResponseWriter, r *http.Request)
 	Update(w http.ResponseWriter, r *http.Request)
@@ -167,6 +168,34 @@ func (impl EnvironmentRestHandlerImpl) Get(w http.ResponseWriter, r *http.Reques
 	common.WriteJsonResp(w, err, bean, http.StatusOK)
 }
 
+func (impl EnvironmentRestHandlerImpl) GetDataSourceName(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	environmentName := vars["environmentName"]
+
+	bean, err := impl.environmentClusterMappingsService.FindOne(environmentName)
+	if err != nil {
+		impl.logger.Errorw("service err, Get", "err", err, "payload", bean)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+
+	// RBAC enforcer applying
+	token := r.Header.Get("token")
+	if ok := impl.enforcer.Enforce(token, casbin.ResourceGlobalEnvironment, casbin.ActionGet, bean.EnvironmentIdentifier); !ok {
+		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
+		return
+	}
+	//RBAC enforcer Ends
+
+	resp, err := impl.environmentClusterMappingsService.GetDataSourceName(bean)
+	if err != nil {
+		impl.logger.Errorw("service err, Get", "err", err, "env", environmentName)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, resp, http.StatusOK)
+}
+
 func (impl EnvironmentRestHandlerImpl) GetAll(w http.ResponseWriter, r *http.Request) {
 	environments, err := impl.environmentReadService.GetAll()
 	if err != nil {
diff --git a/api/cluster/EnvironmentRouter.go b/api/cluster/EnvironmentRouter.go
@@ -41,6 +41,10 @@ func (impl EnvironmentRouterImpl) InitEnvironmentClusterMappingsRouter(environme
 		Methods("GET").
 		Queries("environment", "{environment}").
 		HandlerFunc(impl.environmentClusterMappingsRestHandler.Get)
+	environmentClusterMappingsRouter.Path("/data-source-name").
+		Methods("GET").
+		Queries("environmentName", "{environmentName}").
+		HandlerFunc(impl.environmentClusterMappingsRestHandler.GetDataSourceName)
 	environmentClusterMappingsRouter.Path("").
 		Methods("GET").
 		Queries("id", "{id}").
diff --git a/client/grafana/GrafanaClient.go b/client/grafana/GrafanaClient.go
@@ -380,7 +380,7 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa
 	url = fmt.Sprintf(url, impl.config.GrafanaUsername, impl.config.GrafanaPassword)
 	req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(reqBody))
 	if err != nil {
-		// do not log url or req body as they contains sensitive data
+		// do not log url or req body as they contain sensitive data
 		impl.logger.Errorw("error while creating http request", "destinationURL", impl.config.DestinationURL, "err", err)
 		return nil, err
 	}
diff --git a/cmd/external-app/wire.go b/cmd/external-app/wire.go
@@ -59,6 +59,7 @@ import (
 	"github.com/devtron-labs/devtron/client/argocdServer/repoCredsK8sClient"
 	"github.com/devtron-labs/devtron/client/argocdServer/session"
 	"github.com/devtron-labs/devtron/client/dashboard"
+	"github.com/devtron-labs/devtron/client/grafana"
 	"github.com/devtron-labs/devtron/client/telemetry"
 	"github.com/devtron-labs/devtron/internal/sql/repository"
 	app2 "github.com/devtron-labs/devtron/internal/sql/repository/app"
@@ -145,6 +146,10 @@ func InitializeApp() (*App, error) {
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
 
+		grafana.GetGrafanaClientConfig,
+		grafana.NewGrafanaClientImpl,
+		wire.Bind(new(grafana.GrafanaClient), new(*grafana.GrafanaClientImpl)),
+
 		commonEnforcementFunctionsUtil.NewCommonEnforcementUtilImpl,
 		wire.Bind(new(commonEnforcementFunctionsUtil.CommonEnforcementUtil), new(*commonEnforcementFunctionsUtil.CommonEnforcementUtilImpl)),
 
diff --git a/cmd/external-app/wire_gen.go b/cmd/external-app/wire_gen.go
diff --git a/go.mod b/go.mod
@@ -307,8 +307,8 @@ require (
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250410055937-f65f6e252704
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250410055937-f65f6e252704
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250414075707-6076f6f97fb9
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250414075707-6076f6f97fb9
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7
diff --git a/go.sum b/go.sum
@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250410055937-f65f6e252704 h1:xjTvh5f01PARce9TeKjpO6QRM1GaR2fh56/x6+HZcaI=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250410055937-f65f6e252704/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250410055937-f65f6e252704 h1:qA1Ec4flLuUozww0C3MnE3VGpuacBMyT6QxMyqECtrA=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250410055937-f65f6e252704/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250414075707-6076f6f97fb9 h1:z72S6KALLrQ2VmW785FuPZpYJTFSzq1QflZJcQv8/O0=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250414075707-6076f6f97fb9/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250414075707-6076f6f97fb9 h1:o/wKBkZ6aGrFhSsDGSyQVTD3uurGH3db4zdWjRVLkI8=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250414075707-6076f6f97fb9/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
diff --git a/internal/sql/repository/chartConfig/EnvConfigOverrideRepository.go b/internal/sql/repository/chartConfig/EnvConfigOverrideRepository.go
@@ -73,7 +73,11 @@ type EnvConfigOverrideRepository interface {
 	UpdateWithTxn(envConfigOverride *EnvConfigOverride, tx *pg.Tx) (*EnvConfigOverride, error)
 
 	GetByAppIdEnvIdAndChartRefId(appId, envId int, chartRefId int) (*EnvConfigOverride, error)
-	GetAllOverridesForApp(appId int) ([]EnvConfigOverride, error)
+	// GetAllOverridesForApp will return all overrides []*EnvConfigOverride for an app by appId
+	// Note:
+	// EnvConfigOverride.Chart is not populated,
+	// as the chartRepoRepository.Chart contains the reference chart(in bytes).
+	GetAllOverridesForApp(appId int) ([]*EnvConfigOverride, error)
 }
 
 type EnvConfigOverrideRepositoryImpl struct {
@@ -360,13 +364,19 @@ func (r EnvConfigOverrideRepositoryImpl) GetByAppIdEnvIdAndChartRefId(appId, env
 	return eco, err
 }
 
-func (r EnvConfigOverrideRepositoryImpl) GetAllOverridesForApp(appId int) ([]EnvConfigOverride, error) {
-	var eco []EnvConfigOverride
+// GetAllOverridesForApp will return all overrides EnvConfigOverride for an app by appId
+// Note:
+// EnvConfigOverride.Chart is not populated,
+// as the chartRepoRepository.Chart contains the reference chart(in bytes).
+func (r EnvConfigOverrideRepositoryImpl) GetAllOverridesForApp(appId int) ([]*EnvConfigOverride, error) {
+	var eco []*EnvConfigOverride
 	err := r.dbConnection.
 		Model(&eco).
-		Column("env_config_override.*", "Chart").
+		Column("env_config_override.*").
+		Join("INNER JOIN charts").
+		JoinOn("charts.id = env_config_override.chart_id").
 		Where("env_config_override.active = ?", true).
-		Where("Chart.app_id =? ", appId).
+		Where("charts.app_id = ?", appId).
 		Select()
 	return eco, err
 }
diff --git a/pkg/chart/ChartService.go b/pkg/chart/ChartService.go
@@ -315,7 +315,7 @@ func (impl *ChartServiceImpl) Create(templateRequest bean3.TemplateRequest, ctx
 		return nil, err
 	}
 
-	err = impl.UpdateChartLocationForEnvironmentConfigs(templateRequest.AppId, chart.ChartRefId, templateRequest.UserId, version)
+	err = impl.updateChartLocationForEnvironmentConfigs(newCtx, templateRequest.AppId, chart.ChartRefId, templateRequest.UserId, version)
 	if err != nil {
 		impl.logger.Errorw("error in updating chart location in env overrides", "appId", templateRequest.AppId, "err", err)
 		return nil, err
@@ -350,8 +350,10 @@ func (impl *ChartServiceImpl) Create(templateRequest bean3.TemplateRequest, ctx
 	return chartVal, err
 }
 
-func (impl *ChartServiceImpl) UpdateChartLocationForEnvironmentConfigs(appId, chartRefId int, userId int32, version string) error {
-	envOverrides, err := impl.envConfigOverrideReadService.GetAllOverridesForApp(appId)
+func (impl *ChartServiceImpl) updateChartLocationForEnvironmentConfigs(ctx context.Context, appId, chartRefId int, userId int32, version string) error {
+	newCtx, span := otel.Tracer("orchestrator").Start(ctx, "ChartServiceImpl.updateChartLocationForEnvironmentConfigs")
+	defer span.End()
+	envOverrides, err := impl.envConfigOverrideReadService.GetAllOverridesForApp(newCtx, appId)
 	if err != nil {
 		impl.logger.Errorw("error in getting all overrides for app", "appId", appId, "err", err)
 		return err
@@ -661,7 +663,7 @@ func (impl *ChartServiceImpl) UpdateAppOverride(ctx context.Context, templateReq
 			return nil, err
 		}
 
-		err = impl.UpdateChartLocationForEnvironmentConfigs(templateRequest.AppId, templateRequest.ChartRefId, templateRequest.UserId, template.ChartVersion)
+		err = impl.updateChartLocationForEnvironmentConfigs(newCtx, templateRequest.AppId, templateRequest.ChartRefId, templateRequest.UserId, template.ChartVersion)
 		if err != nil {
 			impl.logger.Errorw("error in updating chart location in env overrides", "appId", templateRequest.AppId, "err", err)
 			return nil, err
diff --git a/pkg/cluster/ClusterServiceExtended.go b/pkg/cluster/ClusterServiceExtended.go
@@ -36,6 +36,8 @@ import (
 	repository2 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
 )
 
+const DataSourceNameFormat = "Prometheus-%s-EnvId-%d"
+
 // extends ClusterServiceImpl and enhances method of ClusterService with full mode specific errors
 type ClusterServiceImplExtended struct {
 	environmentRepository   repository.EnvironmentRepository
@@ -268,7 +270,8 @@ func (impl *ClusterServiceImplExtended) CreateGrafanaDataSource(clusterBean *bea
 		//starts grafana creation
 		// appending envId to ensure unique datasource name for each environment (ex- env got deleted and created with same name)
 		// reverting to old name will be done in next release
-		DataSourceName := "Prometheus-" + env.Name
+
+		DataSourceName := fmt.Sprintf(DataSourceNameFormat, env.Name, env.Id)
 		createDatasourceReq := grafana.CreateDatasourceRequest{
 			Name:      DataSourceName,
 			Type:      "prometheus",
diff --git a/pkg/cluster/environment/EnvironmentService.go b/pkg/cluster/environment/EnvironmentService.go
@@ -19,6 +19,7 @@ package environment
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/devtron-labs/devtron/client/grafana"
 	bean3 "github.com/devtron-labs/devtron/pkg/attributes/bean"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	bean4 "github.com/devtron-labs/devtron/pkg/cluster/bean"
@@ -45,6 +46,7 @@ import (
 
 type EnvironmentService interface {
 	FindOne(environment string) (*bean2.EnvironmentBean, error)
+	GetDataSourceName(*bean2.EnvironmentBean) (dataSourceData *bean2.DataSourceMetaData, err error)
 	Create(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
 	Update(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
 	GetAllActive() ([]bean2.EnvironmentBean, error)
@@ -80,14 +82,16 @@ type EnvironmentServiceImpl struct {
 	userAuthService      user.UserAuthService
 	attributesRepository repository2.AttributesRepository
 	clusterReadService   read.ClusterReadService
+	grafanaClient        grafana.GrafanaClient
 }
 
 func NewEnvironmentServiceImpl(environmentRepository repository.EnvironmentRepository,
 	clusterService cluster.ClusterService, logger *zap.SugaredLogger,
 	K8sUtil *util2.K8sServiceImpl, k8sInformerFactory informer.K8sInformerFactory,
 	//  propertiesConfigService pipeline.PropertiesConfigService,
 	userAuthService user.UserAuthService, attributesRepository repository2.AttributesRepository,
-	clusterReadService read.ClusterReadService) *EnvironmentServiceImpl {
+	clusterReadService read.ClusterReadService,
+	grafanaClient grafana.GrafanaClient) *EnvironmentServiceImpl {
 	return &EnvironmentServiceImpl{
 		environmentRepository: environmentRepository,
 		logger:                logger,
@@ -98,6 +102,25 @@ func NewEnvironmentServiceImpl(environmentRepository repository.EnvironmentRepos
 		userAuthService:      userAuthService,
 		attributesRepository: attributesRepository,
 		clusterReadService:   clusterReadService,
+		grafanaClient:        grafanaClient,
+	}
+}
+
+func (impl EnvironmentServiceImpl) GetDataSourceName(bean *bean2.EnvironmentBean) (*bean2.DataSourceMetaData, error) {
+	datasource := &bean2.DataSourceMetaData{}
+	if bean.DataSourceId == 0 || bean.PrometheusEndpoint == "" {
+		impl.logger.Debugw("grafana data source not configured for given", "dataSourceId", bean.DataSourceId)
+		return datasource, nil
+	} else {
+		impl.logger.Debugw("environment datasource", "datasource", bean.DataSourceId)
+		data, err := impl.grafanaClient.GetDatasource(bean.DataSourceId)
+		if err != nil {
+			impl.logger.Errorw("error in fetching datasource", "err", err)
+			return datasource, err
+		}
+		datasource.Name = data.Name
+		datasource.Id = bean.DataSourceId
+		return datasource, nil
 	}
 }
 
@@ -183,6 +206,7 @@ func (impl EnvironmentServiceImpl) FindOne(environment string) (*bean2.Environme
 		Default:               model.Default,
 		EnvironmentIdentifier: model.EnvironmentIdentifier,
 		Description:           model.Description,
+		DataSourceId:          model.GrafanaDatasourceId,
 	}
 	return bean, nil
 }
diff --git a/pkg/cluster/environment/bean/bean.go b/pkg/cluster/environment/bean/bean.go
@@ -39,6 +39,7 @@ type EnvironmentBean struct {
 	ClusterCAData          string            `json:"-"`
 	ClusterKeyData         string            `json:"-"`
 	ClusterCertData        string            `json:"-"`
+	DataSourceId           int               `json:"-"`
 }
 
 type EnvDto struct {
@@ -66,3 +67,8 @@ const (
 	PIPELINE_DEPLOYMENT_TYPE_HELM = "helm"
 	PIPELINE_DEPLOYMENT_TYPE_ACD  = "argo_cd"
 )
+
+type DataSourceMetaData struct {
+	Id   int    `json:"id"`
+	Name string `json:"name"`
+}
diff --git a/pkg/deployment/manifest/deploymentTemplate/read/chartEnvConfigOverride.go b/pkg/deployment/manifest/deploymentTemplate/read/chartEnvConfigOverride.go
@@ -1,9 +1,11 @@
 package read
 
 import (
+	"context"
 	"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/adapter"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/bean"
+	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
 )
 
@@ -18,7 +20,11 @@ type EnvConfigOverrideService interface {
 	FindChartByAppIdAndEnvIdAndChartRefId(appId, targetEnvironmentId int, chartRefId int) (*bean.EnvConfigOverride, error)
 	FindChartForAppByAppIdAndEnvId(appId, targetEnvironmentId int) (*bean.EnvConfigOverride, error)
 	GetByAppIdEnvIdAndChartRefId(appId, envId int, chartRefId int) (*bean.EnvConfigOverride, error)
-	GetAllOverridesForApp(appId int) ([]*bean.EnvConfigOverride, error)
+	// GetAllOverridesForApp will return all overrides []*bean.EnvConfigOverride for an app by appId
+	// Note:
+	// EnvConfigOverride.Chart is not populated,
+	// as the chartRepoRepository.Chart contains the reference chart(in bytes).
+	GetAllOverridesForApp(ctx context.Context, appId int) ([]*bean.EnvConfigOverride, error)
 }
 
 type EnvConfigOverrideReadServiceImpl struct {
@@ -132,15 +138,20 @@ func (impl EnvConfigOverrideReadServiceImpl) GetByAppIdEnvIdAndChartRefId(appId,
 	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
 }
 
-func (impl EnvConfigOverrideReadServiceImpl) GetAllOverridesForApp(appId int) ([]*bean.EnvConfigOverride, error) {
+func (impl EnvConfigOverrideReadServiceImpl) GetAllOverridesForApp(ctx context.Context, appId int) ([]*bean.EnvConfigOverride, error) {
+	_, span := otel.Tracer("orchestrator").Start(ctx, "EnvConfigOverrideReadServiceImpl.GetAllOverridesForApp")
+	defer span.End()
 	overrideDBObjs, err := impl.envConfigOverrideRepository.GetAllOverridesForApp(appId)
 	if err != nil {
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "envId", "err", err)
 		return nil, err
 	}
 	envConfigOverrides := make([]*bean.EnvConfigOverride, 0, len(overrideDBObjs))
 	for _, dbObj := range overrideDBObjs {
-		envConfigOverrides = append(envConfigOverrides, adapter.EnvOverrideDBToDTO(&dbObj))
+		if dbObj == nil {
+			continue // nil pointer handling
+		}
+		envConfigOverrides = append(envConfigOverrides, adapter.EnvOverrideDBToDTO(dbObj))
 	}
 	return envConfigOverrides, nil
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
diff --git a/wire_gen.go b/wire_gen.go

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa`
`380`	`380`	`url = fmt.Sprintf(url, impl.config.GrafanaUsername, impl.config.GrafanaPassword)`
`381`	`381`	`req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(reqBody))`
`382`	`382`	`if err != nil {`
`383`		`- // do not log url or req body as they contains sensitive data`
	`383`	`+ // do not log url or req body as they contain sensitive data`
`384`	`384`	`impl.logger.Errorw("error while creating http request", "destinationURL", impl.config.DestinationURL, "err", err)`
`385`	`385`	`return nil, err`
`386`	`386`	`}`