diff --git a/CHANGELOG.md b/CHANGELOG.md index c9e73d9..493506d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 4.1.0 (06-07-2022) +- Removed deprecated `sinceValue` from Nrql Condition + # 4.0.1 (03-06-2022) - Allow usage of aggregationTimer when EVENT_TIMER streaming method is used diff --git a/README.md b/README.md index 465f1f6..cc45c3e 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Library is available in Maven Central com.ocadotechnology.newrelicalertsconfigurator newrelic-alerts-configurator - 4.0.1 + 4.1.0 ``` diff --git a/gradle.properties b/gradle.properties index 8f1ea25..7198c62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=4.0.2-SNAPSHOT \ No newline at end of file +version=4.1.1-SNAPSHOT \ No newline at end of file diff --git a/newrelic-alerts-configurator-dsl/README.md b/newrelic-alerts-configurator-dsl/README.md index 6a456fa..7a5accc 100644 --- a/newrelic-alerts-configurator-dsl/README.md +++ b/newrelic-alerts-configurator-dsl/README.md @@ -262,7 +262,6 @@ val config: NrqlCondition = nrqlCondition { enabled = true valueFunction = NrqlCondition.ValueFunction.SINGLE_VALUE query = "SELECT count(*) FROM `myApp:HealthStatus` WHERE healthy IS false" - sinceValue = NrqlCondition.SinceValue.SINCE_5 runBookUrl = "runBookUrl" terms { diff --git a/newrelic-alerts-configurator-dsl/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/dsl/configuration/condition/NrqlConditionDsl.kt b/newrelic-alerts-configurator-dsl/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/dsl/configuration/condition/NrqlConditionDsl.kt index 5531cb2..bc2a2cf 100644 --- a/newrelic-alerts-configurator-dsl/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/dsl/configuration/condition/NrqlConditionDsl.kt +++ b/newrelic-alerts-configurator-dsl/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/dsl/configuration/condition/NrqlConditionDsl.kt @@ -1,7 +1,6 @@ package com.ocadotechnology.newrelic.alertsconfigurator.dsl.configuration.condition import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.NrqlCondition -import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.UserDefinedConfiguration import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.signal.NrqlSignalConfiguration import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.NrqlTermsConfiguration import com.ocadotechnology.newrelic.alertsconfigurator.dsl.NewRelicConfigurationMarker @@ -14,7 +13,6 @@ class NrqlConditionDsl { var runBookUrl: String? = null var valueFunction: NrqlCondition.ValueFunction? = null var query: String? = null - var sinceValue: NrqlCondition.SinceValue? = null internal val terms: MutableList = mutableListOf() var nrqlSignalConfiguration: NrqlSignalConfiguration? = null @@ -36,7 +34,6 @@ fun nrqlCondition(block: NrqlConditionDsl.() -> Unit): NrqlCondition { .terms(dsl.terms) .valueFunction(requireNotNull(dsl.valueFunction) { "Nrql condition value cannot be null" }) .query(requireNotNull(dsl.query) { "Nrql condition query cannot be null" }) - .sinceValue(requireNotNull(dsl.sinceValue) { "Nrql condition since cannot be null" }) .signal(dsl.nrqlSignalConfiguration) .build() } \ No newline at end of file diff --git a/newrelic-alerts-configurator-examples/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.java b/newrelic-alerts-configurator-examples/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.java index 21cc494..909c2c3 100644 --- a/newrelic-alerts-configurator-examples/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.java +++ b/newrelic-alerts-configurator-examples/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.java @@ -162,7 +162,6 @@ public static NrqlCondition healthCheckCondition(String applicationName) { .operatorTerm(OperatorTerm.ABOVE) .thresholdTerm(0f) .build()) - .sinceValue(NrqlCondition.SinceValue.SINCE_5) .query("SELECT count(*) FROM `" + applicationName + ":HealthStatus` WHERE healthy IS false") .build(); } diff --git a/newrelic-alerts-configurator-examples/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.kt b/newrelic-alerts-configurator-examples/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.kt index cd4fa82..ff683e3 100644 --- a/newrelic-alerts-configurator-examples/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.kt +++ b/newrelic-alerts-configurator-examples/src/main/kotlin/com/ocadotechnology/newrelic/alertsconfigurator/examples/Defaults.kt @@ -82,7 +82,6 @@ fun healthCheckCondition(applicationName: String): NrqlCondition { conditionName = "Health Check" enabled = true valueFunction = NrqlCondition.ValueFunction.SINGLE_VALUE - sinceValue = NrqlCondition.SinceValue.SINCE_5 query = "SELECT count(*) FROM `$applicationName:HealthStatus` WHERE healthy IS false" terms { diff --git a/newrelic-alerts-configurator/README.md b/newrelic-alerts-configurator/README.md index b59580a..4a18f38 100644 --- a/newrelic-alerts-configurator/README.md +++ b/newrelic-alerts-configurator/README.md @@ -387,17 +387,6 @@ What you can set for NRQL condition: - single_value - the condition will be evaluated by the raw value returned. - sum - the condition will evaluate on the sum of the query results. - query - Query in NRQL. -- since value - The timeframe in which to evaulate the query. Possible values are: - - 1 - - 2 - - 3 - - 4 - - 5 - - 10 - - 15 - - 30 - - 60 - - 120 - signal configuration - Determines how data should be collected and what should happened when there is lack of data: - aggregation window - Time (in seconds) for how long NewRelic collects data before running the NRQL query. - evaluation windows - Number of windows to evaluate data. @@ -418,7 +407,6 @@ NrqlCondition.builder() .valueFunction(NrqlCondition.ValueFunction.SINGLE_VALUE) .term(term) .query("SELECT count(*) FROM `myApp:HealthStatus` WHERE healthy IS false") - .sinceValue(NrqlCondition.SinceValue.SINCE_5) .build(); ``` diff --git a/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfigurator.java b/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfigurator.java index 3339298..b4faf56 100644 --- a/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfigurator.java +++ b/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfigurator.java @@ -16,8 +16,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import static com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.signal.SignalUtils.intToStringOrNull; - @Slf4j class NrqlConditionConfigurator extends AbstractPolicyItemConfigurator { @@ -44,7 +42,6 @@ protected AlertsNrqlCondition convertFromConfigItem(NrqlCondition condition) { .terms(TermsUtils.createNrqlTerms(condition.getTerms())) .valueFunction(condition.getValueFunction().getValueString()) .nrql(Nrql.builder() - .sinceValue(getSinceValueOrNull(condition)) .query(condition.getQuery()) .build()); @@ -58,10 +55,6 @@ protected AlertsNrqlCondition convertFromConfigItem(NrqlCondition condition) { return nrqlConditionBuilder.build(); } - private String getSinceValueOrNull(NrqlCondition condition) { - return condition.getSinceValue() != null ? intToStringOrNull(condition.getSinceValue().getSince()) : null; - } - @Override protected boolean sameInstance(AlertsNrqlCondition alertsNrqlCondition1, AlertsNrqlCondition alertsNrqlCondition2) { return StringUtils.equals(alertsNrqlCondition1.getName(), alertsNrqlCondition2.getName()); diff --git a/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/configuration/condition/NrqlCondition.java b/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/configuration/condition/NrqlCondition.java index 46200cc..b589d4d 100644 --- a/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/configuration/condition/NrqlCondition.java +++ b/newrelic-alerts-configurator/src/main/java/com/ocadotechnology/newrelic/alertsconfigurator/configuration/condition/NrqlCondition.java @@ -20,7 +20,6 @@ *
  • {@link #terms}
    • *
  • {@link #valueFunction}
    • *
  • {@link #query}
    • - *
  • {@link #sinceValue}
    • *
  • {@link #signal}
    • * */ @@ -57,33 +56,12 @@ public class NrqlCondition { */ @NonNull private String query; - /** - * This is the timeframe in which to evaluate the {@link #query} - */ - private SinceValue sinceValue; /** * NRQL Signal configuration. */ private NrqlSignalConfiguration signal; - @Getter - @AllArgsConstructor - public enum SinceValue { - SINCE_1(1), - SINCE_2(2), - SINCE_3(3), - SINCE_4(4), - SINCE_5(5), - SINCE_10(10), - SINCE_15(15), - SINCE_30(30), - SINCE_60(60), - SINCE_120(120); - - final int since; - } - @Getter @AllArgsConstructor public enum ValueFunction { diff --git a/newrelic-alerts-configurator/src/test/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfiguratorTest.java b/newrelic-alerts-configurator/src/test/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfiguratorTest.java index ed4e927..f6930d3 100644 --- a/newrelic-alerts-configurator/src/test/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfiguratorTest.java +++ b/newrelic-alerts-configurator/src/test/java/com/ocadotechnology/newrelic/alertsconfigurator/NrqlConditionConfiguratorTest.java @@ -2,7 +2,11 @@ import com.ocadotechnology.newrelic.alertsconfigurator.configuration.PolicyConfiguration; import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.NrqlCondition; -import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.*; +import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.NrqlDurationTerm; +import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.NrqlTermsConfiguration; +import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.OperatorTerm; +import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.PriorityTerm; +import com.ocadotechnology.newrelic.alertsconfigurator.configuration.condition.terms.TimeFunctionTerm; import com.ocadotechnology.newrelic.apiclient.PolicyItemApi; import com.ocadotechnology.newrelic.apiclient.model.conditions.Terms; import com.ocadotechnology.newrelic.apiclient.model.conditions.nrql.AlertsNrqlCondition; @@ -13,7 +17,6 @@ public class NrqlConditionConfiguratorTest extends AbstractPolicyItemConfigurato private static final NrqlTermsConfiguration TERMS_CONFIGURATION = createTermsConfiguration().build(); private static final NrqlCondition.ValueFunction VALUE_FUNCTION = NrqlCondition.ValueFunction.SINGLE_VALUE; - private static final NrqlCondition.SinceValue SINCE_VALUE = NrqlCondition.SinceValue.SINCE_1; private static final String QUERY = "query"; private static final NrqlCondition NRQL_CONDITION = createNrqlCondition(CONDITION_NAME); @@ -77,7 +80,6 @@ private static NrqlCondition createNrqlCondition(String conditionName) { .term(TERMS_CONFIGURATION) .valueFunction(VALUE_FUNCTION) .query(QUERY) - .sinceValue(SINCE_VALUE) .build(); } @@ -103,7 +105,6 @@ private static AlertsNrqlCondition.AlertsNrqlConditionBuilder createConditionBui .valueFunction(VALUE_FUNCTION.getValueString()) .nrql(Nrql.builder() .query(QUERY) - .sinceValue(String.valueOf(SINCE_VALUE.getSince())) .build()); } diff --git a/newrelic-api-client/src/main/java/com/ocadotechnology/newrelic/apiclient/model/conditions/nrql/Nrql.java b/newrelic-api-client/src/main/java/com/ocadotechnology/newrelic/apiclient/model/conditions/nrql/Nrql.java index db0c494..0c745ba 100644 --- a/newrelic-api-client/src/main/java/com/ocadotechnology/newrelic/apiclient/model/conditions/nrql/Nrql.java +++ b/newrelic-api-client/src/main/java/com/ocadotechnology/newrelic/apiclient/model/conditions/nrql/Nrql.java @@ -1,20 +1,14 @@ package com.ocadotechnology.newrelic.apiclient.model.conditions.nrql; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Value; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; - @Value @Builder @AllArgsConstructor public class Nrql { @JsonProperty String query; - @JsonInclude(NON_NULL) - @JsonProperty("since_value") - String sinceValue; }