cvs | 1 Oct 2003 22:50
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd BroadcastEventProcessor.java, 1.3.6.8, 1.3.6.9

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

Modified Files:
      Tag: RACKSPACE_BRANCH
	BroadcastEventProcessor.java 
Log Message:
This update added the following functions:
1. OpenNMS produces notification message to external xmlrpc server 
when a node, an interface or a service get added or deleted to 
the database.
2. Produce more detail notification message to external xmlrpc server.
3. Produce nodeAdded and nodeGainedInterface events when an interface 
   or node are added through the updateServer event.
4. Produce a nodeGainedService event when a service is added through
   the updateService event.
5. Produce a serviceDeleted event when a service get deleted through
   the updateService event.

   ------ submitted by James Zuo

Index: BroadcastEventProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/BroadcastEventProcessor.java,v
retrieving revision 1.3.6.8
retrieving revision 1.3.6.9
diff -u -r1.3.6.8 -r1.3.6.9
--- BroadcastEventProcessor.java	15 Sep 2003 19:43:49 -0000	1.3.6.8
+++ BroadcastEventProcessor.java	1 Oct 2003 20:50:52 -0000	1.3.6.9
 <at>  <at>  -86,7 +86,7  <at>  <at> 
(Continue reading)

cvs | 2 Oct 2003 18:05
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd RescanProcessor.java, 1.18, 1.19

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

Modified Files:
	RescanProcessor.java 
Log Message:
Fix problems in rescan with duplicate interfaces.

-- submitted by James Zuo

Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RescanProcessor.java	30 Sep 2003 18:37:25 -0000	1.18
+++ RescanProcessor.java	2 Oct 2003 16:05:34 -0000	1.19
 <at>  <at>  -752,7 +752,9  <at>  <at> 

 		if (log.isDebugEnabled())
 		{
-			log.debug("updateInterface: updating interface " + ifaddr.getHostAddress() + "(targetIf=" +
target.getHostAddress() + ")");
+			log.debug("updateInterface: updating interface " + ifaddr.getHostAddress() + "(targetIf=" 
+                                + target.getHostAddress() + ")");
+                        log.debug("updateInterface: the snmp collection passed in is collected via" + snmpc.getTarget());
 		}
 				
 		boolean isAlias = false;
(Continue reading)

cvs | 2 Oct 2003 20:44
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd RescanProcessor.java, 1.19, 1.20

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

Modified Files:
	RescanProcessor.java 
Log Message:
Fix the NullPointException during Rescan.

        --- submitted by James Zuo

Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RescanProcessor.java	2 Oct 2003 16:05:34 -0000	1.19
+++ RescanProcessor.java	2 Oct 2003 18:44:54 -0000	1.20
 <at>  <at>  -754,7 +754,8  <at>  <at> 
 		{
 			log.debug("updateInterface: updating interface " + ifaddr.getHostAddress() + "(targetIf=" 
                                 + target.getHostAddress() + ")");
-                        log.debug("updateInterface: the snmp collection passed in is collected via" + snmpc.getTarget());
+                        log.debug("updateInterface: the snmp collection passed in is collected via" 
+                                + snmpc.getTarget().getHostAddress());
 		}
 				
 		boolean isAlias = false;

_______________________________________________
(Continue reading)

cvs | 7 Oct 2003 15:31
Favicon

CVS: opennms/src/services/org/opennms/netmgt/utils XmlRpcNotifier.java, 1.1.2.2, 1.1.2.3

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

Modified Files:
      Tag: RACKSPACE_BRANCH
	XmlRpcNotifier.java 
Log Message:
Added notifySuccess() function to notify any successful operations
that OpenNMS performed during process an external event to the external
XMLRPC server.

        submitted by James Zuo

