This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 9aff8c85b add id in external link (#3967)
9aff8c85b is described below
commit 9aff8c85bacd991570609319fc440d347b1a0b3a
Author: ShawHee <[email protected]>
AuthorDate: Thu Aug 15 16:55:26 2024 +0800
add id in external link (#3967)
Co-authored-by: ShawHee <[email protected]>
---
.../org/apache/streampark/console/core/enums/PlaceholderTypeEnum.java | 2 ++
.../streampark/console/core/service/impl/ExternalLinkServiceImpl.java | 1 +
.../src/views/setting/extlink/components/Modal.vue | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/PlaceholderTypeEnum.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/PlaceholderTypeEnum.java
index 5f453a708..46d611527 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/PlaceholderTypeEnum.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/PlaceholderTypeEnum.java
@@ -20,6 +20,8 @@ package org.apache.streampark.console.core.enums;
/** configFile Type enum */
public enum PlaceholderTypeEnum {
+ ID("id"),
+
JOB_ID("job_id"),
JOB_NAME("job_name"),
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
index d2eae02af..c1fe57b62 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -85,6 +85,7 @@ public class ExternalLinkServiceImpl extends
ServiceImpl<ExternalLinkMapper, Ext
private void renderLinkUrl(ExternalLink link, Application app) {
Map<String, String> placeholderValueMap = new HashMap<>();
+ placeholderValueMap.put(PlaceholderTypeEnum.ID.get(),
String.valueOf(app.getId()));
placeholderValueMap.put(PlaceholderTypeEnum.JOB_ID.get(),
app.getJobId());
placeholderValueMap.put(PlaceholderTypeEnum.JOB_NAME.get(),
app.getJobName());
placeholderValueMap.put(PlaceholderTypeEnum.YARN_ID.get(),
app.getClusterId());
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue
b/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue
index e2545f844..b8c4381aa 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/extlink/components/Modal.vue
@@ -98,7 +98,7 @@
h(
'span',
{ class: 'tip-info' },
- 'Supported variables: {job_id}, {yarn_id}, {job_name},Example:
https://grafana/flink-monitoring?var-JobId=var-JobId={job_id}',
+ 'Supported variables: {id}, {job_id}, {yarn_id},
{job_name},Example:
https://grafana/flink-monitoring?var-JobId=var-JobId={job_id}',
),
rules: [
{