Merge main

Author: Ashish-devtron

Wire.go

@@ -233,6 +233,8 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
 		util.NewChartTemplateServiceImpl,
 		wire.Bind(new(util.ChartTemplateService), new(*util.ChartTemplateServiceImpl)),
+		util.NewChartDeploymentServiceImpl,
+		wire.Bind(new(util.ChartDeploymentService), new(*util.ChartDeploymentServiceImpl)),
 		chart.NewChartServiceImpl,
 		wire.Bind(new(chart.ChartService), new(*chart.ChartServiceImpl)),
 		bulkAction.NewBulkUpdateServiceImpl,

api/bean/AppView.go

@@ -153,6 +153,7 @@ type DeploymentDetailContainer struct {
 	IpsAccessProvided             bool            `json:"ipsAccessProvided"`
 	DeploymentAppDeleteRequest    bool            `json:"deploymentAppDeleteRequest"`
 	Description                   string          `json:"description" validate:"max=40"`
+	IsVirtualEnvironment          bool            `json:"isVirtualEnvironment"`
 }
 
 type AppDetailContainer struct {
@@ -182,6 +183,7 @@ type Environment struct {
 	LastDeployed               string `json:"lastDeployed"`
 	DeploymentAppDeleteRequest bool   `json:"deploymentAppDeleteRequest"`
 	Description                string `json:"description" validate:"max=40"`
+	IsVirtualEnvironment       bool   `json:"isVirtualEnvironment"`
 }
 
 type InstanceDetail struct {

api/bean/ValuesOverrideRequest.go

@@ -20,6 +20,7 @@ package bean
 import (
 	"encoding/json"
 	"github.com/devtron-labs/devtron/internal/sql/models"
+	"time"
 )
 
 type WorkflowType string
@@ -49,9 +50,16 @@ type ValuesOverrideRequest struct {
 	DeploymentWithConfig                  DeploymentConfigurationType `json:"deploymentWithConfig"`
 	WfrIdForDeploymentWithSpecificTrigger int                         `json:"wfrIdForDeploymentWithSpecificTrigger"`
 	CdWorkflowType                        WorkflowType                `json:"cdWorkflowType,notnull"`
+	WfrId                                 int                         `json:"wfrId,notnull"`
 	CdWorkflowId                          int                         `json:"cdWorkflowId"`
 	UserId                                int32                       `json:"-"`
 	DeploymentType                        models.DeploymentType       `json:"-"`
+	EnvId                                 int                         `json:"-"`
+	EnvName                               string                      `json:"-"`
+	ClusterId                             int                         `json:"-"`
+	AppName                               string                      `json:"-"`
+	PipelineName                          string                      `json:"-"`
+	DeploymentAppType                     string                      `json:"-"`
 }
 
 type BulkCdDeployEvent struct {
@@ -63,3 +71,12 @@ type ReleaseStatusUpdateRequest struct {
 	RequestId string             `json:"requestId"`
 	NewStatus models.ChartStatus `json:"newStatus"`
 }
+
+type TriggerEvent struct {
+	PerformGitOps              bool
+	PerformDeploymentOnCluster bool
+	GetManifestInResponse      bool
+	DeploymentAppType          string
+	TriggeredBy                int32
+	TriggerdAt                 time.Time
+}

api/restHandler/PipelineTriggerRestHandler.go

@@ -128,7 +128,7 @@ func (handler PipelineTriggerRestHandlerImpl) OverrideConfig(w http.ResponseWrit
 	}
 	ctx := context.WithValue(r.Context(), "token", acdToken)
 	_, span := otel.Tracer("orchestrator").Start(ctx, "workflowDagExecutor.ManualCdTrigger")
-	mergeResp, err := handler.workflowDagExecutor.ManualCdTrigger(&overrideRequest, ctx)
+	mergeResp, _, err := handler.workflowDagExecutor.ManualCdTrigger(&overrideRequest, ctx)
 	span.End()
 	if err != nil {
 		handler.logger.Errorw("request err, OverrideConfig", "err", err, "payload", overrideRequest)

cmd/external-app/wire.go

@@ -33,6 +33,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
+	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
 	appStoreDeploymentTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool"
 	appStoreDeploymentGitopsTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool/gitops"
 	"github.com/devtron-labs/devtron/pkg/attributes"
@@ -166,6 +167,13 @@ func InitializeApp() (*App, error) {
 
 		kubernetesResourceAuditLogs.Newk8sResourceHistoryServiceImpl,
 		wire.Bind(new(kubernetesResourceAuditLogs.K8sResourceHistoryService), new(*kubernetesResourceAuditLogs.K8sResourceHistoryServiceImpl)),
+
+		util.NewChartTemplateServiceImpl,
+		wire.Bind(new(util.ChartTemplateService), new(*util.ChartTemplateServiceImpl)),
+		wire.Value(util.ChartWorkingDir("/tmp/charts/")),
+		wire.Value(appStoreBean.RefChartProxyDir("scripts/devtron-reference-helm-charts")),
+		util.NewGitFactory,
+		util.NewGitCliUtil,
 	)
 	return &App{}, nil
 }

cmd/external-app/wire_gen.go

@@ -0,0 +1,38 @@
+# Prerequisite to setup Prometheus Stack over Devtron
+
+## Introduction
+
+Prometheus is an open-source technology designed to provide monitoring and alerting functionality for cloud-native environments, including Kubernetes. It can collect and store metrics as time-series data, recording information with a timestamp. It can also collect and record labels, which are optional key-value pairs.
+
+### **Open Devtron dashboard and select chartstore from side panel**
+
+### Search for Prometheus and choose the kube-prometheus-stack chart of prometheus-community repo.
+![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/use-cases/prometheus-stack/prome.png)
+
+
+### ***We have to configure below values in values.yaml***
+```yaml
+1. search for kube-state-metrics and add below data
+
+   kube-state-metrics:
+    metricLabelsAllowlist:
+      - pods=[*]
+
+2. search for podMonitorSelectorNilUsesHelmValues and make it false 
+ podMonitorSelectorNilUsesHelmValues: false
+
+3. search for serviceMonitorSelectorNilUsesHelmValues and make it false
+serviceMonitorSelectorNilUsesHelmValues: false
+
+```
+
+
+
+
+
+### **After Configuring the values.yaml click on Update and Deploy button**
+
+Here we can see the all the resources of this stack are in healthy state . 
+
+![](https://devtron-public-asset.s3.us-east-2.amazonaws.com/images/use-cases/prometheus-stack/prometheus-demo.png)
+

docs/user-guide/use-cases/prometheus-stack-over-devtron.md

@@ -371,6 +371,7 @@ func (impl AppListingRepositoryImpl) deploymentDetailsByAppIdAndEnvId(ctx contex
 		" cia.id as ci_artifact_id," +
 		" cl.k8s_version," +
 		" env.cluster_id," +
+		" env.is_virtual_environment," +
 		" cl.cluster_name" +
 		" FROM pipeline p" +
 		" INNER JOIN pipeline_config_override pco on pco.pipeline_id=p.id" +
@@ -647,7 +648,7 @@ func (impl AppListingRepositoryImpl) FetchOtherEnvironment(appId int) ([]*bean.E
 func (impl AppListingRepositoryImpl) FetchMinDetailOtherEnvironment(appId int) ([]*bean.Environment, error) {
 	impl.Logger.Debug("reached at FetchMinDetailOtherEnvironment:")
 	var otherEnvironments []*bean.Environment
-	query := `SELECT p.environment_id,env.environment_name,env.description, env.default as prod, p.deployment_app_delete_request,
+	query := `SELECT p.environment_id,env.environment_name,env.description,env.is_virtual_environment, env.default as prod, p.deployment_app_delete_request,
        			env_app_m.app_metrics,env_app_m.infra_metrics from 
  				(SELECT pl.id,pl.app_id,pl.environment_id,pl.deleted, pl.deployment_app_delete_request from pipeline pl 
   					LEFT JOIN pipeline_config_override pco on pco.pipeline_id = pl.id where pl.app_id = ? and pl.deleted = FALSE 

internal/sql/repository/AppListingRepository.go

@@ -67,7 +67,7 @@ type PipelineOverrideRepository interface {
 	GetLatestReleaseByPipelineIds(pipelineIds []int) (pipelineOverrides []*PipelineOverride, err error)
 	GetLatestReleaseDeploymentType(pipelineIds []int) ([]*PipelineOverride, error)
 	FetchHelmTypePipelineOverridesForStatusUpdate() (pipelines []*PipelineOverride, err error)
-	FindLatestByAppIdAndEnvId(appId, environmentId int) (pipelineOverrides *PipelineOverride, err error)
+	FindLatestByAppIdAndEnvId(appId, environmentId int, deploymentAppType string) (pipelineOverrides *PipelineOverride, err error)
 	FindLatestByCdWorkflowId(cdWorkflowId int) (pipelineOverride *PipelineOverride, err error)
 }
 
@@ -238,14 +238,14 @@ func (impl PipelineOverrideRepositoryImpl) FetchHelmTypePipelineOverridesForStat
 	return pipelines, err
 }
 
-func (impl PipelineOverrideRepositoryImpl) FindLatestByAppIdAndEnvId(appId, environmentId int) (pipelineOverrides *PipelineOverride, err error) {
+func (impl PipelineOverrideRepositoryImpl) FindLatestByAppIdAndEnvId(appId, environmentId int, deploymentAppType string) (pipelineOverrides *PipelineOverride, err error) {
 	var override PipelineOverride
 	err = impl.dbConnection.Model(&override).
 		Column("pipeline_override.*", "Pipeline").
 		Join("inner join pipeline p on p.id = pipeline_override.pipeline_id").
 		Where("pipeline.app_id =? ", appId).
 		Where("pipeline.environment_id =?", environmentId).
-		Where("p.deployment_app_type = ?", util.PIPELINE_DEPLOYMENT_TYPE_ACD).
+		Where("p.deployment_app_type = ?", deploymentAppType).
 		Where("p.deleted = ?", false).
 		Order("id DESC").Limit(1).
 		Select()