Removed deprecated options

Changed docker samples (environment variables)
Changed Telemetry (allow extra config data, normalize keys to lowercase)
Fix support for gossip seeds provided as an array
Calculate in linux disk stats correctly for mount point instead of root

Signed-off-by: JOSE FUXA <[email protected]>

Author: j-fuxa

docker-compose.yml

@@ -29,11 +29,11 @@ services:
       - shared.env
     environment:
       - EVENTSTORE_GOSSIP_SEED=172.30.240.12:2113,172.30.240.13:2113
-      - EVENTSTORE_INT_IP=172.30.240.11
+      - EVENTSTORE_REPLICATION_IP=172.30.240.11
       - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node1/node.crt
       - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node1/node.key
       - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2111
+      - EVENTSTORE_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2111
     ports:
       - 2111:2113
     networks:
@@ -51,11 +51,11 @@ services:
       - shared.env
     environment:
       - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.13:2113
-      - EVENTSTORE_INT_IP=172.30.240.12
+      - EVENTSTORE_REPLICATION_IP=172.30.240.12
       - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node2/node.crt
       - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node2/node.key
       - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2112
+      - EVENTSTORE_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2112
     ports:
       - 2112:2113
     networks:
@@ -73,11 +73,11 @@ services:
       - shared.env
     environment:
       - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.12:2113
-      - EVENTSTORE_INT_IP=172.30.240.13
+      - EVENTSTORE_REPLICATION_IP=172.30.240.13
       - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node3/node.crt
       - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node3/node.key
       - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2113
+      - EVENTSTORE_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2113
     ports:
       - 2113:2113
     networks:

samples/server/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
       - EVENTSTORE_CLUSTER_SIZE=1
       - EVENTSTORE_RUN_PROJECTIONS=All
       - EVENTSTORE_START_STANDARD_PROJECTIONS=true
-      - EVENTSTORE_HTTP_PORT=2113
+      - EVENTSTORE_NODE_PORT=2113
       - EVENTSTORE_INSECURE=true
       - EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true
     ports:

shared.env

@@ -1,7 +1,7 @@
 EVENTSTORE_CLUSTER_SIZE=3
 EVENTSTORE_RUN_PROJECTIONS=All
-EVENTSTORE_INT_TCP_PORT=1112
-EVENTSTORE_HTTP_PORT=2113
+EVENTSTORE_REPLICATION_PORT=1112
+EVENTSTORE_NODE_PORT=2113
 EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/etc/eventstore/certs/ca
 EVENTSTORE_DISCOVER_VIA_DNS=false
-EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true
+EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true

src/EventStore.Core.Tests/Helpers/MiniClusterNode.cs

@@ -127,7 +127,6 @@ public MiniClusterNode(string pathname, int debugIndex, IPEndPoint internalTcp,
 				NodeIp = ExternalTcpEndPoint.Address,
 				ReplicationPort = InternalTcpEndPoint.Port,
 				NodePort = HttpEndPoint.Port,
-				DisableInternalTcpTls = false,
 				ReplicationHeartbeatTimeout = 2_000,
 				ReplicationHeartbeatInterval = 2_000,
 				EnableAtomPubOverHttp = true,

src/EventStore.Core.Tests/Helpers/MiniNode.cs

@@ -163,9 +163,9 @@ public MiniNode(string pathname,
 					.Build()),
 		}.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
 				ssl_connections.GetServerCertificate())
