Merge branch 'main' of ../private

TheLunarCompany · Feb 28, 2024 · 70cc720 · 70cc720
2 parents 3b772ce + d609307
commit 70cc720
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
@@ -47,7 +47,7 @@ ENV LUNAR_TELEMETRY_LOG_LEVEL info
 ENV AWS_ACCESS_KEY_ID ${AWS_ACCESS_KEY_ID}
 ENV AWS_SECRET_ACCESS_KEY ${AWS_SECRET_ACCESS_KEY}
 ENV LUNAR_FLUSH_SECONDS 5
-ENV LUNAR_HUB_URL ""
+ENV LUNAR_HUB_URL "hub.lunar.dev"
 ENV LUNAR_API_KEY ""
 ENV LUNAR_EXPORTER_S3_KEY_FORMAT "/"
 ENV LUNAR_EXPORTER_S3_MINIO_KEY_FORMAT "/"

diff --git a/proxy/src/services/lunar-engine/utils/environment/configuration.go b/proxy/src/services/lunar-engine/utils/environment/configuration.go
@@ -26,6 +26,8 @@ const (
 	lunarHubReportIntervalEnvVar     string = "HUB_REPORT_INTERVAL"
 	discoveryStateLocationEnvVar     string = "DISCOVERY_STATE_LOCATION"
 	remedyStatsStateLocationEnvVar   string = "REMEDY_STATE_LOCATION"
+
+	lunarHubDefaultValue string = "hub.lunar.dev"
 )
 
 func GetTenantName() string {
@@ -91,7 +93,12 @@ func GetRedisMaxOLRetryAttempts() (int, error) {
 }
 
 func GetHubURL() string {
-	return os.Getenv(lunarHubURLEnvVar)
+	lunarHubURL := os.Getenv(lunarHubURLEnvVar)
+	if lunarHubURL == "" {
+		log.Warn().Msgf("Could not find Lunar Hub URL from ENV, using default: %s", lunarHubDefaultValue)
+		lunarHubURL = lunarHubDefaultValue
+	}
+	return lunarHubURL
 }
 
 func GetAPIKey() string {