You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
# If no exception was raised it must have succeeded!
247
272
logger.warn("Restored connection to ES instance",:url=>url.sanitized.to_s)
248
273
# We reconnected to this node, check its ES version
@@ -254,10 +279,22 @@ def healthcheck!
254
279
@logger.info("ES Output version determined",:es_version=>major)
255
280
set_new_major_version(major)
256
281
elsifmajor > @maximum_seen_major_version
257
-
@logger.warn("Detected a node with a higher major version than previously observed. This could be the result of an elasticsearch cluster upgrade.",:previous_major=>@maximum_seen_major_version,:new_major=>major,:node_url=>url)
282
+
@logger.warn("Detected a node with a higher major version than previously observed. This could be the result of an elasticsearch cluster upgrade.",:previous_major=>@maximum_seen_major_version,:new_major=>major,:node_url=>url.sanitized.to_s)
258
283
set_new_major_version(major)
259
284
end
260
-
meta[:state]=:alive
285
+
ifoss? || valid_es_license?(url)
286
+
meta[:state]=:alive
287
+
else
288
+
# As this version is to be shipped with Logstash 7.x we won't mark the connection as unlicensed
289
+
#
290
+
# logger.error("Cannot connect to the Elasticsearch cluster configured in the Elasticsearch output. Logstash requires the default distribution of Elasticsearch. Please update to the default distribution of Elasticsearch for full access to all free features, or switch to the OSS distribution of Logstash.", :url => url.sanitized.to_s)
291
+
# meta[:state] = :unlicensed
292
+
#
293
+
# Instead we'll log a deprecation warning and mark it as alive:
logger.warn("Attempted to resurrect connection to dead ES instance, but got an error.",url: url.sanitized.to_s,error_type: e.class,error: e.message)
@@ -269,6 +306,10 @@ def stop_resurrectionist
269
306
@resurrectionist.joinif@resurrectionist
270
307
end
271
308
309
+
deflog_license_deprecation_warn(url)
310
+
logger.warn("DEPRECATION WARNING: Connecting to an OSS distribution of Elasticsearch using the default distribution of Logstash will stop working in Logstash 8.0.0. Please upgrade to the default distribution of Elasticsearch, or use the OSS distribution of Logstash",:url=>url.sanitized.to_s)
0 commit comments