-			.WithInternalSecureTcpOn(IntTcpEndPoint)
-			.WithExternalSecureTcpOn(TcpEndPoint)
-			.WithHttpOn(HttpEndPoint);
+			.WithReplicationEndpointOn(IntTcpEndPoint)
+			.WithExternalTcpOn(TcpEndPoint)
+			.WithNodeEndpointOn(HttpEndPoint);
 
 		var inMemConf = new ConfigurationBuilder()
 			.AddInMemoryCollection(new KeyValuePair<string, string>[] {
@@ -178,7 +178,7 @@ public MiniNode(string pathname,
 			}).Build();
 
 		if (advertisedExtHostAddress != null)
-			options = options.AdvertiseHttpHostAs(new DnsEndPoint(advertisedExtHostAddress, advertisedHttpPort));
+			options = options.AdvertiseNodeAs(new DnsEndPoint(advertisedExtHostAddress, advertisedHttpPort));
 
 		options = inMemDb
 			? options.RunInMemory()

src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs

@@ -131,9 +131,9 @@ protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 		return options
 			.Insecure()
 			.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
-			.WithInternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11120))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Loopback, 11120))
 			.AdvertiseExternalHostAs(new DnsEndPoint("196.168.1.1", 11131))
-			.AdvertiseHttpHostAs(new DnsEndPoint("196.168.1.1", 21130));
+			.AdvertiseNodeAs(new DnsEndPoint("196.168.1.1", 21130));
 	}
 
 	[Test]
@@ -158,7 +158,7 @@ protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
 			.Insecure()
-			.WithInternalTcpOn(new IPEndPoint(IPAddress.Any, 11120))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Any, 11120))
 			.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
 			.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131));
 	}
@@ -186,9 +186,9 @@ protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
 			.Insecure()
-			.WithHttpOn(new IPEndPoint(IPAddress.Any, 21130))
+			.WithNodeEndpointOn(new IPEndPoint(IPAddress.Any, 21130))
 			.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
-			.WithInternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11120));
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Loopback, 11120));
 	}
 
 	[Test]
@@ -214,11 +214,11 @@ protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
 			.Insecure()
-			.WithHttpOn(new IPEndPoint(IPAddress.Loopback, 21130))
+			.WithNodeEndpointOn(new IPEndPoint(IPAddress.Loopback, 21130))
 			.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
-			.WithInternalTcpOn(new IPEndPoint(IPAddress.Any, 11120))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Any, 11120))
 			.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131))
-			.AdvertiseHttpHostAs(new DnsEndPoint("10.0.0.1", 21131));
+			.AdvertiseNodeAs(new DnsEndPoint("10.0.0.1", 21131));
 	}
 
 	[Test]

src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs

@@ -39,12 +39,6 @@ public void should_have_default_endpoints()
 		Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 2113), _node.NodeInfo.HttpEndPoint);
 	}
 
-	[Test]
-	public void should_use_tls()
-	{
-		Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-	}
-
 	[Test]
 	public void should_set_command_line_args_to_default_values()
 	{
@@ -110,12 +104,6 @@ public void should_have_default_secure_endpoints()
 		Assert.AreEqual(httpEndPoint.ToDnsEndPoint(), _node.GossipAdvertiseInfo.HttpEndPoint);
 	}
 
-	[Test]
-	public void should_use_tls()
-	{
-		Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-	}
-
 	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options;

src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs

@@ -21,7 +21,7 @@ public class with_ssl_enabled_and_using_a_security_certificate_from_file<TLogFor
 	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 
-		return options.WithInternalSecureTcpOn(_internalSecTcp).WithExternalSecureTcpOn(_externalSecTcp) with
+		return options.WithReplicationEndpointOn(_internalSecTcp).WithExternalTcpOn(_externalSecTcp) with
 		{
 			CertificateFile = new()
 			{
@@ -32,12 +32,6 @@ protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 		};
 	}
 
-	[Test]
-	public void should_set_tls_to_enabled()
-	{
-		Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-	}
-
 	[Test]
 	public void should_set_certificate()
 	{
@@ -73,17 +67,11 @@ public class with_ssl_enabled_and_using_a_security_certificate<TLogFormat, TStre
 	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
-			.WithInternalSecureTcpOn(_internalSecTcp)
-			.WithExternalSecureTcpOn(_externalSecTcp)
+			.WithReplicationEndpointOn(_internalSecTcp)
+			.WithExternalTcpOn(_externalSecTcp)
 			.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()), _certificate);
 	}
 
