removed cerit-pbs

Author: martin-kuba

pbsmon/src/main/java/cz/cesnet/meta/stripes/JobsActionBean.java

@@ -34,13 +34,13 @@ public class JobsActionBean extends BaseActionBean {
     private static final long MILLIS_IN_HOUR = 3600000L;
     private static final long MILLIS_IN_15MINS = 15 * 60 * 1000;
     private static final int INTERVALS = 24 * 4;
-    int[] runningJobsCountersMins = new int[INTERVALS];
-    int[] queuedJobsCountersMins = new int[INTERVALS];
-    int[] runningCPUsCountersMins = new int[INTERVALS];
-    int[] queuedCPUsCountersMins = new int[INTERVALS];
-    int[] completedCountersMins = new int[INTERVALS];
-    int[] startedCountersMins = new int[INTERVALS];
-    int[] createdCountersMins = new int[INTERVALS];
+    int[] runningJobsCountersMins;
+    int[] queuedJobsCountersMins;
+    int[] runningCPUsCountersMins;
+    int[] queuedCPUsCountersMins;
+    int[] completedCountersMins;
+    int[] startedCountersMins;
+    int[] createdCountersMins;
     Map<Integer, Integer> jobsCPU = new TreeMap<Integer, Integer>();
     Map<Integer, Integer> waitingHoursJobs = new HashMap<Integer, Integer>();
     LinkedHashMap<String, String> warnings;
@@ -77,6 +77,14 @@ public Resolution detail() {
         int holdCPUs = 0;
         warnings = new LinkedHashMap<>(40);
         suspiciousJobs = new HashMap<>(40);
+        // zero
+        runningJobsCountersMins = new int[INTERVALS];
+        queuedJobsCountersMins = new int[INTERVALS];
+        runningCPUsCountersMins = new int[INTERVALS];
+        queuedCPUsCountersMins = new int[INTERVALS];
+        completedCountersMins = new int[INTERVALS];
+        startedCountersMins = new int[INTERVALS];
+        createdCountersMins = new int[INTERVALS];
         //ziskame ulohy
         for (PBS pbs : pbsky.getListOfPBS()) {
             for (Job job : pbs.getJobsById()) {

pbsmon/src/main/webapp/WEB-INF/spring-context.xml

@@ -21,7 +21,6 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"
     <bean id="servers" class="java.util.ArrayList">
         <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"/>
@@ -41,26 +40,6 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"
                     </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"/>
-                    <property name="main" value="false"/>
-                    <property name="torque" value="false"/>
-                    <property name="by_queue" value="false"/>
-                    <property name="planbased" value="true"/>
-                    <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="cerit" />
-                            </bean>
-                        </list>
-                    </property>
-                    <property name="groupFile" value="/etc/pbsmon/group/cerit-pbs"/>
-                </bean>
-
             </list>
         </constructor-arg>
     </bean>