cvs-admin | 2 Apr 2003 00:13

CVS: opennms/src/web/src/org/opennms/web/notification NotificationModel.java,1.3,1.4

Update of /cvsroot/opennms/opennms/src/web/src/org/opennms/web/notification
In directory sc8-pr-cvs1:/tmp/cvs-serv25778

Modified Files:
	NotificationModel.java 
Log Message:
Fixed a possible bug with the number of notifications outstanding.

Index: NotificationModel.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/src/org/opennms/web/notification/NotificationModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NotificationModel.java	8 Jan 2003 19:24:24 -0000	1.3
+++ NotificationModel.java	1 Apr 2003 22:13:53 -0000	1.4
 <at>  <at>  -60,7 +60,7  <at>  <at> 
     private final String OUTSTANDING      = "SELECT textmsg, numericmsg, notifyid, pagetime, respondtime,
answeredby, nodeid, interfaceid, serviceid, eventid FROM NOTIFICATIONS WHERE respondTime is NULL";
     private final String OUTSTANDING_COUNT = "SELECT COUNT(*) AS TOTAL FROM NOTIFICATIONS WHERE
respondTime is NULL";
     private final String USER_OUTSTANDING = "SELECT textmsg, numericmsg, notifyid, pagetime,
respondtime, answeredby, nodeid, interfaceid, serviceid, eventid FROM NOTIFICATIONS WHERE
(respondTime is NULL) AND notifications.notifyid in (SELECT DISTINCT usersnotified.notifyid FROM
usersnotified WHERE usersnotified.userid=?)";
-    private final String USER_OUTSTANDING_COUNT = "SELECT COUNT(*) AS TOTAL FROM NOTIFICATIONS WHERE
(respondTime is NULL) AND AND userID LIKE ?";
+    private final String USER_OUTSTANDING_COUNT = "SELECT COUNT(*) AS TOTAL FROM NOTIFICATIONS WHERE
(respondTime is NULL) AND notifications.notifyid in (SELECT DISTINCT usersnotified.notifyid FROM
usersnotified WHERE usersnotified.userid=?)";
(Continue reading)

cvs-admin | 7 Apr 2003 19:57

CVS: opennms/src/web/web/outage index.jsp,1.3,1.4

Update of /cvsroot/opennms/opennms/src/web/web/outage
In directory sc8-pr-cvs1:/tmp/cvs-serv12509

Modified Files:
	index.jsp 
Log Message:
Fixed small location error in outages' index.jsp - Thx Matt B.

Index: index.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/outage/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.jsp	7 Feb 2003 16:50:36 -0000	1.3
+++ index.jsp	7 Apr 2003 17:57:17 -0000	1.4
 <at>  <at>  -39,7 +39,7  <at>  <at> 
 <% String breadcrumb1 = "Outages"; %>
 <jsp:include page="/includes/header.jsp" flush="false" >
   <jsp:param name="title" value="Outages" />
-  <jsp:param name="location" value="outage" />
+  <jsp:param name="location" value="outages" />
   <jsp:param name="breadcrumb" value="<%=breadcrumb1%>" />  
 </jsp:include>

_______________________________________________
cvs mailing list (cvs <at> lists.opennms.org)
To subscribe, unsubscribe, or change your list options, go to:
http://lists.opennms.org/mailman/listinfo/cvs

(Continue reading)

cvs-admin | 16 Apr 2003 18:29

CVS: opennms/src/web/web/includes notification-box.jsp,1.3,1.4

Update of /cvsroot/opennms/opennms/src/web/web/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv4942

Modified Files:
	notification-box.jsp 
Log Message:
The notification box will now display the count for the specific user
who is logged in.

Index: notification-box.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/includes/notification-box.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notification-box.jsp	7 Feb 2003 16:50:33 -0000	1.3
+++ notification-box.jsp	16 Apr 2003 16:29:34 -0000	1.4
 <at>  <at>  -61,7 +61,7  <at>  <at> 
         <tr>
           <td>
             <%
-                int count = this.model.getOutstandingNoticeCount();
+                int count = this.model.getOutstandingNoticeCount(request.getRemoteUser());
                 String format = this.formatter.format( count );
                 out.println( java.text.MessageFormat.format( format, new Object[] { new Integer(count) } ));
              %>

_______________________________________________
cvs mailing list (cvs <at> lists.opennms.org)
To subscribe, unsubscribe, or change your list options, go to:
(Continue reading)

cvs-admin | 16 Apr 2003 18:30

CVS: opennms CHANGELOG,1.48,1.49

Update of /cvsroot/opennms/opennms
In directory sc8-pr-cvs1:/tmp/cvs-serv5589

Modified Files:
	CHANGELOG 
