perfsonar development work

Author: gijs
Date: 2008-05-27 10:32:58 -0400 (Tue, 27 May 2008)
New Revision: 3879

Removed:
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs
Modified:
   trunk/surfnet_java-flowsa-ma/conf/service.properties
Log:


Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-05-27 
13:14:56 UTC (rev 3878)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-05-27 
14:32:58 UTC (rev 3879)
@@ -21,8 +21,8 @@
 service.r.ls_url=http://localhost:8080/XML-LS-1.1.2/services/LookupService
 
 # Group=ServiceType
-# Description= no description
-service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService
+# Description= This is send to the LS
+service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/surfnet_java-flowsa-ma/services/FlowsaMeasurementArchiveService
 
 # === Measurement Archive general properties ===
 
@@ -51,52 +51,51 @@
 # service.ma.flowsa.exporter1.location.country - optional
 # service.ma.flowsa.exporter1.location.latitude - optional
 # service.ma.flowsa.exporter1.location.longitude - optional
-service.ma.flowsa.exporters=4
+service.ma.flowsa.exporters=8
 service.ma.flowsa.exporter1.hostname=xsr01.asd001a.surf.net
 service.ma.flowsa.exporter1.port=29001
 service.ma.flowsa.exporter1.description=SURFnet6 Core Router Amsterdam1
 service.ma.flowsa.exporter1.flow-version=netflow_v9
 service.ma.flowsa.exporter1.sample-rate=100
-service.ma.flowsa.exporter1.operating-system=
-service.ma.flowsa.exporter1.location.institution=
-service.ma.flowsa.exporter1.location.city=
-service.ma.flowsa.exporter1.location.country=
-service.ma.flowsa.exporter1.location.latitude=
-service.ma.flowsa.exporter1.location.longitude=
 service.ma.flowsa.exporter2.hostname=xsr01.asd002a.surf.net
 service.ma.flowsa.exporter2.port=29003
 service.ma.flowsa.exporter2.description=SURFnet6 Core Router Amsterdam2
 service.ma.flowsa.exporter2.flow-version=netflow_v9
 service.ma.flowsa.exporter2.sample-rate=100
-service.ma.flowsa.exporter2.operating-system=
-service.ma.flowsa.exporter2.location.institution=
-service.ma.flowsa.exporter2.location.city=
-service.ma.flowsa.exporter2.location.country=
-service.ma.flowsa.exporter2.location.latitude=
-service.ma.flowsa.exporter2.location.longitude=
 service.ma.flowsa.exporter3.hostname=xsr03.asd001a.surf.net
 service.ma.flowsa.exporter3.port=29002
 service.ma.flowsa.exporter3.description=SURFnet6 Border Router Amsterdam1
 service.ma.flowsa.exporter3.flow-version=netflow_v9
 service.ma.flowsa.exporter3.sample-rate=100
-service.ma.flowsa.exporter3.operating-system=
-service.ma.flowsa.exporter3.location.institution=
-service.ma.flowsa.exporter3.location.city=
-service.ma.flowsa.exporter3.location.country=
-service.ma.flowsa.exporter3.location.latitude=
-service.ma.flowsa.exporter3.location.longitude=
 service.ma.flowsa.exporter4.hostname=xsr03.asd002a.surf.net
 service.ma.flowsa.exporter4.port=29004
 service.ma.flowsa.exporter4.description=SURFnet6 Border Router Amsterdam2
 service.ma.flowsa.exporter4.flow-version=netflow_v9
 service.ma.flowsa.exporter4.sample-rate=100
-service.ma.flowsa.exporter4.operating-system=
-service.ma.flowsa.exporter4.location.institution=
-service.ma.flowsa.exporter4.location.city=
-service.ma.flowsa.exporter4.location.country=
-service.ma.flowsa.exporter4.location.latitude=
-service.ma.flowsa.exporter4.location.longitude=
+service.ma.flowsa.exporter5.hostname=jnr01.asd001a.surf.net
+service.ma.flowsa.exporter5.port=27005
+service.ma.flowsa.exporter5.description=SURFnet6 Core Router Amsterdam1
+service.ma.flowsa.exporter5.flow-version=netflow_v9
+service.ma.flowsa.exporter5.sample-rate=100
+service.ma.flowsa.exporter6.hostname=jnr01.asd002a.surf.net
+service.ma.flowsa.exporter6.port=27007
+service.ma.flowsa.exporter6.description=SURFnet6 Core Router Amsterdam2
+service.ma.flowsa.exporter6.flow-version=netflow_v9
+service.ma.flowsa.exporter6.sample-rate=100
+service.ma.flowsa.exporter7.hostname=jnr02.asd001a.surf.net
+service.ma.flowsa.exporter7.port=27006
+service.ma.flowsa.exporter7.description=SURFnet6 Border Router Amsterdam1
+service.ma.flowsa.exporter7.flow-version=netflow_v9
+service.ma.flowsa.exporter7.sample-rate=100
+service.ma.flowsa.exporter8.hostname=jnr02.asd002a.surf.net
+service.ma.flowsa.exporter8.port=29008
+service.ma.flowsa.exporter8.description=SURFnet6 Border Router Amsterdam2
+service.ma.flowsa.exporter8.flow-version=netflow_v9
+service.ma.flowsa.exporter8.sample-rate=100
 
+
+
+
 # --- query properties ---
 # query.timeout - timeout/max execution time of a query (value is in seconds)
 # query.max-results - if more then <value> results are encountered stop 
processing
@@ -116,7 +115,7 @@
 
 # Group=Nfdump properties
 # Description=location of nfcapd files
-service.ma.flowsa.nfdump.source=/var/lib/surfnet_java-flowsa-ma
+service.ma.flowsa.nfdump.source=/var/lib/surfnet-java-flowsa-ma
 
 # Group=Nfdump properties
 # Description= the location of the nfdump executable (including nfdump 
filename)
@@ -142,15 +141,15 @@
 
 # Group=Nfcapd properties
 # Description=/var/run/
-service.ma.flowsa.nfcapd.run=/var/run/surfnet_java-flowsa-ma
+service.ma.flowsa.nfcapd.run=/var/run/surfnet-java-flowsa-ma
 
 # Group=Nfcapd properties
 # Description=as which user should nfcapd run (leave empty if happy with id 
of nfcapd.rc starter)
-service.ma.flowsa.nfcapd.user=perfsonar
+service.ma.flowsa.nfcapd.user=tomcat
 
 # Group=Nfcapd properties
 # Description=As which group should nfcapd run
-service.ma.flowsa.nfcapd.group=perfsonar
+service.ma.flowsa.nfcapd.group=tomcat
 
 # === Logger properties === 
 

Deleted: trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs