Merge branch 'main' into create-cm-on-cluster-action-oss

# Conflicts:
#	env_gen.json
#	go.mod
#	go.sum
#	pkg/delete/DeleteService.go
#	vendor/modules.txt

Author: prakash100198

App.go

@@ -56,6 +56,7 @@ type App struct {
 	server        *http.Server
 	db            *pg.DB
 	posthogClient *posthogTelemetry.PosthogClient
+	userService   user.UserService
 	// eventProcessor.CentralEventProcessor is used to register event processors
 	centralEventProcessor *eventProcessor.CentralEventProcessor // do not remove this.
 	// used for local dev only
@@ -79,6 +80,7 @@ func NewApp(router *router.MuxRouter,
 	pubSubClient *pubsub.PubSubClientServiceImpl,
 	workflowEventProcessorImpl *in.WorkflowEventProcessorImpl,
 	enforcerV2 *casbinv2.SyncedEnforcer,
+	userService user.UserService,
 ) *App {
 	//check argo connection
 	//todo - check argo-cd version on acd integration installation
@@ -97,6 +99,7 @@ func NewApp(router *router.MuxRouter,
 		centralEventProcessor:      centralEventProcessor,
 		pubSubClient:               pubSubClient,
 		workflowEventProcessorImpl: workflowEventProcessorImpl,
+		userService:                userService,
 	}
 	return app
 }
@@ -112,7 +115,7 @@ func (app *App) Start() {
 	app.MuxRouter.Init()
 	//authEnforcer := casbin2.Create()
 
-	server := &http.Server{Addr: fmt.Sprintf(":%d", port), Handler: authMiddleware.Authorizer(app.sessionManager2, user.WhitelistChecker, nil)(app.MuxRouter.Router)}
+	server := &http.Server{Addr: fmt.Sprintf(":%d", port), Handler: authMiddleware.Authorizer(app.sessionManager2, user.WhitelistChecker, app.userService.CheckUserStatusAndUpdateLoginAudit)(app.MuxRouter.Router)}
 	app.MuxRouter.Router.Use(app.loggingMiddleware.LoggingMiddleware)
 	app.MuxRouter.Router.Use(middleware.PrometheusMiddleware)
 	app.MuxRouter.Router.Use(middlewares.Recovery)

Wire.go

@@ -303,6 +303,9 @@ func InitializeApp() (*App, error) {
 		pipeline.NewCiMaterialConfigServiceImpl,
 		wire.Bind(new(pipeline.CiMaterialConfigService), new(*pipeline.CiMaterialConfigServiceImpl)),
 
+		app.NewDeploymentEventHandlerImpl,
+		wire.Bind(new(app.DeploymentEventHandler), new(*app.DeploymentEventHandlerImpl)),
+
 		pipeline.NewAppArtifactManagerImpl,
 		wire.Bind(new(pipeline.AppArtifactManager), new(*pipeline.AppArtifactManagerImpl)),
 		pipeline.NewDevtronAppCMCSServiceImpl,

api/bean/AppView/AppView.go

@@ -64,6 +64,7 @@ type GenericNoteResponseBean struct {
 	Description string    `json:"description"`
 	UpdatedBy   string    `json:"updatedBy"`
 	UpdatedOn   time.Time `json:"updatedOn"`
+	CreatedBy   string    `json:"createdBy"`
 }
 
 type JobContainer struct {
@@ -100,6 +101,7 @@ type JobListingContainer struct {
 	LastTriggeredEnvironmentName string    `sql:"last_triggered_environment_name" json:"lastTriggeredEnvironmentName"`
 	LastTriggeredEnvironmentId   int       `sql:"last_triggered_environment_id" json:"lastEnvironmentId"`
 	ProjectId                    int       `sql:"team_id" json:"projectId"`
+	CreatedBy                    int32     `sql:"created_by" json:"createdBy"`
 }
 
 type CiPipelineLastSucceededTime struct {

api/k8s/application/k8sApplicationRestHandler.go

@@ -1025,6 +1025,8 @@ func (handler *K8sApplicationRestHandlerImpl) CreateEphemeralContainer(w http.Re
 		return
 	}
 	request.UserId = userId
+	request.ExternalArgoAppIdentifier = resourceRequestBean.ExternalArgoAppIdentifier
+
 	err = handler.k8sApplicationService.CreatePodEphemeralContainers(&request)
 	if err != nil {
 		handler.logger.Errorw("error occurred in creating ephemeral container", "err", err, "requestPayload", request)
@@ -1073,6 +1075,7 @@ func (handler *K8sApplicationRestHandlerImpl) DeleteEphemeralContainer(w http.Re
 		return
 	}
 	request.UserId = userId
+	request.ExternalArgoAppIdentifier = resourceRequestBean.ExternalArgoAppIdentifier
 	_, err = handler.k8sApplicationService.TerminatePodEphemeralContainer(request)
 	if err != nil {
 		handler.logger.Errorw("error occurred in terminating ephemeral container", "err", err, "requestPayload", request)
@@ -1156,6 +1159,7 @@ func (handler *K8sApplicationRestHandlerImpl) verifyRbacForAppRequests(token str
 			handler.logger.Errorw("error in decoding appId", "err", err, "appId", request.AppId)
 			return false, err
 		}
+		request.ExternalArgoAppIdentifier = argoAppIdentifier
 		request.ClusterId = argoAppIdentifier.ClusterId
 		request.ExternalArgoApplicationName = argoAppIdentifier.AppName
 		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)

api/restHandler/app/pipeline/AutoCompleteRestHandler.go

@@ -18,6 +18,7 @@ package pipeline
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
@@ -93,6 +94,24 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 	v := r.URL.Query()
 	teamId := v.Get("teamId")
 	appName := v.Get("appName")
+	offset := 0
+	size := 0 // default value is 0, it means if not provided in query param it will fetch all
+	sizeStr := v.Get("size")
+	if sizeStr != "" {
+		size, err = strconv.Atoi(sizeStr)
+		if err != nil || size < 0 {
+			common.WriteJsonResp(w, errors.New("invalid size"), nil, http.StatusBadRequest)
+			return
+		}
+	}
+	offsetStr := v.Get("offset")
+	if offsetStr != "" {
+		offset, err = strconv.Atoi(offsetStr)
+		if err != nil || offset < 0 {
+			common.WriteJsonResp(w, errors.New("invalid offset"), nil, http.StatusBadRequest)
+			return
+		}
+	}
 	appTypeParam := v.Get("appType")
 	var appType int
 	if appTypeParam != "" {
@@ -131,6 +150,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 		}
 	}
 	if isActionUserSuperAdmin {
+		apps = handler.getPaginatedResultsForApps(offset, size, apps)
 		common.WriteJsonResp(w, err, apps, http.StatusOK)
 		return
 	}
@@ -161,6 +181,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 	}
 	span.End()
 	// RBAC
+	accessedApps = handler.getPaginatedResultsForApps(offset, size, accessedApps)
 	common.WriteJsonResp(w, err, accessedApps, http.StatusOK)
 }
 
@@ -290,3 +311,14 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) TeamListAutocomplete(w http
 
 	common.WriteJsonResp(w, err, result, http.StatusOK)
 }
+
+func (handler DevtronAppAutoCompleteRestHandlerImpl) getPaginatedResultsForApps(offset int, size int, apps []*pipeline.AppBean) []*pipeline.AppBean {
+	if size > 0 {
+		if offset+size <= len(apps) {
+			apps = apps[offset : offset+size]
+		} else {
+			apps = apps[offset:]
+		}
+	}
+	return apps
+}

client/telemetry/TelemetryEventClient.go

@@ -263,6 +263,8 @@ func (impl *TelemetryEventClientImpl) SummaryDetailsForTelemetry() (cluster []be
 	return clusters, users, k8sServerVersion, hostURL, ssoSetup, HelmAppAccessCount, ChartStoreVisitCount, SkippedOnboarding, HelmAppUpdateCounter, helmChartSuccessfulDeploymentCount, ExternalHelmAppClusterCount
 }
 
+// New methods for collecting additional telemetry metrics
+
 func (impl *TelemetryEventClientImpl) SummaryEventForTelemetryEA() {
 	err := impl.SendSummaryEvent(string(Summary))
 	if err != nil {
@@ -310,6 +312,11 @@ func (impl *TelemetryEventClientImpl) SendSummaryEvent(eventType string) error {
 	payload.HelmChartSuccessfulDeploymentCount = helmChartSuccessfulDeploymentCount
 	payload.ExternalHelmAppClusterCount = ExternalHelmAppClusterCount
 
+	// Collect EA-mode compatible telemetry metrics
+	payload.HelmAppCount = impl.getHelmAppCount()
+	payload.PhysicalClusterCount, payload.IsolatedClusterCount = impl.getClusterCounts()
+	payload.ActiveUsersLast30Days = impl.getActiveUsersLast30Days()
+
 	payload.ClusterProvider, err = impl.GetCloudProvider()
 	if err != nil {
 		impl.logger.Errorw("error while getting cluster provider", "error", err)

client/telemetry/TelemetryEventClientExtended.go

@@ -26,6 +26,7 @@ import (
 	installedAppReader "github.com/devtron-labs/devtron/pkg/appStore/installedApp/read"
 	"github.com/devtron-labs/devtron/pkg/auth/sso"
 	user2 "github.com/devtron-labs/devtron/pkg/auth/user"
+	authPolicyRepository "github.com/devtron-labs/devtron/pkg/auth/user/repository"
 	"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/read"
 	repository3 "github.com/devtron-labs/devtron/pkg/build/git/gitProvider/repository"
 	"github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
@@ -34,6 +35,8 @@ import (
 	"github.com/devtron-labs/devtron/pkg/cluster/environment"
 	"github.com/devtron-labs/devtron/pkg/deployment/gitOps/config"
 	moduleRepo "github.com/devtron-labs/devtron/pkg/module/repo"
+	pluginRepository "github.com/devtron-labs/devtron/pkg/plugin/repository"
+	cvePolicyRepository "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/repository"
 	serverDataStore "github.com/devtron-labs/devtron/pkg/server/store"
 	ucidService "github.com/devtron-labs/devtron/pkg/ucid"
 	util3 "github.com/devtron-labs/devtron/pkg/util"
@@ -68,6 +71,11 @@ type TelemetryEventClientImplExtended struct {
 	chartRepository               chartRepoRepository.ChartRepository
 	ciBuildConfigService          pipeline.CiBuildConfigService
 	gitOpsConfigReadService       config.GitOpsConfigReadService
+	// Additional repositories for FULL-mode telemetry metrics
+	pluginRepository            pluginRepository.GlobalPluginRepository
+	cvePolicyRepository         cvePolicyRepository.CvePolicyRepository
+	defaultAuthPolicyRepository authPolicyRepository.DefaultAuthPolicyRepository
+	rbacPolicyRepository        authPolicyRepository.RbacPolicyDataRepository
 	*TelemetryEventClientImpl
 }
 
@@ -85,7 +93,12 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 	ciBuildConfigService pipeline.CiBuildConfigService, moduleRepository moduleRepo.ModuleRepository, serverDataStore *serverDataStore.ServerDataStore,
 	helmAppClient client.HelmAppClient, installedAppReadService installedAppReader.InstalledAppReadService, userAttributesRepository repository.UserAttributesRepository,
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
-	gitOpsConfigReadService config.GitOpsConfigReadService, envVariables *util.EnvironmentVariables) (*TelemetryEventClientImplExtended, error) {
+	gitOpsConfigReadService config.GitOpsConfigReadService, envVariables *util.EnvironmentVariables,
+	// Optional repositories for additional telemetry metrics
+	pluginRepository pluginRepository.GlobalPluginRepository,
+	cvePolicyRepository cvePolicyRepository.CvePolicyRepository,
+	defaultAuthPolicyRepository authPolicyRepository.DefaultAuthPolicyRepository,
+	rbacPolicyRepository authPolicyRepository.RbacPolicyDataRepository) (*TelemetryEventClientImplExtended, error) {
 
 	cron := cron.New(
 		cron.WithChain(cron.Recover(cronLogger)))
@@ -105,6 +118,11 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 		chartRepository:               chartRepository,
 		ciBuildConfigService:          ciBuildConfigService,
 		gitOpsConfigReadService:       gitOpsConfigReadService,
+		// Initialize FULL-mode specific repositories
+		pluginRepository:            pluginRepository,
+		cvePolicyRepository:         cvePolicyRepository,
+		defaultAuthPolicyRepository: defaultAuthPolicyRepository,
+		rbacPolicyRepository:        rbacPolicyRepository,
 		TelemetryEventClientImpl: &TelemetryEventClientImpl{
 			cron:                           cron,
 			logger:                         logger,
@@ -319,6 +337,21 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 	payload.HelmChartSuccessfulDeploymentCount = HelmChartSuccessfulDeploymentCount
 	payload.ExternalHelmAppClusterCount = ExternalHelmAppClusterCount
 
+	// Collect new telemetry metrics
+	payload.HelmAppCount = impl.getHelmAppCount()
+	payload.DevtronAppCount = impl.getDevtronAppCount()
+	payload.JobCount = impl.getJobCount()
+	payload.JobPipelineCount = impl.getJobPipelineCount()
+	payload.JobPipelineTriggeredLast24h = impl.getJobPipelineTriggeredLast24h()
+	payload.JobPipelineSucceededLast24h = impl.getJobPipelineSucceededLast24h()
+	payload.UserCreatedPluginCount = impl.getUserCreatedPluginCount()
+	payload.PolicyCount = impl.getPolicyCount()
+	payload.AppliedPolicyRowCount = impl.getAppliedPolicyRowCount()
+	payload.PhysicalClusterCount, payload.IsolatedClusterCount = impl.getClusterCounts()
+	payload.ActiveUsersLast30Days = impl.getActiveUsersLast30Days()
+	payload.GitOpsPipelineCount = impl.getGitOpsPipelineCount()
+	payload.HelmPipelineCount = impl.helmPipelineCount()
+
 	payload.ClusterProvider, err = impl.GetCloudProvider()
 	if err != nil {
 		impl.logger.Errorw("error while getting cluster provider", "error", err)
@@ -374,7 +407,11 @@ func (impl *TelemetryEventClientImplExtended) getCiBuildTypeData() (int, int, in
 func (impl *TelemetryEventClientImplExtended) getCiBuildTypeVsStatusVsCount() (successCount map[bean.CiBuildType]int, failureCount map[bean.CiBuildType]int) {
 	successCount = make(map[bean.CiBuildType]int)
 	failureCount = make(map[bean.CiBuildType]int)
-	buildTypeAndStatusVsCount := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	buildTypeAndStatusVsCount, err := impl.ciWorkflowRepository.FindBuildTypeAndStatusDataOfLast1Day()
+	if err != nil {
+		impl.logger.Errorw("error getting build type vs status vs count data", "err", err)
+		return successCount, failureCount
+	}
 	for _, buildTypeCount := range buildTypeAndStatusVsCount {
 		if buildTypeCount == nil {
 			continue

client/telemetry/bean.go

@@ -75,6 +75,11 @@ type TelemetryEventEA struct {
 	HelmChartSuccessfulDeploymentCount int                `json:"helmChartSuccessfulDeploymentCount,omitempty"`
 	ExternalHelmAppClusterCount        map[int32]int      `json:"ExternalHelmAppClusterCount,omitempty"`
 	ClusterProvider                    string             `json:"clusterProvider,omitempty"`
+	// New telemetry fields
+	HelmAppCount          int `json:"helmAppCount,omitempty"`
+	PhysicalClusterCount  int `json:"physicalClusterCount,omitempty"`
+	IsolatedClusterCount  int `json:"isolatedClusterCount,omitempty"`
+	ActiveUsersLast30Days int `json:"activeUsersLast30Days,omitempty"`
 }
 
 const AppsCount int = 50
@@ -136,4 +141,19 @@ type TelemetryEventDto struct {
 	HelmChartSuccessfulDeploymentCount   int                `json:"helmChartSuccessfulDeploymentCount,omitempty"`
 	ExternalHelmAppClusterCount          map[int32]int      `json:"ExternalHelmAppClusterCount"`
 	ClusterProvider                      string             `json:"clusterProvider,omitempty"`
+	// New telemetry fields
+	HelmAppCount                int `json:"helmAppCount,omitempty"`
+	DevtronAppCount             int `json:"devtronAppCount,omitempty"`
+	JobCount                    int `json:"jobCount,omitempty"`
+	JobPipelineCount            int `json:"jobPipelineCount,omitempty"`
+	JobPipelineTriggeredLast24h int `json:"jobPipelineTriggeredLast24h,omitempty"`
+	JobPipelineSucceededLast24h int `json:"jobPipelineSucceededLast24h,omitempty"`
+	UserCreatedPluginCount      int `json:"userCreatedPluginCount,omitempty"`
+	PolicyCount                 int `json:"policyCount,omitempty"`
+	AppliedPolicyRowCount       int `json:"appliedPolicyRowCount,omitempty"`
+	PhysicalClusterCount        int `json:"physicalClusterCount,omitempty"`
+	IsolatedClusterCount        int `json:"isolatedClusterCount,omitempty"`
+	ActiveUsersLast30Days       int `json:"activeUsersLast30Days,omitempty"`
+	GitOpsPipelineCount         int `json:"gitOpsPipelineCount,omitempty"`
+	HelmPipelineCount           int `json:"helmPipelineCount,omitempty"`
 }

client/telemetry/telemetryQueries.go

@@ -0,0 +1,58 @@
+package telemetry
+
+// EA-mode compatible telemetry queries - no imports needed for current methods
+
+func (impl *TelemetryEventClientImpl) getHelmAppCount() int {
+	if impl.installedAppReadService == nil {
+		impl.logger.Warnw("installedAppReadService not available for helm app count")
+		return -1
+	}
+	count, err := impl.installedAppReadService.GetActiveInstalledAppCount()
+	if err != nil {
+		impl.logger.Errorw("error getting helm app count", "err", err)
+		return -1
+	}
+	return count
+}
+
+// EA-mode compatible telemetry methods
+
+func (impl *TelemetryEventClientImpl) getClusterCounts() (physicalCount int, isolatedCount int) {
+	clusters, err := impl.clusterService.FindAllActive()
+	if err != nil {
+		impl.logger.Errorw("error getting cluster counts", "err", err)
+		return -1, -1
+	}
+
+	physicalCount = 0
+	isolatedCount = 0
+
+	for _, cluster := range clusters {
+		if cluster.IsVirtualCluster {
+			isolatedCount++
+		} else {
+			physicalCount++
+		}
+	}
+
+	return physicalCount, isolatedCount
+}
+
+// Note: FULL-mode specific methods like getDevtronAppCount, getJobCount, etc.
+// are now implemented in TelemetryEventClientImplExtended in telemetryQueriesExtended.go
+
+func (impl *TelemetryEventClientImpl) getActiveUsersLast30Days() int {
+	if impl.userAuditService == nil {
+		impl.logger.Warnw("userAuditService not available for active users count")
+		return -1
+	}
+
+	count, err := impl.userAuditService.GetActiveUsersCountInLast30Days()
+	if err != nil {
+		impl.logger.Errorw("error getting active users count in last 30 days", "err", err)
+		return -1
+	}
+
+	impl.logger.Debugw("counted active users in last 30 days", "count", count)
+	return count
+}