Log Message:
Updated CHANGELOG

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/opennms/opennms/CHANGELOG,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- CHANGELOG	28 Feb 2003 22:33:51 -0000	1.48
+++ CHANGELOG	16 Apr 2003 16:30:36 -0000	1.49
 <at>  <at>  -1,5 +1,7  <at>  <at> 
 1.1.1 to 1.1.2
 ----------------------------------------------------------------------
+- Changed the count for notifications to reflect just those for the
+  user logged in.
 - Added security roles to web.xml. Bug 715. Thx DJ
 - Corrected issues with last day/week/month/year buttons in webUI.
 - Added check to handle null terminated strings in traps. Thx Dave W.

_______________________________________________
cvs mailing list (cvs <at> lists.opennms.org)
To subscribe, unsubscribe, or change your list options, go to:
http://lists.opennms.org/mailman/listinfo/cvs

(Continue reading)

cvs-admin | 18 Apr 2003 17:34

CVS: opennms/debian substvars,1.1.1.1,NONE

Update of /cvsroot/opennms/opennms/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv9716

Removed Files:
	substvars 
Log Message:
Pruning unneeded stuff for debian build.

--- substvars DELETED ---

_______________________________________________
cvs mailing list (cvs <at> lists.opennms.org)
To subscribe, unsubscribe, or change your list options, go to:
http://lists.opennms.org/mailman/listinfo/cvs

cvs-admin | 18 Apr 2003 16:40

CVS: opennms/debian changelog,1.1.1.1,1.1.1.2 control,1.1.1.1,1.1.1.2 copyright,1.1.1.1,1.1.1.2 rules,1.1.1.1,1.1.1.2

Update of /cvsroot/opennms/opennms/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv13532/debian

Modified Files:
      Tag: OPENNMS
	changelog control copyright rules 
Log Message:
Fixing the debian/ directory to get in sync with my latest build layout.

Index: changelog
===================================================================
RCS file: /cvsroot/opennms/opennms/debian/changelog,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
diff -u -r1.1.1.1 -r1.1.1.2
--- changelog	6 May 2002 15:10:37 -0000	1.1.1.1
+++ changelog	18 Apr 2003 14:40:11 -0000	1.1.1.2
 <at>  <at>  -1,3 +1,123  <at>  <at> 