-	[Test]
-	public void should_set_tls_to_enabled()
-	{
-		Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-	}
-
 	[Test]
 	public void should_set_certificate()
 	{
@@ -113,8 +101,8 @@ public void SetUp()
 		_options = new ClusterVNodeOptions()
 			.ReduceMemoryUsageForTests()
 			.RunInMemory()
-			.WithInternalSecureTcpOn(internalSecTcp)
-			.WithExternalSecureTcpOn(externalSecTcp);
+			.WithReplicationEndpointOn(internalSecTcp)
+			.WithExternalTcpOn(externalSecTcp);
 		try
 		{
 			_ = new ClusterVNode<TStreamId>(_options, LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory,

src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs

@@ -57,9 +57,9 @@ public class with_custom_ip_endpoints<TLogFormat, TStreamId> : SingleNodeScenari
 	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
-			.WithHttpOn(_httpEndPoint)
-			.WithExternalSecureTcpOn(_externalTcp)
-			.WithInternalSecureTcpOn(_internalTcp);
+			.WithNodeEndpointOn(_httpEndPoint)
+			.WithExternalTcpOn(_externalTcp)
+			.WithReplicationEndpointOn(_internalTcp);
 	}
 
 	[Test]
@@ -154,12 +154,12 @@ public class with_custom_advertise_as<TLogFormat, TStreamId> : SingleNodeScenari
 	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options)
 	{
 		return options
-			.WithHttpOn(_httpEndpoint)
-			.WithExternalSecureTcpOn(_extTcpEndpoint)
-			.WithInternalSecureTcpOn(_intTcpEndpoint)
+			.WithNodeEndpointOn(_httpEndpoint)
+			.WithExternalTcpOn(_extTcpEndpoint)
+			.WithReplicationEndpointOn(_intTcpEndpoint)
 			.AdvertiseInternalHostAs(new DnsEndPoint($"{InternalIp}.com", _intTcpEndpoint.Port + 1000))
 			.AdvertiseExternalHostAs(new DnsEndPoint($"{ExternalIp}.com", _extTcpEndpoint.Port + 1000))
-			.AdvertiseHttpHostAs(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000));
+			.AdvertiseNodeAs(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000));
 	}
 
 	[Test]

src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs

@@ -1,6 +1,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -169,6 +170,24 @@ public void can_set_gossip_seed_values()
 		options.Cluster.GossipSeed.Should().BeEquivalentTo(endpoints);
 	}
 
+	[Fact]
+	public void can_set_gossip_seed_values_via_array()
+	{
+		var config = new ConfigurationBuilder()
+			.AddInMemoryCollection([
+				new KeyValuePair<string, string?>("EventStore:GossipSeed:0", "127.0.0.1:1113"),
+				new KeyValuePair<string, string?>("EventStore:GossipSeed:1", "some-host:1114"),
+			])
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.GossipSeed.Should().BeEquivalentTo(new EndPoint[]
+		{
+			new IPEndPoint(IPAddress.Loopback, 1113), new DnsEndPoint("some-host", 1114),
+		});
+	}
+
 	[Theory]
 	[InlineData("127.0.0.1", "You must specify the ports in the gossip seed.")]
 	[InlineData("127.0.0.1:3.1415", "Invalid format for gossip seed port: 3.1415.")]
@@ -188,6 +207,18 @@ public void reports_gossip_seed_errors(string gossipSeed, string expectedError)
 			ex.Message);
 	}
 
+	[Fact]
+	public void can_set_node_ip()
+	{
+		var config = new ConfigurationBuilder()
+			.AddEventStoreEnvironmentVariables(("EVENTSTORE_NODE_IP", "192.168.0.1"))
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Interface.NodeIp.Should().Be(IPAddress.Parse("192.168.0.1"));
+	}
+
 	[Theory]
 	[InlineData("127.0.0.1.0", "An invalid IP address was specified.")]
 	public void reports_ip_address_errors(string nodeIp, string expectedError)