Merge pull request #14 from yammer/issue-13

Add ability to specify meta clusters in yml

Author: chrisgray

breakerbox-service/breakerbox.yml

@@ -13,6 +13,11 @@ database:
   checkConnectionWhileIdle: true
   validationInterval: 30s
 
+metaClusters: 
+  - production
+  - stage
+  - staging
+
 tenacityClient:
   connectionTimeout: 500ms
   timeout: 1000ms

breakerbox-service/src/main/java/com/yammer/breakerbox/service/BreakerboxService.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import com.netflix.turbine.init.TurbineInit;
 import com.netflix.turbine.streaming.servlet.TurbineStreamServlet;
 import com.yammer.breakerbox.azure.AzureStore;
@@ -52,6 +53,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -126,11 +128,16 @@ public void run(final BreakerboxServiceConfiguration configuration, final Enviro
                         .build()),
             breakerboxStore);
 
+        Set<String> metaClusters = Sets.newHashSet();
+        for (String cluster : configuration.getMetaClusters()) {
+            metaClusters.add(cluster.toUpperCase());
+        }
+
         environment.servlets().addServlet("turbine.stream", new TurbineStreamServlet()).addMapping("/turbine.stream");
 
         environment.jersey().register(new ArchaiusResource(configuration.getArchaiusOverride(), breakerboxStore));
-        environment.jersey().register(new ConfigureResource(breakerboxStore, tenacityPropertyKeysStore, syncComparator));
-        environment.jersey().register(new DashboardResource(new DashboardViewFactory(configuration.getBreakerboxHostAndPort()), configuration.getDefaultDashboard()));
+        environment.jersey().register(new ConfigureResource(breakerboxStore, tenacityPropertyKeysStore, syncComparator, metaClusters));
+        environment.jersey().register(new DashboardResource(new DashboardViewFactory(configuration.getBreakerboxHostAndPort()), configuration.getDefaultDashboard(), metaClusters));
         environment.jersey().register(new InSyncResource(syncComparator, tenacityPropertyKeysStore));
 
         final ScheduledExecutorService scheduledExecutorService = environment

breakerbox-service/src/main/java/com/yammer/breakerbox/service/config/BreakerboxServiceConfiguration.java

