[Nocrancid] autopop-onenet.net router config diffs

[rancid at rancid.noc.onenet.net]

Index: core4.tul-mx480.onenet.net
===================================================================
--- core4.tul-mx480.onenet.net	(revision 23154)
+++ core4.tul-mx480.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TULSA-CORE4-MX480-RE0> show system commit 
+#   2011-12-08 16:53:01 CST by jeremyt via cli commit synchronize
+#   2011-12-08 16:45:29 CST by jed via cli commit synchronize
+#   2011-12-08 16:43:48 CST by jed via cli commit confirmed, rollback in 5mins synchronize
 #   2011-12-07 13:14:59 CST by bobby via cli commit synchronize
 #   2011-12-06 15:18:22 CST by joe via cli commit synchronize
 #   2011-12-02 00:20:18 CST by jeremyt via cli commit synchronize
-#   2011-11-30 00:26:03 CST by jeremyt via cli commit synchronize
-#   2011-11-30 00:25:16 CST by jeremyt via cli commit synchronize
-#   2011-11-30 00:19:51 CST by jeremyt via synchronize commit confirmed, rollback in 5mins
 # grnoc-mon at TULSA-CORE4-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -295,7 +295,7 @@
 # grnoc-mon at TULSA-CORE4-MX480-RE0> file list /var/tmp detail 
 # 
 # /var/tmp:
-# total 5154920
+# total 5154924
 # drwxr-xr-x  2 root  field        512 Mar 9   2011 gres-tp/
 # -rw-r--r--  1 root  field          4 Nov 30 00:16 idp_license_info
 # drwxrwxrwx  2 root  wheel        512 Mar 9   2011 install/
@@ -315,6 +315,7 @@
 # -r--r--r--  1 root  field        499 Nov 30 00:08 preinstall_boot_loader.conf
 # -rw-r--r--  1 root  field        498 Nov 30 00:16 rdm.taf
 # -rw-------  1 root  field  140455327 Nov 30 00:05 rpd.core-tarball.0.tgz
+# -rw-r-----  1 root  field        178 Dec 8  16:43 sampled.pkts
 # drwxr-xr-x  3 root  field        512 Mar 9   2011 sec-download/
 # -rw-r--r--  1 root  field          0 Mar 9   2011 tracelogs
 # -rw-r--r--  1 root  field          0 Mar 9   2011 tracelogs_jperf
@@ -325,7 +326,7 @@
 # grnoc-mon at TULSA-CORE4-MX480-RE0> show system uptime 
 # System booted: 2011-11-30 00:15 CST 
 # Protocols started: 2011-11-30 00:19 CST 
-# Last configured: 2011-12-07 13:14 CST  by bobby
+# Last configured: 2011-12-08 16:53 CST  by jeremyt
 # 
 # {master}
 # grnoc-mon at TULSA-CORE4-MX480-RE0> show interface terse 
@@ -429,7 +430,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TULSA-CORE4-MX480-RE0> show configuration 
-## Last commit: 2011-12-07 13:14:59 CST by bobby
+## Last commit: 2011-12-08 16:53:01 CST by jeremyt
 version 10.4R6.5;
 groups {
     re0 {
@@ -566,10 +567,10 @@
         on-disk-failure disk-failure-action reboot;
     }
     fpc 0 {
-        inactive: sampling-instance JFLOW-1;
+        sampling-instance JFLOW-1;
     }
     fpc 1 {
-        inactive: sampling-instance JFLOW-1;
+        sampling-instance JFLOW-1;
     }
     alarm {
         management-ethernet {
@@ -924,6 +925,10 @@
             description VLAN-997-AREON-COGENT-IPv4-PEER;
             vlan-id 997;
             family inet {
+                filter {
+                    input FLOW-INFO;
+                    output FLOW-INFO;
+                }
                 address 38.104.198.70/30;
             }
         }
@@ -952,20 +957,22 @@
         }
     }
 }
-inactive: forwarding-options {
+forwarding-options {
     sampling {
         instance {
             JFLOW-1 {
                 input {
-                    rate 1000;
+                    rate 100;
                 }
                 family inet {
                     output {
-                        flow-server 164.58.253.210 {
-                            port 9100;
+                        flow-server 164.58.253.36 {
+                            port 9224;
+                            autonomous-system-type origin;
+                            no-local-dump;
                             version-ipfix {
                                 template {
-                                    IP-V4;
+                                    ipv4;
                                 }
                             }
                         }
@@ -2038,7 +2045,10 @@
                         0.0.0.0/0;
                     }
                 }
-                then sample;
+                then {
+                    sample;
+                    accept;
+                }
             }
             term REJECT_ALL {
                 then {
@@ -2231,20 +2241,12 @@
         }
     }
 }
-inactive: services {
+services {
     flow-monitoring {
         version-ipfix {
-            template IP-V4 {
+            template ipv4 {
                 flow-active-timeout 60;
                 flow-inactive-timeout 60;
-                template-refresh-rate {
-                    packets 1000;
-                    seconds 10;
-                }
-                option-refresh-rate {
-                    packets 1000;
-                    seconds 10;
-                }
                 ipv4-template;
             }
         }