Index: XmlRpcNotifier.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/utils/Attic/XmlRpcNotifier.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XmlRpcNotifier.java	12 Sep 2003 17:33:50 -0000	1.1.2.2
+++ XmlRpcNotifier.java	7 Oct 2003 13:31:12 -0000	1.1.2.3
 <at>  <at>  -73,6 +73,24  <at>  <at> 
 	}

 	/**
+	 * <p>Notify the external xmlrpc server the success of processing an event.
+	 *
+         *  <at> param txNo          the external transaction number for an event.
+         *  <at> param uei           the event uei.
+         *  <at> param message       the text message to indicate the success.
(Continue reading)

cvs | 7 Oct 2003 15:31
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd BroadcastEventProcessor.java, 1.3.6.9, 1.3.6.10

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

Modified Files:
      Tag: RACKSPACE_BRANCH
	BroadcastEventProcessor.java 
Log Message:
Added notifySuccess() function to notify any successful operations
that OpenNMS performed during process an external event to the external
XMLRPC server.

        submitted by James Zuo

Index: BroadcastEventProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/BroadcastEventProcessor.java,v
retrieving revision 1.3.6.9
retrieving revision 1.3.6.10
diff -u -r1.3.6.9 -r1.3.6.10
--- BroadcastEventProcessor.java	1 Oct 2003 20:50:52 -0000	1.3.6.9
+++ BroadcastEventProcessor.java	7 Oct 2003 13:31:11 -0000	1.3.6.10
 <at>  <at>  -461,7 +461,7  <at>  <at> 
                                         try
                                         {
                                                 XmlRpcNotifier notifier = new XmlRpcNotifier(m_xmlrpcServerUrl);
-                                                String reply = notifier.notifyFailure(txNo, event.getUei(), "Node already exist.");
+                                                String reply = notifier.notifySuccess(txNo, event.getUei(), "Node already exist.");
 		                                if (log.isDebugEnabled())
 			                                log.debug("addNodeHandler: Notify failure with xmlrpc: \n\t\t" + reply); 
                                         }
(Continue reading)

cvs | 7 Oct 2003 16:12
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd BroadcastEventProcessor.java, 1.3.6.10, 1.3.6.11

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

Modified Files:
      Tag: RACKSPACE_BRANCH
	BroadcastEventProcessor.java 
Log Message:
Corrected typo in servicmapename.

Index: BroadcastEventProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/BroadcastEventProcessor.java,v
retrieving revision 1.3.6.10
retrieving revision 1.3.6.11
diff -u -r1.3.6.10 -r1.3.6.11
--- BroadcastEventProcessor.java	7 Oct 2003 13:31:11 -0000	1.3.6.10
+++ BroadcastEventProcessor.java	7 Oct 2003 14:12:09 -0000	1.3.6.11
 <at>  <at>  -208,7 +208,7  <at>  <at> 
         /**
          * SQL statement used to delete an interface/service mapping from the database.
          */
-         private static String SQL_DELETE_SERVICE_INTERFACE_MAPPING = "DELETE FROM serviceMap WHERE ipaddr =
? AND servicmapename = ?";
+         private static String SQL_DELETE_SERVICE_INTERFACE_MAPPING = "DELETE FROM serviceMap WHERE ipaddr =
? AND servicemapname = ?";

         /**
          * SQL statement used to count all the interface on a node

_______________________________________________
(Continue reading)

cvs | 7 Oct 2003 16:58
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd RescanProcessor.java, 1.20, 1.21

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

Modified Files:
	RescanProcessor.java 
Log Message:
This update restructed Rescan Processor, and rewrite the reparenting
algorithm.

        ------ submitted by James Zuo

Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RescanProcessor.java	2 Oct 2003 18:44:54 -0000	1.20
+++ RescanProcessor.java	7 Oct 2003 14:58:29 -0000	1.21
 <at>  <at>  -90,7 +90,19  <at>  <at> 
 	 */
 	final static String	SQL_DB_RETRIEVE_NODE_TYPE = "SELECT nodetype FROM node WHERE nodeID=?";
 	
