GPU_A100_RATE and the SU/RESOURCE lists are removed from config.

The USE_NERC_RATES None check is gone since it’s always a bool.
The multi‑month block no longer changes report_month.
The outage call now passes date strings to match the function.

Author: jimmysway

openshift_metrics/config.py

@@ -16,23 +16,16 @@
 S3_METRICS_BUCKET = os.getenv("S3_METRICS_BUCKET", "openshift_metrics")
 
 # Billing Configuration
-# Service Unit Names for Rate Lookup from nerc-rates
-SU_NAMES = ["GPUV100", "GPUA100", "GPUA100SXM4", "GPUH100", "CPU"]
-RESOURCE_NAMES = ["vCPUs", "RAM", "GPUs"]
 
 # Rate Configuration
-USE_NERC_RATES_ENV = os.getenv("USE_NERC_RATES")
-USE_NERC_RATES = USE_NERC_RATES_ENV.lower() == "true" if USE_NERC_RATES_ENV else None
-
+USE_NERC_RATES = os.getenv("USE_NERC_RATES", "false").lower() == "true"
 # Individual rates (used when USE_NERC_RATES=false)
 RATE_CPU_SU = os.getenv("RATE_CPU_SU")
 RATE_GPU_V100_SU = os.getenv("RATE_GPU_V100_SU")
 RATE_GPU_A100SXM4_SU = os.getenv("RATE_GPU_A100SXM4_SU")
 RATE_GPU_A100_SU = os.getenv("RATE_GPU_A100_SU")
 RATE_GPU_H100_SU = os.getenv("RATE_GPU_H100_SU")
 
-# Legacy rate (for backward compatibility)
-GPU_A100_RATE = os.getenv("GPU_A100_RATE")
 
 # Prometheus Query Configuration
 PROM_QUERY_INTERVAL_MINUTES = int(os.getenv("PROM_QUERY_INTERVAL_MINUTES", 15))

openshift_metrics/merge.py

@@ -164,10 +164,6 @@ def main():
         datetime.strptime(report_start_date, "%Y-%m-%d"), "%Y-%m"
     )
 
-    if USE_NERC_RATES is None:
-        raise ValueError(
-            "USE_NERC_RATES environment variable must be set to 'true' or 'false'"
-        )
 
     if USE_NERC_RATES:
         logger.info("Using nerc rates for rates and outages")
@@ -182,10 +178,8 @@ def main():
             gpu_h100=rates_data.get_value_at("GPUH100 SU Rate", report_month, Decimal),
         )
         outage_data = outages.load_from_url()
-        report_start_date_dt = datetime.strptime(report_start_date, "%Y-%m-%d")
-        report_end_date_dt = datetime.strptime(report_end_date, "%Y-%m-%d")
         ignore_hours = outage_data.get_outages_during(
-            report_start_date_dt, report_end_date_dt, cluster_name
+            report_start_date, report_end_date, cluster_name
         )
     else:
         if RATE_CPU_SU is None:
@@ -236,11 +230,6 @@ def main():
 
     if report_start_date_dt.month != report_end_date_dt.month:
         logger.warning("The report spans multiple months")
-        report_month += " to " + datetime.strftime(report_end_date_dt, "%Y-%m")
-
-    logger.info(
-        f"Generating report from {report_start_date_dt} to {report_end_date_dt + timedelta(days=1)} for {cluster_name}"
-    )
 
     report_start_date = report_start_date_dt
     report_end_date = report_end_date_dt