diff --git a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java index d3b248e..0e54c90 100644 --- a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java +++ b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java @@ -33,7 +33,7 @@ public PBS loadData(PbsServerConfig serverConfig) { File tempStderrFile = File.createTempFile("stderr", ".txt"); File tmpDirectory = Paths.get(System.getProperty("java.io.tmpdir", "/tmp")).toFile(); - Process p = new ProcessBuilder("pbsprocaller", serverHost) + Process p = new ProcessBuilder(serverConfig.getPbsCaller(), serverHost) .inheritIO() .redirectOutput(tempStdoutFile) .redirectError(tempStderrFile) diff --git a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java index b3f844c..b8d2634 100644 --- a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java +++ b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java @@ -17,6 +17,7 @@ public class PbsServerConfig { private boolean by_queue; private List fairshares; private String groupFile; + private String pbsCaller = "pbsprocaller"; /** * If true, server uses plan-based scheduler, thus waiting jobs are sorted by planned_start instead of by queue priority and fairshare. */ @@ -92,6 +93,14 @@ public void setShortName(String shortName) { this.shortName = shortName; } + public String getPbsCaller() { + return pbsCaller; + } + + public void setPbsCaller(String pbsCaller) { + this.pbsCaller = pbsCaller; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/pbsmon/src/main/resources/StripesResources_cs.properties b/pbsmon/src/main/resources/StripesResources_cs.properties index 17ef646..84964a7 100644 --- a/pbsmon/src/main/resources/StripesResources_cs.properties +++ b/pbsmon/src/main/resources/StripesResources_cs.properties @@ -313,6 +313,7 @@ queues.titul=Fronty queues_total=celkem queue.titul=Fronta {0} server_meta-pbs.metacentrum.cz=Pl\u00E1nova\u010D infrastruktury MetaCentrum +server_pbs-m1.metacentrum.cz=OpenPBS pl\u00E1nova\u010D MetaCentra server_arien-pro.ics.muni.cz=Star\u00FD pl\u00E1nova\u010D infrastruktury MetaCentrum server_cerit-pbs.cerit-sc.cz=Pl\u00E1nova\u010D infrastruktury CERIT-SC server_wagap-pro.cerit-sc.cz=Star\u00FD pl\u00E1nova\u010D infrastruktury CERIT-SC diff --git a/pbsmon/src/main/resources/StripesResources_en.properties b/pbsmon/src/main/resources/StripesResources_en.properties index 8e71227..0d94dfe 100644 --- a/pbsmon/src/main/resources/StripesResources_en.properties +++ b/pbsmon/src/main/resources/StripesResources_en.properties @@ -337,6 +337,7 @@ props.titul=Machine properties queues.titul=Queues queue.titul=Queue {0} server_meta-pbs.metacentrum.cz=Planner for infrastructure MetaCentrum +server_pbs-m1.metacentrum.cz=OpenPBS planner for MetaCentrum server_arien-pro.ics.muni.cz=Old planner for infrastructure MetaCentrum server_cerit-pbs.cerit-sc.cz=Planner for infrastructure CERIT-SC server_wagap-pro.cerit-sc.cz=Old planner for infrastructure CERIT-SC diff --git a/pbsmon/src/main/webapp/WEB-INF/spring-context.xml b/pbsmon/src/main/webapp/WEB-INF/spring-context.xml index f5442b0..21de327 100644 --- a/pbsmon/src/main/webapp/WEB-INF/spring-context.xml +++ b/pbsmon/src/main/webapp/WEB-INF/spring-context.xml @@ -51,6 +51,26 @@ http://www.springframework.org/schema/tx/spring-tx.xsd" + + + + + + + + + + + + + + + + + + + +