Merge branch 'master' of https://github.com/libertymutual/herman

libertymutual · Aug 31, 2018 · d34c6c5 · d34c6c5
2 parents e77377c + e1107c9
commit d34c6c5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/docs/newRelic/New_Relic_Alert_Configuration.md b/docs/newRelic/New_Relic_Alert_Configuration.md
@@ -219,6 +219,27 @@ For Example:
 ]
 ```
 
+### Synthetics Monitors and Alerts
+Synthetics should be a JSON Array. Each object in the array should match
+the payload required by the [New Relic Synthetics API](https://docs.newrelic.com/docs/apis/synthetics-rest-api/monitor-examples/manage-synthetics-monitors-rest-api#create-monitor). 
+For Example:
+
+```js
+[
+  {
+    "type": "BROWSER",
+    "frequency": 10,
+    "uri": "https://google.com",
+    "locations": ["AWS_US_EAST_1", "AWS_US_WEST_2"],
+    "status": "ENABLED",
+    "slaThreshold": 1.0,
+    "options": {
+      "verifySSL": true
+    }
+  }
+]
+```
+
 ### Channels
 
 Channels should be a JSON array. Each object in the array should match

diff --git a/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/newrelic/NewRelicBroker.java b/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/newrelic/NewRelicBroker.java
@@ -153,13 +153,20 @@ private NewRelicConfiguration getNewRelicConfiguration(NewRelicConfiguration new
                     .mapInProperties(fileUtil.findFile(newRelicConfigurationDefinition.getInfrastructureConditions(), false));
             }
 
+            String synthetics = null;
+            if (StringUtils.isNotBlank(newRelicConfigurationDefinition.getSynthetics())) {
+                synthetics = propertyHandler
+                    .mapInProperties(fileUtil.findFile(newRelicConfigurationDefinition.getSynthetics(), false));
+            }
+
             newRelicConfiguration = new NewRelicConfiguration()
                 .withDbName(dbName)
                 .withChannels(channels)
                 .withConditions(conditions)
                 .withRdsPluginsConditions(rdsPluginsConditions)
                 .withNrqlConditions(nrqlConditions)
                 .withInfrastructureConditions(infrastructureConditions)
+                .withSynthetics(synthetics)
                 .withApdex(newRelicConfigurationDefinition.getApdex());
         } else {
             newRelicConfiguration = null;

diff --git a/...ain/java/com/libertymutualgroup/herman/aws/ecs/broker/newrelic/NewRelicConfiguration.java b/...ain/java/com/libertymutualgroup/herman/aws/ecs/broker/newrelic/NewRelicConfiguration.java
@@ -28,6 +28,7 @@ public class NewRelicConfiguration {
     private String rdsPluginsConditions;
     private String nrqlConditions;
     private String infrastructureConditions;
+    private String synthetics;
     private String dbName;
     private String apdex;
 
@@ -71,6 +72,14 @@ public void setInfrastructureConditions(String infrastructureConditions) {
         this.infrastructureConditions = infrastructureConditions;
     }
 
+    public String getSynthetics() {
+        return synthetics;
+    }
+
+    public void setSynthetics(String synthetics) {
+        this.synthetics = synthetics;
+    }
+
     public String getDbName() {
         return dbName;
     }
@@ -95,6 +104,7 @@ public String toString() {
             ", rdsPluginsConditions='" + rdsPluginsConditions + '\'' +
             ", nrqlConditions='" + nrqlConditions + '\'' +
             ", infrastructureConditions='" + infrastructureConditions + '\'' +
+            ", synthetics='" + synthetics + '\'' +
             ", dbName='" + dbName + '\'' +
             ", apdex='" + apdex + '\'' +
             '}';
@@ -125,6 +135,11 @@ public NewRelicConfiguration withInfrastructureConditions(final String infrastru
         return this;
     }
 
+    public NewRelicConfiguration withSynthetics(final String synthetics) {
+        this.synthetics = synthetics;
+        return this;
+    }
+
     public NewRelicConfiguration withDbName(final String dbName) {
         this.dbName = dbName;
         return this;