From 2c3436ea36afff3507c0bd92474d8f43c8ac3825 Mon Sep 17 00:00:00 2001
From: Nikodemas Tuckus <ntuckus@gmail.com>
Date: Tue, 20 Aug 2024 16:31:59 +0200
Subject: [PATCH] Update wmarchive link building

---
 cpueff-goweb/config.json                               | 4 ++--
 cpueff-goweb/controllers/stepchain_page_controllers.go | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cpueff-goweb/config.json b/cpueff-goweb/config.json
index b979cf97..f9b307e1 100644
--- a/cpueff-goweb/config.json
+++ b/cpueff-goweb/config.json
@@ -37,7 +37,7 @@
         "link_grafana": "<a href=\"https://monit-grafana.cern.ch/d/svwndNBVk/cpu-efficiency-investigation-used-by-web-service?orgId=11&from=[[__START_DATE_MSEC__]]&to=[[__END_DATE_MSEC__]]&var-Bin=1h&var-Site=All&var-Workflow=[[__WORKFLOW__]]&var-WMAgent_RequestName=[[__WMAGENT_REQUEST_NAME__]]\" target=\"_blank\">Grafana</a>",
         "link_grafana_with_site": "<a href=\"https://monit-grafana.cern.ch/d/svwndNBVk/cpu-efficiency-investigation-used-by-web-service?orgId=11&from=[[__START_DATE_MSEC__]]&to=[[__END_DATE_MSEC__]]&var-Bin=1h&var-Site=[[__SITE__]]&var-Workflow=[[__WORKFLOW__]]&var-WMAgent_RequestName=[[__WMAGENT_REQUEST_NAME__]]\" target=\"_blank\">Grafana</a>",
         "link_reqmgr": "<a href=\"https://cmsweb.cern.ch/reqmgr2/fetch?rid=[[__TASK_NAME_PREFIX__]]\" target=\"_blank\">RegMgr</a>",
-        "link_es_wmarchive": "<a href=\"https://monit-opensearch.cern.ch/dashboards/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))&_a=(columns:!(data.meta_data.jobtype,data.meta_data.jobstate,data.task,data.Campaign,data.PrepID,data.meta_data.fwjr_id,data.meta_data.host),filters:!(),index:'60770470-8326-11ea-88fc-cfaa9841e350',interval:auto,query:(language:lucene,query:'data.meta_data.jobstate:%22success%22%20%20AND%20data.task:%22[[__TASK_NAME__]]%22'),sort:!(!(metadata.timestamp,desc)))\" target=\"_blank\">WMArc</a>",
-        "link_es_wmarchive_jobtype": "<a href=\"https://monit-opensearch.cern.ch/dashboards/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))&_a=(columns:!(data.meta_data.jobtype,data.meta_data.jobstate,data.task,data.Campaign,data.PrepID,data.meta_data.fwjr_id,data.meta_data.host),filters:!(),index:'60770470-8326-11ea-88fc-cfaa9841e350',interval:auto,query:(language:lucene,query:'data.meta_data.jobtype:%22[[__JOB_TYPE__]]%22%20AND%20data.meta_data.jobstate:%22success%22%20%20AND%20data.task:%22[[__TASK_NAME__]]%22'),sort:!(!(metadata.timestamp,desc)))\" target=\"_blank\">WMArc</a>"
+        "link_es_wmarchive": "<a href=\"https://monit-opensearch.cern.ch/dashboards/app/data-explorer/discover/#?_a=(discover:(columns:!(data.meta_data.jobtype,data.meta_data.jobstate,data.task,data.Campaign,data.PrepID,data.meta_data.fwjr_id,data.meta_data.host),interval:auto,sort:!(!(metadata.timestamp,desc))),metadata:(indexPattern:'60770470-8326-11ea-88fc-cfaa9841e350',view:discover))&_q=(filters:!(),query:(language:lucene,query:'data.meta_data.jobstate:%22success%22%20%20AND%20data.task:%22[[__TASK_NAME__]]%22'))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))\" target=\"_blank\">WMArc</a>",
+        "link_es_wmarchive_jobtype": "<a href=\"https://monit-opensearch.cern.ch/dashboards/app/data-explorer/discover/#?_a=(discover:(columns:!(data.meta_data.jobtype,data.meta_data.jobstate,data.task,data.Campaign,data.PrepID,data.meta_data.fwjr_id,data.meta_data.host),interval:auto,sort:!(!(metadata.timestamp,desc))),metadata:(indexPattern:'60770470-8326-11ea-88fc-cfaa9841e350',view:discover))&_q=(filters:!(),query:(language:lucene,query:'data.meta_data.jobtype:%22[[__JOB_TYPE__]]%22%20AND%20data.meta_data.jobstate:%22success%22%20%20AND%20data.task:%22[[__TASK_NAME__]]%22'))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))\" target=\"_blank\">WMArc</a>"
     }
 }
diff --git a/cpueff-goweb/controllers/stepchain_page_controllers.go b/cpueff-goweb/controllers/stepchain_page_controllers.go
index 3c8daab2..ea91cd94 100644
--- a/cpueff-goweb/controllers/stepchain_page_controllers.go
+++ b/cpueff-goweb/controllers/stepchain_page_controllers.go
@@ -145,10 +145,11 @@ func utilScTaskCmsrunJobtypeExternalLinks(cpuEffs []models.StepchainTaskWithCmsr
 			links.StrEndDate, dataTimestamp.EndDate,
 			links.StrTaskNamePrefix, utilGetTaskNamePrefix(cpuEffs[i].Task),
 			links.StrTaskName, cpuEffs[i].Task,
+			links.StrJobType, cpuEffs[i].JobType,
 		)
 		// Kibana needs full task name, but reqmgr2 accepts only "X" from task name of "/X/Y"
 		// Assign complete link HTML dom to the 'Links' column : "ReqMgr - WMArchive(MONIT)"
-		cpuEffs[i].Links = template.HTML(replacer.Replace(links.LinkReqMgr + " - " + links.LinkEsWmarchive))
+		cpuEffs[i].Links = template.HTML(replacer.Replace(links.LinkReqMgr + " - " + links.LinkEsWmarchiveJobType))
 	}
 }