Make Report URI configurable

Author: wido

server/src/org/apache/cloudstack/report/UsageReporter.java

@@ -81,12 +81,14 @@ public class UsageReporter extends ManagerBase implements ComponentMethodInterce
     public static final Logger s_logger = Logger.getLogger(UsageReporter.class.getName());
 
     public static final ConfigKey<Integer> UsageReportInterval = new ConfigKey<>("Advanced", Integer.class,
-            "usage.report.interval", "7",
-            "The interval in days between usage reports sent to the CloudStack project. Set to 0 to disable.",
+            "usage.report.interval", "0",
+            "The interval in days between usage reports sent to the CloudStack project. 0 is the default (disabled) and when enabled a value of 7 is recommended.",
             true, ConfigKey.Scope.Global);
 
-    /* !FIX ME! This should point to a Apache Infra host with SSL! */
-    private String reportHost = "https://call-home.cloudstack.org/report";
+    public static final ConfigKey<String> UsageReportUri = new ConfigKey<>("Advanced", String.class,
+            "usage.report.uri", "https://reporting.cloudstack.org/report",
+            "The URI to which usage reports are sent.",
+            true, ConfigKey.Scope.Global);
 
     private String uniqueID = null;
 
@@ -130,7 +132,7 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {UsageReportInterval};
+        return new ConfigKey<?>[] {UsageReportInterval, UsageReportUri};
     }
 
     private void init() {
@@ -478,7 +480,7 @@ protected void runInContext() {
                 reportMap.put("versions", getVersionReport());
                 reportMap.put("current_version", getCurrentVersion());
 
-                sendReport(reportHost, uniqueID, reportMap);
+                sendReport(UsageReportUri.value(), uniqueID, reportMap);
 
             } catch (Exception e) {
                 s_logger.warn("Failed to compile Usage Report: " + e.getMessage());