From 75a759f0eaa61e8b3268e22fa5cb3e3bf4a6693f Mon Sep 17 00:00:00 2001 From: pipipipipi43 <32703277+pipipipipi43@users.noreply.github.com> Date: Wed, 28 Jul 2021 20:59:22 +0800 Subject: [PATCH] add pipeline event url (#1189) --- modules/dop/services/cdp/cdp.go | 5 +++++ pkg/erda-configs/i18n/notify_item.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/dop/services/cdp/cdp.go b/modules/dop/services/cdp/cdp.go index 4ff0e33c03d..eb4c999efbb 100644 --- a/modules/dop/services/cdp/cdp.go +++ b/modules/dop/services/cdp/cdp.go @@ -24,6 +24,7 @@ import ( "github.com/erda-project/erda/apistructs" "github.com/erda-project/erda/bundle" + "github.com/erda-project/erda/modules/dop/conf" ) // CDP pipeline 结构体 @@ -165,9 +166,13 @@ func (cdp *CDP) CdpNotifyProcess(pipelineEvent *apistructs.PipelineInstanceEvent params := map[string]string{ "pipelineID": strconv.FormatUint(pipelineData.PipelineID, 10), "notifyItemName": notifyItem.DisplayName, + "appID": strconv.FormatUint(pipelineDetail.ApplicationID, 10), "appName": pipelineDetail.ApplicationName, + "projectID": strconv.FormatUint(pipelineDetail.ProjectID, 10), "projectName": pipelineDetail.ProjectName, + "orgName": pipelineDetail.OrgName, "branch": pipelineDetail.Branch, + "uiPublicURL": conf.UIPublicURL(), } //失败情况尝输出错误日志 if notifyItem.Name == "pipeline_failed" { diff --git a/pkg/erda-configs/i18n/notify_item.yml b/pkg/erda-configs/i18n/notify_item.yml index 35eeccd0fa3..32bb47f7cab 100644 --- a/pkg/erda-configs/i18n/notify_item.yml +++ b/pkg/erda-configs/i18n/notify_item.yml @@ -78,13 +78,13 @@ zh-CN: - 信息:{{message}} notify.pipeline.pipeline_success: 流水线运行成功 notify.pipeline.pipeline_success.markdown_template: |- - ### {{projectName}}/{{appName}} 流水线{{pipelineID}}运行成功 + ### {{projectName}}/{{appName}} 流水线 {{pipelineID}} 运行成功 {{uiPublicURL}}/{{orgName}}/dop/projects/{{projectID}}/apps/{{appID}}/pipeline?pipelineID={{pipelineID}} notify.pipeline.pipeline_running: 流水线开始运行 notify.pipeline.pipeline_running.markdown_template: |- ### {{projectName}}/{{appName}} 流水线{{pipelineID}}开始运行 notify.pipeline.pipeline_failed: 流水线运行失败 notify.pipeline.pipeline_failed.markdown_template: |- - ### {{projectName}}/{{appName}} 流水线{{pipelineID}}运行失败 + ### {{projectName}}/{{appName}} 流水线 {{pipelineID}} 运行失败 {{uiPublicURL}}/{{orgName}}/dop/projects/{{projectID}}/apps/{{appID}}/pipeline?pipelineID={{pipelineID}} {{failedDetail}} notify.issue.issue_create: 创建任务事件 notify.issue.issue_create.markdown_template: "事件【{{issue_title}}】{{content}}"