cleaning up filter names and netflix webapp properties

Author: mhawthorne

zuul-netflix-webapp/build.gradle

@@ -70,5 +70,12 @@ tasks.war.doFirst {
 jettyRun.contextPath = '/' 
 
 jettyRun.doFirst {
-    System.setProperty("archaius.deployment.applicationId", "zuul")    
+    System.setProperty("archaius.deployment.applicationId", "zuul")
+
+/*
+    def scriptDir = "../zuul-scripts/src/main/groovy/scripts"
+    System.setProperty("zuul.filter.pre", scriptDir + "/pre")
+    System.setProperty("zuul.filter.route", scriptDir + "/route")
+    System.setProperty("zuul.filter.post", scriptDir + "/post")
+*/
 }

zuul-netflix-webapp/src/main/java/com/netflix/zuul/plugins/MetricPoller.java

@@ -15,9 +15,18 @@
  */
 package com.netflix.zuul.plugins;
 
-import com.netflix.servo.publish.*;
+import com.netflix.servo.publish.BasicMetricFilter;
+import com.netflix.servo.publish.CounterToRateMetricTransform;
+import com.netflix.servo.publish.FileMetricObserver;
+import com.netflix.servo.publish.MetricObserver;
+import com.netflix.servo.publish.MonitorRegistryMetricPoller;
+import com.netflix.servo.publish.PollRunnable;
+import com.netflix.servo.publish.PollScheduler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -28,13 +37,27 @@
  */
 public class MetricPoller {
 
+    private static Logger LOG = LoggerFactory.getLogger(MetricPoller.class);
+
     final static PollScheduler scheduler = PollScheduler.getInstance();
 
     public static void startPoller(){
         scheduler.start();
         final int heartbeatInterval = 1200;
+
+        final File metricsDir;
+        try {
+            metricsDir = File.createTempFile("zuul-servo-metrics-", "");
+            metricsDir.delete();
+            metricsDir.mkdir();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        LOG.debug("created metrics dir " + metricsDir.getAbsolutePath());
+
         MetricObserver transform = new CounterToRateMetricTransform(
-                new FileMetricObserver("ZuulMetrics", new File(".")),
+                new FileMetricObserver("ZuulMetrics", metricsDir),
                 heartbeatInterval, TimeUnit.SECONDS);
 
         PollRunnable task = new PollRunnable(

zuul-netflix-webapp/src/main/resources/log4j.properties

@@ -13,8 +13,6 @@ log4j.appender.R.layout=com.netflix.logging.log4jAdapter.NFPatternLayout
 log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
 log4j.appender.R.File=logs/zuul.log
 
-
-
 # convert to async appender
 log4j.logger.asyncAppenders=INFO,stdout,R
 batcher.com.netflix.logging.AsyncAppender.stdout.waitTimeinMillis=120000

zuul-netflix-webapp/src/main/resources/zuul-local.properties

@@ -29,13 +29,12 @@ netflix.platform.admin.resources.port=9192
 com.netflix.karyon.unify.health.check.with.eureka=true
 #############################################
 
+zuul.filter.pre.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/pre]
+zuul.filter.routing.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/route]
+zuul.filter.post.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/post]
 
-zuul.filter.post.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/postProcess]
-zuul.filter.pre.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/preProcess]
-zuul.filter.routing.path=[PATH_TO/zuul/zuul-scripts/src/main/groovy/scripts/routing]
-
-zuul.niws.clientlist=[CLIENT_NAME]
-zuul.niws.defaultClient=[CLIENT_NAME]
+zuul.niws.clientlist=origin
+zuul.niws.defaultClient=origin
 
 zuul.ribbon.namespace=zuul.client
 zuul.ribbon.vipAddress.template=%s-%s.netflix.net:7001
@@ -45,13 +44,13 @@ zuul.cassandra.host=[CASSANDRA_HOST]
 
 ##Ribbon properties
 
-api.zuul.client.DeploymentContextBasedVipAddresses=[CLIENT_NAME]+ [zuul.ribbon.vipAddress.template]
-api.zuul.client.Port=[PORT]
-api.zuul.client.ReadTimeout=25000
-api.zuul.client.ConnectTimeout=2000
-api.zuul.client.MaxAutoRetries=2
-api.zuul.client.FollowRedirects=false
-api.zuul.client.ConnIdleEvictTimeMilliSeconds=3600000
-api.zuul.client.NIWSServerListClassName=com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList
-api.zuul.client.ServerListRefreshInterval=60000
+origin.zuul.client.DeploymentContextBasedVipAddresses=[CLIENT_NAME]+ [zuul.ribbon.vipAddress.template]
+origin.zuul.client.Port=[PORT]
+origin.zuul.client.ReadTimeout=25000
+origin.zuul.client.ConnectTimeout=2000
+origin.zuul.client.MaxAutoRetries=2
+origin.zuul.client.FollowRedirects=false
+origin.zuul.client.ConnIdleEvictTimeMilliSeconds=3600000
+origin.zuul.client.NIWSServerListClassName=com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList
+origin.zuul.client.ServerListRefreshInterval=60000