+        /**
+         * SQL statement used to retrieve other nodeIds that have the same ipinterface
+         * as the updating node.
+         */
+        final static String     SQL_DB_RETRIEVE_OTHER_NODES = "SELECT nodeid FROM ipinterface" 
+                                                           + "WHERE ipaddr = ? AND ifindex = ? AND nodeid !=? ";
 	/**
(Continue reading)

cvs | 7 Oct 2003 17:40
Favicon

CVS: opennms/src/web/web/element interface.jsp,1.7,1.8

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

Modified Files:
	interface.jsp 
Log Message:
Fixed a bug with selecting interfaces from the webUI

Index: interface.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/element/interface.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interface.jsp	25 Sep 2003 22:49:18 -0000	1.7
+++ interface.jsp	7 Oct 2003 15:40:26 -0000	1.8
 <at>  <at>  -181,13 +181,19  <at>  <at> 
           &nbsp;&nbsp;&nbsp;<a
href="response/addReportsToUrl?node=<%=nodeId%>&intf=<%=ipAddr%>&relativetime=lastday">Response Time</a>
         <% } %>

-        <% if(hasSNMPData(intf_db)) { %>
-          <% String ifLabel = IfLabel.getIfLabelfromIfIndex(nodeId, ipAddr, ifindexString); %>
-        
+        <% if(hasSNMPData(intf_db) && ifindexString == null) { %>
+              <% String ifLabel = IfLabel.getIfLabel(nodeId, ipAddr); %>
+          <% if(this.perfModel.isQueryableInterface(nodeId, ifLabel)) { %>
+            &nbsp;&nbsp;&nbsp;<a
href="performance/addReportsToUrl?node=<%=nodeId%>&intf=<%=ifLabel%>&relativetime=lastday">SNMP Performance</a>
+          <% } %>
(Continue reading)

cvs | 7 Oct 2003 19:53
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd RescanProcessor.java, 1.21, 1.22

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

Modified Files:
	RescanProcessor.java 
Log Message:
Fix bugs on Rescan Processor.

        --- James Zuo

Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RescanProcessor.java	7 Oct 2003 14:58:29 -0000	1.21
+++ RescanProcessor.java	7 Oct 2003 17:53:36 -0000	1.22
 <at>  <at>  -94,7 +94,7  <at>  <at> 
          * SQL statement used to retrieve other nodeIds that have the same ipinterface
          * as the updating node.
          */
-        final static String     SQL_DB_RETRIEVE_OTHER_NODES = "SELECT nodeid FROM ipinterface" 
+        final static String     SQL_DB_RETRIEVE_OTHER_NODES = "SELECT nodeid FROM ipinterface " 
                                                            + "WHERE ipaddr = ? AND ifindex = ? AND nodeid !=? ";
 	/**
          * SQL statement for retrieving the nodeids that have the same ipaddr as the updating node

_______________________________________________
cvs mailing list (cvs <at> opennms.org)
(Continue reading)

cvs | 7 Oct 2003 20:48
Favicon

CVS: opennms/src/services/org/opennms/netmgt/capsd RescanProcessor.java, 1.22, 1.23

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

Modified Files:
	RescanProcessor.java 
Log Message:
Reset the ifindex field of ifservices table if the service 
aleady exist in database, but the ifindex is not filled.

        ------- James Zuo

Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- RescanProcessor.java	7 Oct 2003 17:53:36 -0000	1.22
+++ RescanProcessor.java	7 Oct 2003 18:48:48 -0000	1.23
 <at>  <at>  -1325,6 +1325,24  <at>  <at> 
 					createInterfaceSupportsSNMPEvent(dbIpIfEntry);
 				}
 			}
+                        else
+                        {
+				DbIfServiceEntry ifSvcEntry = DbIfServiceEntry.get(node.getNodeId(), ifaddr, sid.intValue());
+				if (m_ifIndexOnNodeChangedFlag)
+                                {
+                                        int index = dbIpIfEntry.getIfIndex();
+				        if (index > 0)
(Continue reading)


Gmane