+opennms (1.1.1-5) unstable; urgency=low
+
+  * The "Tax Man Cometh" release!
+  * Fixed the database install portion so that upgrades now run smoothly.
+  * We now use the "postgres" user to do the db work instead of root.
+  * Split up packages again to use an opennms-db package for all database
+    stuff.
+  * Moved the misc jars (not opennms*jar) to opennms-server, since it's the
+    only package that needs them (webapp has it's jars in WEB-INF/lib).
+
+ -- Tony Simone <tony.simone <at> medvantx.com>  Tue, 15 Apr 2003 11:52:00 -0500
+
(Continue reading)

cvs-admin | 22 Apr 2003 21:57

CVS: opennms/etc datacollection-config.xml,1.7,1.8

Update of /cvsroot/opennms/opennms/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv9476

Modified Files:
	datacollection-config.xml 
Log Message:
Added RFC2325 to datacollection-config.xml

Index: datacollection-config.xml
===================================================================
RCS file: /cvsroot/opennms/opennms/etc/datacollection-config.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- datacollection-config.xml	6 Feb 2003 22:28:40 -0000	1.7
+++ datacollection-config.xml	22 Apr 2003 19:57:54 -0000	1.8
 <at>  <at>  -41,6 +41,11  <at>  <at> 
 			<group 	name = "mib2-host-resources-memory" ifType = "ignore">
 				<mibObj oid=".1.3.6.1.2.1.25.2.2" instance="0" alias="hrMemorySize"    type="integer"/>
 			</group>
+			<group 	name = "mib2-coffee-rfc2325" ifType = "ignore">
+				<mibObj oid=".1.3.6.1.2.1.10.132.2" instance="0" alias="coffeePotCapacity"    type="integer"/>
+				<mibObj oid=".1.3.6.1.2.1.10.132.4.1.2" instance="0" alias="coffeePotLevel"    type="integer"/>
+				<mibObj oid=".1.3.6.1.2.1.10.132.4.1.6" instance="0" alias="coffeePotTemperature"    type="integer"/>
+			</group>
                         <group  name = "APC" ifType = "ignore">
                                 <mibObj oid=".1.3.6.1.4.1.318.1.1.1.2.2.1" instance="0" alias="apcpercent"    type="gauge32"/>
                                 <mibObj oid=".1.3.6.1.4.1.318.1.1.1.2.2.2" instance="0" alias="apctemp"    type="gauge32"/>

_______________________________________________
(Continue reading)

cvs-admin | 24 Apr 2003 18:45

CVS: opennms/src/services/org/opennms/netmgt/filter Filter.java,1.5,1.6

Update of /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv11467/src/services/org/opennms/netmgt/filter

Modified Files:
	Filter.java 
Log Message:
Added some new reports and updated CHANGELOG (Thx Tony and Stuart)

Index: Filter.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/filter/Filter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Filter.java	31 Jan 2003 14:18:58 -0000	1.5
+++ Filter.java	24 Apr 2003 16:45:33 -0000	1.6
 <at>  <at>  -157,10 +157,13  <at>  <at> 
 	public boolean isValid(String addr, String rule)
 		throws FilterParseException
 	{
-		//see if the ip address is contained in the list that the
-		//rule returns
-		//
-		return getIPList(rule).contains(addr);
+		if (rule.length() == 0)
+			return true;
+		else
+			//see if the ip address is contained in the list that the
+			//rule returns
+			//
(Continue reading)

cvs-admin | 24 Apr 2003 18:45

CVS: opennms/etc datacollection-config.xml,1.8,1.9 snmp-graph.properties,1.5,1.6

Update of /cvsroot/opennms/opennms/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv11467/etc

Modified Files:
	datacollection-config.xml snmp-graph.properties 
Log Message:
Added some new reports and updated CHANGELOG (Thx Tony and Stuart)

Index: datacollection-config.xml
===================================================================
RCS file: /cvsroot/opennms/opennms/etc/datacollection-config.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- datacollection-config.xml	22 Apr 2003 19:57:54 -0000	1.8
+++ datacollection-config.xml	24 Apr 2003 16:45:32 -0000	1.9
 <at>  <at>  -60,7 +60,13  <at>  <at> 
 				<mibObj oid=".1.3.6.1.4.1.9.2.1.8"  instance="0" alias="freeMem"     type="gauge"/>
 				<mibObj oid=".1.3.6.1.4.1.9.2.1.46" instance="0" alias="bufferFail"  type="counter"/>
 				<mibObj oid=".1.3.6.1.4.1.9.2.1.47" instance="0" alias="bufferNoMem" type="counter"/>
+                                <mibObj oid=".1.3.6.1.4.1.9.9.13.1.3.1.3" instance="1" alias="ciscoInFanTemp" type="gauge"/>
+                                <mibObj oid=".1.3.6.1.4.1.9.9.13.1.3.1.3" instance="3" alias="ciscoOutFanTemp" type="gauge"/>
 			</group>
+                        <group  name = "cisco-router-if-stats" ifType = "all">
+                                <mibObj oid=".1.3.6.1.4.1.9.2.2.1.1.7" instance="ifIndex" alias="locIfInPktsSec" type="integer"/>
+                                <mibObj oid=".1.3.6.1.4.1.9.2.2.1.1.9" instance="ifIndex" alias="locIfOutPktsSec" type="integer"/>
+                        </group>
 			<group 	name = "bay-router" ifType = "ignore">
 				<mibObj oid=".1.3.6.1.4.1.18.3.3.2.5.1.1.9"  instance="0" alias="wfkernelTasksTotal"  type="gauge"/>
 				<mibObj oid=".1.3.6.1.4.1.18.3.3.2.5.1.1.10" instance="0" alias="wfkernelTasksInQue"  type="counter"/>
(Continue reading)

cvs-admin | 24 Apr 2003 18:46

CVS: opennms CHANGELOG,1.49,1.50

Update of /cvsroot/opennms/opennms
In directory sc8-pr-cvs1:/tmp/cvs-serv11467

Modified Files:
	CHANGELOG 
Log Message:
Added some new reports and updated CHANGELOG (Thx Tony and Stuart)

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/opennms/opennms/CHANGELOG,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- CHANGELOG	16 Apr 2003 16:30:36 -0000	1.49
+++ CHANGELOG	24 Apr 2003 16:45:31 -0000	1.50
 <at>  <at>  -1,5 +1,8  <at>  <at> 
 1.1.1 to 1.1.2
 ----------------------------------------------------------------------
+- Added the ability to define a null filter (speeds things up)
+- Added new Cisco and UCD-SNMP reports (Thx Tony and Stuart)
+- Added RFC2325 to datacollection-config.xml
 - Changed the count for notifications to reflect just those for the
   user logged in.
 - Added security roles to web.xml. Bug 715. Thx DJ

_______________________________________________
cvs mailing list (cvs <at> lists.opennms.org)
To subscribe, unsubscribe, or change your list options, go to:
http://lists.opennms.org/mailman/listinfo/cvs
(Continue reading)


Gmane