Merge pull request #146 from openinfradev/tks-issues-858

add Grafana URL to appserving DTO
openinfradev · Sep 1, 2023 · 8d25148 · 8d25148
2 parents 6aa387a + cb3f732
commit 8d25148
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/internal/usecase/app-serve-app.go b/internal/usecase/app-serve-app.go
@@ -41,14 +41,18 @@ type IAppServeAppUsecase interface {
 }
 
 type AppServeAppUsecase struct {
-	repo repository.IAppServeAppRepository
-	argo argowf.ArgoClient
+	repo             repository.IAppServeAppRepository
+	organizationRepo repository.IOrganizationRepository
+	appGroupRepo     repository.IAppGroupRepository
+	argo             argowf.ArgoClient
 }
 
 func NewAppServeAppUsecase(r repository.Repository, argoClient argowf.ArgoClient) IAppServeAppUsecase {
 	return &AppServeAppUsecase{
-		repo: r.AppServeApp,
-		argo: argoClient,
+		repo:             r.AppServeApp,
+		organizationRepo: r.Organization,
+		appGroupRepo:     r.AppGroup,
+		argo:             argoClient,
 	}
 }
 
@@ -183,12 +187,37 @@ func (u *AppServeAppUsecase) GetAppServeApps(organizationId string, showAll bool
 }
 
 func (u *AppServeAppUsecase) GetAppServeAppById(appId string) (*domain.AppServeApp, error) {
-	app, err := u.repo.GetAppServeAppById(appId)
+	asa, err := u.repo.GetAppServeAppById(appId)
 	if err != nil {
 		return nil, err
 	}
 
-	return app, nil
+	/************************
+	* Construct grafana URL *
+	************************/
+	organization, err := u.organizationRepo.Get(asa.OrganizationId)
+	if err != nil {
+		return asa, httpErrors.NewInternalServerError(errors.Wrap(err, fmt.Sprintf("Failed to get organization for app %s", asa.Name)), "S_FAILED_FETCH_ORGANIZATION", "")
+	}
+
+	appGroupsInPrimaryCluster, err := u.appGroupRepo.Fetch(domain.ClusterId(organization.PrimaryClusterId), nil)
+	if err != nil {
+		return asa, err
+	}
+
+	for _, appGroup := range appGroupsInPrimaryCluster {
+		if appGroup.AppGroupType == domain.AppGroupType_LMA {
+			applications, err := u.appGroupRepo.GetApplications(appGroup.ID, domain.ApplicationType_GRAFANA)
+			if err != nil {
+				return asa, err
+			}
+			if len(applications) > 0 {
+				asa.GrafanaUrl = applications[0].Endpoint + "/d/tks_appserving_dashboard/tks-appserving-dashboard?refresh=30s&var-cluster=" + asa.TargetClusterId + "&var-kubernetes_namespace_name=" + asa.Namespace + "&var-kubernetes_pod_name=All&var-kubernetes_container_name=main&var-TopK=10"
+			}
+		}
+	}
+
+	return asa, nil
 }
 
 func (u *AppServeAppUsecase) GetAppServeAppLatestTask(appId string) (*domain.AppServeAppTask, error) {

diff --git a/internal/usecase/stack.go b/internal/usecase/stack.go
@@ -333,7 +333,7 @@ func (u *StackUsecase) Get(ctx context.Context, stackId domain.StackId) (out dom
 
 	organization, err := u.organizationRepo.Get(cluster.OrganizationId)
 	if err != nil {
-		return out, httpErrors.NewInternalServerError(errors.Wrap(err, fmt.Sprintf("Failed to get organization for clusterId %s", cluster.OrganizationId)), "S_FAILED_FETCH_ORGANIZATION", "")
+		return out, httpErrors.NewInternalServerError(errors.Wrap(err, fmt.Sprintf("Failed to get organization for clusterId %s", domain.ClusterId(stackId))), "S_FAILED_FETCH_ORGANIZATION", "")
 	}
 
 	appGroups, err := u.appGroupRepo.Fetch(domain.ClusterId(stackId), nil)

diff --git a/pkg/domain/app-serve-app.go b/pkg/domain/app-serve-app.go
@@ -19,6 +19,7 @@ type AppServeApp struct {
 	TargetClusterId    string            `json:"targetClusterId,omitempty"`                // target cluster to which the app is deployed
 	TargetClusterName  string            `gorm:"-:all" json:"targetClusterName,omitempty"` // target cluster name
 	Status             string            `gorm:"index" json:"status,omitempty"`            // status is status of deployed app
+	GrafanaUrl         string            `json:"grafanaUrl,omitempty"`                     // grafana dashboard URL for deployed app
 	CreatedAt          time.Time         `gorm:"autoCreateTime:false" json:"createdAt" `
 	UpdatedAt          *time.Time        `gorm:"autoUpdateTime:false" json:"updatedAt"`
 	DeletedAt          *time.Time        `json:"deletedAt"`