diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/AddServerPopup.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/AddServerPopup.java index 9ce357aa436..a304f075190 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/AddServerPopup.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/AddServerPopup.java @@ -23,6 +23,7 @@ import org.terasology.rendering.nui.databinding.ReadOnlyBinding; import org.terasology.rendering.nui.widgets.ActivateEventListener; import org.terasology.rendering.nui.widgets.UIButton; +import org.terasology.rendering.nui.widgets.UILabel; import org.terasology.rendering.nui.widgets.UIText; import java.util.function.Consumer; @@ -40,6 +41,7 @@ public class AddServerPopup extends CoreScreenLayer { private UIButton okButton; private UIButton cancelButton; private ServerInfo serverInfo; + private UILabel tip; private Consumer successFunc; @@ -51,6 +53,7 @@ public void initialise() { portText = find("port", UIText.class); okButton = find("ok", UIButton.class); cancelButton = find("cancel", UIButton.class); + tip = find("tip", UILabel.class); okButton.subscribe(button -> { @@ -159,4 +162,8 @@ public void onSuccess(Consumer success) { public void onCancel(ActivateEventListener listener) { cancelButton.subscribe(listener); } + + public void removeTip() { + tip.setVisible(false); + } } diff --git a/engine/src/main/java/org/terasology/telemetry/TelemetryEmitter.java b/engine/src/main/java/org/terasology/telemetry/TelemetryEmitter.java index d3f5c6116e9..34784647c67 100644 --- a/engine/src/main/java/org/terasology/telemetry/TelemetryEmitter.java +++ b/engine/src/main/java/org/terasology/telemetry/TelemetryEmitter.java @@ -42,7 +42,9 @@ public class TelemetryEmitter extends BatchEmitter { public static final String DEFAULT_COLLECTOR_HOST = "utility.terasology.org"; - public static final int DEFAULT_COLLECTOR_PORT = 80; + public static final String DEFAULT_COLLECTOR_OWNER = "Terasology Community"; + + public static final int DEFAULT_COLLECTOR_PORT = 14654; private static final Logger logger = LoggerFactory.getLogger(TelemetryEmitter.class); diff --git a/engine/src/main/java/org/terasology/telemetry/TelemetryScreen.java b/engine/src/main/java/org/terasology/telemetry/TelemetryScreen.java index 692041b5621..68513a1f56c 100644 --- a/engine/src/main/java/org/terasology/telemetry/TelemetryScreen.java +++ b/engine/src/main/java/org/terasology/telemetry/TelemetryScreen.java @@ -133,7 +133,9 @@ private void refreshContent() { private void pushAddServerPopupAndStartEmitter() { AddServerPopup addServerPopup = nuiManager.pushScreen(AddServerPopup.ASSET_URI, AddServerPopup.class); + addServerPopup.removeTip(); ServerInfo serverInfo = new ServerInfo("TelemetryCollector", TelemetryEmitter.DEFAULT_COLLECTOR_HOST, TelemetryEmitter.DEFAULT_COLLECTOR_PORT); + serverInfo.setOwner(TelemetryEmitter.DEFAULT_COLLECTOR_OWNER); addServerPopup.setServerInfo(serverInfo); addServerPopup.onSuccess((item) -> { TelemetryEmitter telemetryEmitter = (TelemetryEmitter) emitter; @@ -150,7 +152,9 @@ private void pushAddServerPopupAndStartEmitter() { private void pushAddServerPopupAndStartLogBackAppender() { AddServerPopup addServerPopup = nuiManager.pushScreen(AddServerPopup.ASSET_URI, AddServerPopup.class); + addServerPopup.removeTip(); ServerInfo serverInfo = new ServerInfo("TelemetryCollector", TelemetryLogstashAppender.DEFAULT_LOGSTASH_HOST, TelemetryLogstashAppender.DEFAULT_LOGSTASH_PORT); + serverInfo.setOwner(TelemetryLogstashAppender.DEFAULT_LOGSTASH_OWNER); addServerPopup.setServerInfo(serverInfo); addServerPopup.onSuccess((item) -> { StringBuilder destinationLogstash = new StringBuilder(); diff --git a/engine/src/main/java/org/terasology/telemetry/logstash/TelemetryLogstashAppender.java b/engine/src/main/java/org/terasology/telemetry/logstash/TelemetryLogstashAppender.java index 7707c517768..ff332cec2d6 100644 --- a/engine/src/main/java/org/terasology/telemetry/logstash/TelemetryLogstashAppender.java +++ b/engine/src/main/java/org/terasology/telemetry/logstash/TelemetryLogstashAppender.java @@ -44,6 +44,8 @@ public class TelemetryLogstashAppender extends LogstashTcpSocketAppender { public static final String DEFAULT_LOGSTASH_HOST = "utility.terasology.org"; + public static final String DEFAULT_LOGSTASH_OWNER = "Terasology Community"; + public static final int DEFAULT_LOGSTASH_PORT = 9600; private Context gameContext; diff --git a/engine/src/main/resources/assets/i18n/menu_en.lang b/engine/src/main/resources/assets/i18n/menu_en.lang index 8c49f7a4290..26a6b4452fe 100644 --- a/engine/src/main/resources/assets/i18n/menu_en.lang +++ b/engine/src/main/resources/assets/i18n/menu_en.lang @@ -228,6 +228,7 @@ "telemetry-launch-popup-text": "Telemetry system will send metrics and errors to the server. We do our best to avoid sending anything identifiable from your PC, e.g. telemetry includes your OS name, Java version but it doesn't include the MAC address, the home path, etc. You can review in Metric Menu and let us know if we missed something. Telemetry is super useful to an all volunteer project like ours and we'd really appreciate it!", "telemetry-launch-popup-title": "Telemetry In Terasology", "telemetry-menu": "Metrics Menu", + "telemetry-description": "This screen shows the metrics and their values that will be sent to the server. You can enable/disable it here. Telemetry is super useful to an all volunteer project like ours and we'd really appreciate it!", "telemetry-block-destroyed": "Block Destroyed", "telemetry-block-placed": "Block Placed", "telemetry-game-configuration": "Game Configuration", diff --git a/engine/src/main/resources/assets/ui/menu/addServerPopup.ui b/engine/src/main/resources/assets/ui/menu/addServerPopup.ui index 9ec853fbef8..4186dae9226 100644 --- a/engine/src/main/resources/assets/ui/menu/addServerPopup.ui +++ b/engine/src/main/resources/assets/ui/menu/addServerPopup.ui @@ -96,7 +96,8 @@ }, { "type": "UILabel", - "text": "${engine:menu#add-server-tip}" + "text": "${engine:menu#add-server-tip}", + "id": "tip" }, { "type": "UISpace", diff --git a/engine/src/main/resources/assets/ui/telemetryScreen.ui b/engine/src/main/resources/assets/ui/telemetryScreen.ui index c634eb6c917..d8b1daefd41 100644 --- a/engine/src/main/resources/assets/ui/telemetryScreen.ui +++ b/engine/src/main/resources/assets/ui/telemetryScreen.ui @@ -32,6 +32,20 @@ } } }, + { + "type": "UILabel", + "text": "${engine:menu#telemetry-description}", + "id": "description", + "layoutInfo": { + "width": 800, + "height": 24, + "position-horizontal-center": {}, + "position-top": { + "target": "BOTTOM", + "widget": "subtitle" + } + } + }, { "type": "ScrollableArea", "verticalScrollbar": true, @@ -42,7 +56,7 @@ "position-top": { "target": "BOTTOM", "offset": 16, - "widget": "subtitle" + "widget": "description" }, "position-bottom": { "target": "TOP",