Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cpueff webpage #279

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Update cpueff webpage #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4a478
Update html of cpueff page
nikodemas Aug 20, 2024
86e1a10
Update os-cms link building
nikodemas Aug 20, 2024
2c3436e
Update wmarchive link building
nikodemas Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cpueff-goweb/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"link_monte_carlo_management": "<a href=\"https://cms-pdmv.cern.ch/mcm/requests?prepid=[[__WORKFLOW__]]\" target=\"_blank\" >McM</a>",
"link_dmytro_prod_mon": "<a href=\"https://dmytro.web.cern.ch/dmytro/cmsprodmon/workflows.php?prep_id=task_[[__WORKFLOW__]]\" target=\"_blank\">PMon</a>",
"link_unified_report": "<a href=\"https://cms-unified.web.cern.ch/cms-unified/report/[[__WMAGENT_REQUEST_NAME__]]\" target=\"_blank\">Unified</a>",
"link_es_cms": "<a href=\"https://es-cms.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:!(Site,CMS_JobType,RequestCpus,CpuEff,CpuTimeHr,WallClockHr,CommittedCoreHr,CommittedWallClockHr,RequestMemory,RequestMemory_Eval,Tier,ChirpCMSSWReadTimeMsecs,ChirpCMSSWElapsed),filters:!(),index:'d2ea6f80-d2e0-11ed-bdae-e3cf8c07f2fc',interval:auto,query:(language:lucene,query:'Tier:%2FT1%7CT2%2F%20AND%20Workflow:%22[[__WORKFLOW__]]%22%20AND%20WMAgent_RequestName:%22[[__WMAGENT_REQUEST_NAME__]]%22%20AND%20CpuEffOutlier:0%20AND%20Status:Completed%20AND%20JobFailed:0'),sort:!())\" target=\"_blank\">ES_T1T2</a>",
"link_es_cms_with_site": "<a href=\"https://es-cms.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:!(Site,CMS_JobType,RequestCpus,CpuEff,CpuTimeHr,WallClockHr,CommittedCoreHr,CommittedWallClockHr,RequestMemory,RequestMemory_Eval,ChirpCMSSWReadTimeMsecs,ChirpCMSSWElapsed),filters:!(),index:'d2ea6f80-d2e0-11ed-bdae-e3cf8c07f2fc',interval:auto,query:(language:lucene,query:'Site:%22[[__SITE__]]%22%20AND%20Workflow:%22[[__WORKFLOW__]]%22%20AND%20WMAgent_RequestName:%22[[__WMAGENT_REQUEST_NAME__]]%22%20AND%20CpuEffOutlier:0%20AND%20Status:Completed%20AND%20JobFailed:0'),sort:!())\" target=\"_blank\">ES</a>",
"link_es_cms": "<a href=\"https://os-cms.cern.ch/dashboards/app/data-explorer/discover/#?_a=(discover:(columns:!(Site,CMS_JobType,RequestCpus,CpuEff,CpuTimeHr,WallClockHr,CommittedCoreHr,CommittedWallClockHr,RequestMemory,RequestMemory_Eval,Tier,ChirpCMSSWReadTimeMsecs,ChirpCMSSWElapsed),interval:auto,sort:!()),metadata:(indexPattern:d2ea6f80-d2e0-11ed-bdae-e3cf8c07f2fc,view:discover))&_q=(filters:!(),query:(language:lucene,query:'Tier:%2FT1%7CT2%2F%20AND%20Workflow:%22[[__WORKFLOW__]]%22%20AND%20WMAgent_RequestName:%22[[__WMAGENT_REQUEST_NAME__]]%22%20AND%20CpuEffOutlier:0%20AND%20Status:Completed%20AND%20JobFailed:0'))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))\" target=\"_blank\">ES_T1T2</a>",
"link_es_cms_with_site": "<a href=\"https://os-cms.cern.ch/dashboards/app/data-explorer/discover/#?_a=(discover:(columns:!(Site,CMS_JobType,RequestCpus,CpuEff,CpuTimeHr,WallClockHr,CommittedCoreHr,CommittedWallClockHr,RequestMemory,RequestMemory_Eval,ChirpCMSSWReadTimeMsecs,ChirpCMSSWElapsed),interval:auto,sort:!()),metadata:(indexPattern:d2ea6f80-d2e0-11ed-bdae-e3cf8c07f2fc,view:discover))&_q=(filters:!(),query:(language:lucene,query:'Site:%22[[__SITE__]]%22%20AND%20Workflow:%22[[__WORKFLOW__]]%22%20AND%20WMAgent_RequestName:%22[[__WMAGENT_REQUEST_NAME__]]%22%20AND%20CpuEffOutlier:0%20AND%20Status:Completed%20AND%20JobFailed:0'))&_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'[[__START_DATE__]]T00:00:00.000Z',to:'[[__END_DATE__]]T00:00:00.000Z'))\" target=\"_blank\">ES</a>",
"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>"
}
}
3 changes: 2 additions & 1 deletion cpueff-goweb/controllers/stepchain_page_controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}

Expand Down
2 changes: 1 addition & 1 deletion cpueff-goweb/static/templates/index.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
</div>


<div class="container" style="margin-top: 2em">
<div class="container" style="margin-top: 4em">
<div class="row">
<div class="col-2">

Expand Down
Loading