@@ -15,6 +15,8 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 
 public class BreakerboxServiceConfiguration extends Configuration {
@@ -43,6 +45,8 @@ public class BreakerboxServiceConfiguration extends Configuration {
     @NotNull @UnwrapValidatedValue(false) @Valid @JsonProperty("database")
     private Optional<JdbiConfiguration> jdbiConfiguration = Optional.absent();
 
+    private List<String> metaClusters = Collections.emptyList();
+
     /* Useful if you are Breakerbox is behind a proxy and not at localhost:8080 */
     @NotNull @Valid
     private HostAndPort breakerboxHostAndPort;
@@ -127,6 +131,10 @@ public String getDefaultDashboard() {
         return defaultDashboard;
     }
 
+    public List<String> getMetaClusters() {
+        return metaClusters;
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(azure, tenacityClient, breakerboxServicesPropertyKeys, breakerboxServicesConfiguration, breakerboxConfiguration, ldapConfiguration, archaiusOverride, jdbiConfiguration, breakerboxHostAndPort, defaultDashboard);

breakerbox-service/src/main/java/com/yammer/breakerbox/service/core/Instances.java

@@ -14,7 +14,7 @@
 
 import javax.annotation.Nullable;
 import java.net.URI;
-import java.net.URISyntaxException;
+import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -30,19 +30,12 @@ public String apply(Instance input) {
         };
     }
 
-    private static Predicate<Instance> pruneMetaClusters() {
+    private static Predicate<Instance> pruneMetaClusters(final Set<String> specifiedMetaClusters) {
         return new Predicate<Instance>() {
             @Override
             public boolean apply(@Nullable Instance input) {
                 if (input != null) {
-                    switch (input.getCluster().toUpperCase()) {
-                        case "PRODUCTION":
-                        case "STAGE":
-                        case "STAGING":
-                            return false;
-                        default:
-                            return true;
-                    }
+                    return !specifiedMetaClusters.contains(input.getCluster().toUpperCase());
                 }
                 return false;
             }
@@ -84,9 +77,9 @@ public static ImmutableSet<String> clusters() {
                 .toSortedSet(Ordering.natural());
     }
 
-    public static ImmutableSet<String> noMetaClusters() {
+    public static ImmutableSet<String> noMetaClusters(final Set<String> specifiedMetaClusters) {
         return rawInstances()
-                .filter(pruneMetaClusters())
+                .filter(pruneMetaClusters(specifiedMetaClusters))
                 .transform(toClusterName())
                 .toSortedSet(Ordering.natural());
     }

breakerbox-service/src/main/java/com/yammer/breakerbox/service/core/SyncComparator.java

@@ -73,7 +73,9 @@ private ImmutableList<InstanceConfiguration> fetch(ServiceId serviceId, Dependen
     }
 
     public ImmutableList<SyncServiceHostState> inSync(ServiceId serviceId, DependencyId dependencyId) {
+        // fetch from services
         final ImmutableList<InstanceConfiguration> configurations = fetch(serviceId, dependencyId);
+        
         final Optional<DependencyModel> entityOptional = breakerboxStore.retrieveLatest(dependencyId, serviceId);
         if (entityOptional.isPresent()) {
 

breakerbox-service/src/main/java/com/yammer/breakerbox/service/resources/ConfigureResource.java

@@ -34,20 +34,24 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.net.URI;
+import java.util.Set;
 
 @Path("/configure/{service}")
 public class ConfigureResource {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigureResource.class);
     private final BreakerboxStore breakerboxStore;
     private final TenacityPropertyKeysStore tenacityPropertyKeysStore;
     private final SyncComparator syncComparator;
+    private final Set<String> specifiedMetaClusters;
 
     public ConfigureResource(BreakerboxStore breakerboxStore,
                              TenacityPropertyKeysStore tenacityPropertyKeysStore,
-                             SyncComparator syncComparator) {
+                             SyncComparator syncComparator, 
+                             Set<String> specifiedMetaClusters) {
         this.breakerboxStore = breakerboxStore;
         this.tenacityPropertyKeysStore = tenacityPropertyKeysStore;
         this.syncComparator = syncComparator;
+        this.specifiedMetaClusters = specifiedMetaClusters;
     }
 
     @GET @Timed @Produces(MediaType.TEXT_HTML)
@@ -59,7 +63,7 @@ public View render(@PathParam("service") String serviceName) {
         if (firstDependencyKey.isPresent()) {
             return create(serviceId, DependencyId.from(firstDependencyKey.get()), Optional.<Long>absent());
         } else {
-            return new NoPropertyKeysView(serviceId);
+            return new NoPropertyKeysView(serviceId, specifiedMetaClusters);
         }
     }
 
@@ -80,7 +84,8 @@ private ConfigureView create(ServiceId serviceId,
                 serviceId,
                 syncComparator.allInSync(serviceId, propertyKeys),
                 getConfiguration(dependencyId, version, serviceId),
-                getDependencyVersionNameList(dependencyEntities));
+                getDependencyVersionNameList(dependencyEntities),
+                specifiedMetaClusters);
     }
 
     private TenacityConfiguration getConfiguration(DependencyId dependencyId, Optional<Long> version, ServiceId serviceId) {

breakerbox-service/src/main/java/com/yammer/breakerbox/service/resources/DashboardResource.java

@@ -10,19 +10,22 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import java.util.Set;
 
 @Path("/")
 public class DashboardResource {
     private final String defaultDashboard;
     private final DashboardViewFactory viewFactory;
-
-    public DashboardResource(DashboardViewFactory viewFactory, String defaultDashboard) {
+    private final Set<String> specifiedMetaClusters;
+    
+    public DashboardResource(DashboardViewFactory viewFactory, String defaultDashboard, Set<String> specifiedMetaClusters) {
         this.viewFactory = viewFactory;
         this.defaultDashboard = defaultDashboard;
+        this.specifiedMetaClusters = specifiedMetaClusters;
     }
 
     @GET @Timed @Produces(MediaType.TEXT_HTML)
     public DashboardView render(@QueryParam("cluster") Optional<String> clusterName) {
-        return viewFactory.create(clusterName.or(defaultDashboard));
+        return viewFactory.create(clusterName.or(defaultDashboard), specifiedMetaClusters);
     }
 }

breakerbox-service/src/main/java/com/yammer/breakerbox/service/views/ConfigureView.java

@@ -6,6 +6,8 @@
 import com.yammer.breakerbox.store.ServiceId;
 import com.yammer.tenacity.core.config.TenacityConfiguration;
 
+import java.util.Set;
+
 public class ConfigureView extends NavbarView {
     private final ServiceId serviceId;
     private final Iterable<SyncPropertyKeyState> syncPropertyKeyStates;
@@ -15,8 +17,9 @@ public class ConfigureView extends NavbarView {
     public ConfigureView(ServiceId serviceId,
                          Iterable<SyncPropertyKeyState> syncPropertyKeyStates,
                          TenacityConfiguration tenacityConfiguration,
-                         ImmutableList<OptionItem> dependencyEntities) {
-        super("/templates/configure/configure.mustache");
+                         ImmutableList<OptionItem> dependencyEntities,
+                         Set<String> specifiedMetaClusters) {
+        super("/templates/configure/configure.mustache", specifiedMetaClusters);
         this.serviceId = serviceId;
         this.syncPropertyKeyStates = syncPropertyKeyStates;
         this.tenacityConfiguration = tenacityConfiguration;

breakerbox-service/src/main/java/com/yammer/breakerbox/service/views/DashboardView.java

@@ -3,12 +3,14 @@
 import com.google.common.net.HostAndPort;
 import com.google.common.net.UrlEscapers;
 
+import java.util.Set;
+
 public class DashboardView extends NavbarView {
     private final String clusterName;
     private final HostAndPort breakerboxHostAndPort;
 
-    public DashboardView(String clusterName, HostAndPort breakerboxHostAndPort) {
-        super("/templates/dashboard/dashboard.mustache");
+    public DashboardView(String clusterName, HostAndPort breakerboxHostAndPort, Set<String> specifiedMetaClusters) {
+        super("/templates/dashboard/dashboard.mustache", specifiedMetaClusters);
         this.clusterName = clusterName;
         this.breakerboxHostAndPort = breakerboxHostAndPort;
     }

breakerbox-service/src/main/java/com/yammer/breakerbox/service/views/DashboardViewFactory.java

@@ -2,14 +2,16 @@
 
 import com.google.common.net.HostAndPort;
 
+import java.util.Set;
+
 public class DashboardViewFactory {
     private final HostAndPort breakerboxHostAndPort;
 
     public DashboardViewFactory(HostAndPort breakerboxHostAndPort) {
         this.breakerboxHostAndPort = breakerboxHostAndPort;
     }
 
-    public DashboardView create(String clusterName) {
-        return new DashboardView(clusterName, breakerboxHostAndPort);
+    public DashboardView create(String clusterName, Set<String> specifiedMetaClusters) {
+        return new DashboardView(clusterName, breakerboxHostAndPort, specifiedMetaClusters);
     }
 }

breakerbox-service/src/main/java/com/yammer/breakerbox/service/views/NavbarView.java

@@ -3,16 +3,22 @@
 import com.yammer.breakerbox.service.core.Instances;
 import io.dropwizard.views.View;
 
+import java.util.Set;
+
 public abstract class NavbarView extends View {
-    protected NavbarView(String templateName) {
+    
+    private Set<String> specifiedMetaClusters;
+
+    protected NavbarView(String templateName, Set<String> specifiedMetaClusters) {
         super(templateName);
+        this.specifiedMetaClusters = specifiedMetaClusters;
     }
 
     public Iterable<String> getClusters() {
         return Instances.clusters();
     }
 
     public Iterable<String> getNoMetaClusters() {
-        return Instances.noMetaClusters();
+        return Instances.noMetaClusters(specifiedMetaClusters);
     }
 }

breakerbox-service/src/main/java/com/yammer/breakerbox/service/views/NoPropertyKeysView.java

@@ -2,11 +2,13 @@
 
 import com.yammer.breakerbox.store.ServiceId;
 
+import java.util.Set;
+
 public class NoPropertyKeysView extends NavbarView {
     private final ServiceId serviceId;
 
-    public NoPropertyKeysView(ServiceId serviceId) {
-        super("/templates/errors/nopropertykeys.mustache");
+    public NoPropertyKeysView(ServiceId serviceId, Set<String> specifiedMetaClusters) {
+        super("/templates/errors/nopropertykeys.mustache", specifiedMetaClusters);
         this.serviceId = serviceId;
     }
 

breakerbox-service/src/test/java/com/yammer/breakerbox/service/core/tests/InstancesTest.java

@@ -1,6 +1,7 @@
 package com.yammer.breakerbox.service.core.tests;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
 import com.netflix.turbine.discovery.Instance;
 import com.yammer.breakerbox.service.core.Instances;
@@ -11,6 +12,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URI;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,7 +31,8 @@ public void clusters() {
 
     @Test
     public void instances() {
-        assertThat(Instances.noMetaClusters())
+        Set<String> specifiedMetaClusters = Sets.newHashSet("PRODUCTION");
+        assertThat(Instances.noMetaClusters(specifiedMetaClusters))
                 .isEqualTo(ImmutableSet.of("mock"));
     }