honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump monitoring cluster alert versions (elastic/x-pack-elasticsearch#2673) 

If the monitoring cluster alert versions are too far behind the
monitoring index template versions then it causes tests in HttpExporterIT
to fail.  This change increases the versions for the cluster alerts to
7.0.0-alpha1 to match the increase in index template version from elastic/x-pack-elasticsearch#2614.

relates elastic/x-pack-elasticsearch#2671

Original commit: elastic/x-pack-elasticsearch@b3cc3c03fe
This commit is contained in:
David Roberts 2017-10-06 16:06:25 +01:00 committed by GitHub
parent 22c804ed24
commit dc1ed43ac1
7 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/org/elasticsearch/xpack/monitoring/exporter/ClusterAlertsUtil.java
View File

@ -49,7 +49,7 @@ public class ClusterAlertsUtil {
* The last time that all watches were updated. For now, all watches have been updated in the same version and should all be replaced * The last time that all watches were updated. For now, all watches have been updated in the same version and should all be replaced
* together. * together.
*/ */
public static final int LAST_UPDATED_VERSION = Version.V_6_0_0_beta1.id; public static final int LAST_UPDATED_VERSION = Version.V_7_0_0_alpha1.id;
/** /**
* An unsorted list of Watch IDs representing resource files for Monitoring Cluster Alerts. * An unsorted list of Watch IDs representing resource files for Monitoring Cluster Alerts.

2
plugin/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
View File

@ -7,7 +7,7 @@
"link": "elasticsearch/indices", "link": "elasticsearch/indices",
"severity": 2100, "severity": 2100,
"type": "monitoring", "type": "monitoring",
"version_created": 6000026, "version_created": 7000001,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
plugin/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "elasticsearch/nodes", "link": "elasticsearch/nodes",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 6000026, "version_created": 7000001,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
plugin/src/main/resources/monitoring/watches/kibana_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "kibana/instances", "link": "kibana/instances",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 6000026, "version_created": 7000001,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
plugin/src/main/resources/monitoring/watches/logstash_version_mismatch.json
View File

@ -7,7 +7,7 @@
"link": "logstash/instances", "link": "logstash/instances",
"severity": 1000, "severity": 1000,
"type": "monitoring", "type": "monitoring",
"version_created": 6000026, "version_created": 7000001,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
plugin/src/main/resources/monitoring/watches/xpack_license_expiration.json
View File

@ -8,7 +8,7 @@
"alert_index": ".monitoring-alerts-6", "alert_index": ".monitoring-alerts-6",
"cluster_uuid": "${monitoring.watch.cluster_uuid}", "cluster_uuid": "${monitoring.watch.cluster_uuid}",
"type": "monitoring", "type": "monitoring",
"version_created": 6000026, "version_created": 7000001,
"watch": "${monitoring.watch.id}" "watch": "${monitoring.watch.id}"
} }
}, },

2
plugin/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterIT.java
View File

@ -5,7 +5,6 @@
*/ */
package org.elasticsearch.xpack.monitoring.exporter.http; package org.elasticsearch.xpack.monitoring.exporter.http;
import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.DocWriteRequest;
@ -73,7 +72,6 @@ import static org.hamcrest.Matchers.notNullValue;
@ESIntegTestCase.ClusterScope(scope = Scope.TEST, @ESIntegTestCase.ClusterScope(scope = Scope.TEST,
numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0, supportsDedicatedMasters = false) numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0, supportsDedicatedMasters = false)
@AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/2671")
public class HttpExporterIT extends MonitoringIntegTestCase { public class HttpExporterIT extends MonitoringIntegTestCase {
private final boolean templatesExistsAlready = randomBoolean(); private final boolean templatesExistsAlready = randomBoolean();