put pbs-m1 to the first place

CESNET · May 6, 2024 · 8fb3979 · 8fb3979
1 parent 3f2efa4
commit 8fb3979
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 31 deletions.
diff --git a/metaacct_cmd/src/main/java/cz/cesnet/meta/acct/hw/Statistics.java b/metaacct_cmd/src/main/java/cz/cesnet/meta/acct/hw/Statistics.java
@@ -43,11 +43,15 @@ public static void regularStatistics() throws DatatypeConfigurationException {
 
     public static void manualStatistics() {
         Stats stats = new ClassPathXmlApplicationContext("spring-context.xml").getBean("stats", Stats.class);
+//        generateStats(stats, absoluteDate(2024, 3, 21), relativeDate(-1));
+//        generateStats(stats, absoluteDate(2024, 2, 21), relativeDate(-31));
+//        generateStats(stats, absoluteDate(2023, 12, 21), relativeDate(-93));
+
 //        generateStats(stats, relativeDate(-3), relativeDate(-1));
 //        generateStats(stats, relativeDate(-33), relativeDate(-31));
 //        generateStats(stats, relativeDate(-95), relativeDate(-93));
 
-        recompute("cha.natur.cuni.cz", "2021-02-02", "2021-02-03", stats);
+//        recompute("alfrid.meta.zcu.cz", "2024-03-27", "2024-04-02", stats);
 //        recompute("safedx.metacentrum.cz", "2018-08-24", "2018-08-26", stats);
 //        recompute("elixir-storage1.grid.cesnet.cz", "2017-07-24", "2017-07-24", stats);
 //        recompute("tarkil.grid.cesnet.cz", "2016-11-02", stats);

diff --git a/pbsmon/src/main/resources/StripesResources_cs.properties b/pbsmon/src/main/resources/StripesResources_cs.properties
@@ -75,7 +75,7 @@ jobs_X=pod\u00FAloha hotova
 mapping.titul=P\u0159i\u0159azen\u00ED virtu\u00E1ln\u00EDch stroj\u016F na fyzick\u00E9
 
 #menu
-menu_headline=PBSPro monitor
+menu_headline=PBS monitor
 menu_jobslink=\u00DAlohy
 menu_nodeslink=Stroje
 menu_propslink=Vlastnosti
@@ -352,7 +352,7 @@ warning1_title=Probl\u00E9m
 warning2_label=Upozorn\u011Bn\u00ED
 warning3_label=OK
 nodejsp_ganglia=Informace z Ganglie:
-nodejsp_pbs=Information from PBSPro:
+nodejsp_pbs=Information from PBS:
 users_jobs_othercpu=ostatn\u00ED CPU
 users_jobs_otherjob=ostatn\u00ED \u00FAlohy
 users_jobs_runjob=be\u017E\u00EDc\u00ED \u00FAlohy
@@ -450,7 +450,7 @@ qsub_torque_text1=Tato str\u00E1nka umo\u017E\u0148uje sestavit parametry p\u015
 qsub_torque_text2=Nab\u00EDzeny jsou pouze v\u00FDpo\u010Detn\u00ED prost\u0159edky dostupn\u00E9 u\u017Eivateli <b>{0}</b>.
 qsub_torque_accessible_queues=Fronty dostupn\u00E9 u\u017Eivateli {0} v pl\u00E1nova\u010D\u00EDch Torque
 
-qsub_pbspro_headline=Sestavova\u010D qsub pro PBSPro
-qsub_pbspro_text1=Tato str\u00E1nka umo\u017E\u0148uje sestavit parametry p\u0159\u00EDkazu qsub pro zad\u00E1v\u00E1n\u00ED \u00FAloh pro pl\u00E1nova\u010D PBSPro a odhadnout, na kter\u00FDch stroj\u00EDch by se \u00FAloha mohla spustit.
+qsub_pbspro_headline=Sestavova\u010D qsub pro PBS
+qsub_pbspro_text1=Tato str\u00E1nka umo\u017E\u0148uje sestavit parametry p\u0159\u00EDkazu qsub pro zad\u00E1v\u00E1n\u00ED \u00FAloh pro pl\u00E1nova\u010D PBS a odhadnout, na kter\u00FDch stroj\u00EDch by se \u00FAloha mohla spustit.
 qsub_pbspro_text2=Nab\u00EDzeny jsou pouze v\u00FDpo\u010Detn\u00ED prost\u0159edky dostupn\u00E9 u\u017Eivateli <b>{0}</b>.
-qsub_pbspro_accessible_queues=Fronty dostupn\u00E9 u\u017Eivateli {0} v pl\u00E1nova\u010Di PBSPro
+qsub_pbspro_accessible_queues=Fronty dostupn\u00E9 u\u017Eivateli {0} v pl\u00E1nova\u010Di PBS
diff --git a/pbsmon/src/main/resources/StripesResources_en.properties b/pbsmon/src/main/resources/StripesResources_en.properties
@@ -62,7 +62,7 @@ job_variable_list=variables
 job_submitdir=directory for stdout
 job_workdir=working directory
 # menu
-menu_headline=PBSPro monitor
+menu_headline=PBS monitor
 menu_jobslink=Jobs
 menu_nodeslink=Nodes
 menu_propslink=Properties
@@ -94,7 +94,7 @@ nodejsp_name=name
 nodejsp_not_found=Node not found ...
 nodejsp_ntype=node type
 nodejsp_numcpu=CPU planned
-nodejsp_pbs=Information from PBSPro:
+nodejsp_pbs=Information from PBS:
 nodejsp_pbs_state=state in PBS
 nodejsp_properties=properties
 nodejsp_queue=dedicated to queue
@@ -459,10 +459,10 @@ qsub_torque_text1=This page assist in assembling correct parameters for the qsub
 qsub_torque_text2=Only computing resources avaliable to the user <b>{0}</b> are offered.
 qsub_torque_accessible_queues=Queues available for user {0} in Torque planners
 
-qsub_pbspro_headline=Qsub assembler for PBSPro
-qsub_pbspro_text1=This page assist in assembling correct parameters for the qsub command that is used for submitting jobs in PBSPro planners.
+qsub_pbspro_headline=Qsub assembler for PBS
+qsub_pbspro_text1=This page assist in assembling correct parameters for the qsub command that is used for submitting jobs in PBS planners.
 qsub_pbspro_text2=Only computing resources avaliable to the user <b>{0}</b> are offered.
-qsub_pbspro_accessible_queues=Queues available for user {0} in PBSPro planners
+qsub_pbspro_accessible_queues=Queues available for user {0} in PBS planners
 
 
 
diff --git a/pbsmon/src/main/webapp/WEB-INF/spring-context.xml b/pbsmon/src/main/webapp/WEB-INF/spring-context.xml
@@ -22,6 +22,26 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"
         <constructor-arg>
             <list value-type="cz.cesnet.meta.pbs.PbsServerConfig">
 
+                <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
+                    <property name="shortName" value="pbs-m1"/>
+                    <property name="host" value="pbs-m1.metacentrum.cz"/>
+                    <property name="main" value="false"/>
+                    <property name="torque" value="false"/>
+                    <property name="by_queue" value="false"/>
+                    <property name="planbased" value="true"/>
+                    <property name="pbsCaller" value="/home/pbsmon/openpbs/openpbscaller.sh"/>
+                    <property name="fairshares">
+                        <list>
+                            <bean class="cz.cesnet.meta.pbs.FairshareConfig">
+                                <constructor-arg name="tree" value="default" />
+                                <constructor-arg name="metrics" value="fairshare" />
+                                <constructor-arg name="id" value="m1" />
+                            </bean>
+                        </list>
+                    </property>
+                    <property name="groupFile" value="/etc/pbsmon/group/pbs-m1"/>
+                </bean>
+
                 <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
                     <property name="shortName" value="meta"/>
                     <property name="host" value="meta-pbs.metacentrum.cz"/>
@@ -51,26 +71,6 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"
                     <property name="groupFile" value="/etc/pbsmon/group/meta-pbs"/>
                 </bean>
 
-                <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
-                    <property name="shortName" value="pbs-m1"/>
-                    <property name="host" value="pbs-m1.metacentrum.cz"/>
-                    <property name="main" value="false"/>
-                    <property name="torque" value="false"/>
-                    <property name="by_queue" value="false"/>
-                    <property name="planbased" value="true"/>
-                    <property name="pbsCaller" value="/home/pbsmon/openpbs/openpbscaller.sh"/>
-                    <property name="fairshares">
-                        <list>
-                            <bean class="cz.cesnet.meta.pbs.FairshareConfig">
-                                <constructor-arg name="tree" value="default" />
-                                <constructor-arg name="metrics" value="fairshare" />
-                                <constructor-arg name="id" value="m1" />
-                            </bean>
-                        </list>
-                    </property>
-                    <property name="groupFile" value="/etc/pbsmon/group/pbs-m1"/>
-                </bean>
-
                 <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
                     <property name="shortName" value="cerit"/>
                     <property name="host" value="cerit-pbs.cerit-sc.cz"/>