Merge pull request #2639 from ameijer/atm/retention

use retention to determine coverage, not query window

pkg/customcost/repositoryquerier.go

@@ -125,7 +125,7 @@ func getCustomCostAccumulateOption(window opencost.Window, from []opencost.Accum
 		return opencost.AccumulateOptionHour, nil
 	}
 
-	dailyStoreDays := env.GetCustomCostQueryWindowDays()
+	dailyStoreDays := env.GetDataRetentionDailyResolutionDays()
 	dailySteps := time.Duration(dailyStoreDays) * timeutil.Day
 	oldestDaily := time.Now().Add(-1 * dailySteps)
 	// Use daily if...
@@ -135,6 +135,10 @@ func getCustomCostAccumulateOption(window opencost.Window, from []opencost.Accum
 		return opencost.AccumulateOptionDay, nil
 	}
 
+	if oldestDaily.After(*window.Start()) {
+		return opencost.AccumulateOptionNone, fmt.Errorf("data store does not have coverage for %v", window)
+	}
+
 	return opencost.AccumulateOptionNone, fmt.Errorf("no valid accumulate option in %v for %s", from, window)
 }
 

pkg/env/costmodelenv.go

@@ -642,7 +642,7 @@ func GetRegionOverrideList() []string {
 }
 
 func GetDataRetentionDailyResolutionDays() int64 {
-	return env.GetInt64(DataRetentionDailyResolutionDaysEnvVar, 15)
+	return env.GetInt64(DataRetentionDailyResolutionDaysEnvVar, 30)
 }
 
 func GetDataRetentionHourlyResolutionHours() int64 {