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

Job monitor simplification #753

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Job monitor simplification #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff4a8e
fix: removed several fields that are not anymore in use
fstagni Jan 19, 2024
024d086
fix: added VO selector
fstagni Feb 8, 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
5 changes: 4 additions & 1 deletion src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from DIRAC import gConfig, gLogger
from DIRAC.Core.Utilities import DictCache
from DIRAC.Core.Utilities.Graphs.Palette import Palette
from DIRAC.RequestManagementSystem.Client.Request import Request
from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient
from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
Expand Down Expand Up @@ -256,6 +255,10 @@ def _request(self):
if ownerGroup:
req["OwnerGroup"] = ownerGroup

vo = list(json.loads(self.get_argument("vo", "[]")))
if vo:
req["vo"] = vo

if self.get_argument("startDate", ""):
req["FromDate"] = self.get_argument("startDate")
if self.get_argument("startTime", ""):
Expand Down
60 changes: 8 additions & 52 deletions src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
return oReturn;
},
dataFields: [
{
name: "SystemPriority",
type: "float",
},
{
name: "ApplicationNumStatus",
},
{
name: "JobID",
type: "int",
Expand All @@ -98,9 +91,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
{
name: "VerifiedFlag",
},
{
name: "RetrievedFlag",
},
{
name: "Status",
},
Expand All @@ -113,9 +103,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
name: "RescheduleCounter",
type: "int",
},
{
name: "JobSplitType",
},
{
name: "MinorStatus",
},
Expand All @@ -130,12 +117,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
{
name: "JobType",
},
{
name: "MasterJobID",
},
{
name: "KilledFlag",
},
{
name: "RescheduleTime",
},
Expand All @@ -151,12 +132,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
{
name: "JobName",
},
{
name: "AccountedFlag",
},
{
name: "OSandboxReadyFlag",
},
{
name: "LastUpdateTime",
type: "date",
Expand All @@ -171,23 +146,17 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
dateFormat: "Y-m-d H:i:s",
},
{
name: "OwnerGroup",
name: "VO",
},
{
name: "ISandboxReadyFlag",
name: "OwnerGroup",
},
{
name: "UserPriority",
},
{
name: "Owner",
},
{
name: "DeletedFlag",
},
{
name: "TaskQueueID",
},
{
name: "JobType",
},
Expand Down Expand Up @@ -258,6 +227,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
appStatus: "Application Status",
owner: "Owner",
OwnerGroup: "OwnerGroup",
VO: "VO",
jobGroup: "Job Group",
jobType: "Job Type",
};
Expand All @@ -283,6 +253,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
["status", "status"],
["types", "jobType"],
["OwnerGroup", "OwnerGroup"],
fstagni marked this conversation as resolved.
Show resolved Hide resolved
["VO", "VO"],
];

me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", {
Expand Down Expand Up @@ -414,6 +385,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
Site: {
dataIndex: "Site",
},
VO: {
dataIndex: "VO",
},
JobName: {
dataIndex: "JobName",
properties: {
Expand Down Expand Up @@ -478,27 +452,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
hidden: true,
},
},
AccountedFlag: {
dataIndex: "AccountedFlag",
properties: {
hidden: true,
},
},
OSandboxReadyFlag: {
dataIndex: "OSandboxReadyFlag",
properties: {
hidden: true,
},
},
Owner: {
dataIndex: "Owner",
},
TaskQueueID: {
dataIndex: "TaskQueueID",
properties: {
hidden: true,
},
},
OwnerGroup: {
dataIndex: "OwnerGroup",
},
Expand Down Expand Up @@ -727,7 +683,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
mode: "local",
store: new Ext.data.ArrayStore({
fields: ["category"],
data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["Owner Group"], ["Job Group"], ["Job Type"]],
data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["Owner Group"], ["VO"], ["Job Group"], ["Job Type"]],
}),
triggerAction: "all",
value: "Status",
Expand Down
Loading