Merge pull request #15 from youenchene/compared-graph

feat: Add support for comparing service groups in cloud spending

Author: youenchene

README.md

@@ -8,7 +8,7 @@ The generated KPI are :
  - **Lead time** and **cycle time** trend
  - **Stocks** per week : **Red Bin** for bug and **stocks** per **development process steps**.
  - **Statistics controlled** weekly **throughput** (issues closed per week)
- - **Cloud spending follow-up**: monthly Azure & GCP costs overall and per service/group
+ - **Cloud spending follow-up**: monthly Azure & GCP costs overall, per service/group and **compared groups**.
 
 Current sources are :
  - github issues of a github organization.
@@ -73,6 +73,7 @@ Basic indicator to identify Change request event per week on pull requests.
 Tracks cloud infrastructure spending over time from Azure and GCP. Two visualizations are provided:
 - **Overall costs per month**: Shows total spending per cloud provider (Azure & GCP) aggregated monthly.
 - **Per service/group costs per month**: Shows spending breakdown by logical groups (preferred) or by individual services, as configured in `config.yml`.
+- **Compared service groups per month**: Shows a side-by-side comparison of two or more service groups (e.g., Old Platform vs New Platform), as configured in `config.yml`.
 
 This helps identify cost trends, compare spending across providers, and track specific services that contribute most to cloud expenses.
 
@@ -227,6 +228,7 @@ Available API endpoints :
 - GET /api/pr/change_requests/repo_dist → data/pr_change_requests_repo_dist.csv
 - GET /api/cloud_spending/monthly → data/cloud_spending_monthly.csv
 - GET /api/cloud_spending/services → data/cloud_spending_services.csv
+- GET /api/cloud_spending/compared → data/cloud_spending_compared.csv
 
 Cloud Spending CSV formats:
 
@@ -241,6 +243,11 @@ Cloud Spending CSV formats:
   - Rows are aggregated by month, provider, and group/service, and currency (no cross-currency mixing).
   - If you configure `cloudspending.detailed_service` with groups, only services belonging to the defined groups are included (and exposed under the `group` column). If you configure a flat list (legacy), only those services are included (under the `service` column).
 
+- data/cloud_spending_compared.csv
+  - Headers: `comparison,month,group,cost,currency`
+  - Rows are aggregated by comparison name, month, group name and currency.
+  - Used for side-by-side comparison charts.
+
 ### Configuration (config.yml)
 
 The `config.yml` file allows customization of GitHub project mappings and cloud spending service filters.
@@ -260,6 +267,16 @@ cloudspending:
       services:
         - "Cloud SQL"
         - "BigQuery"
+  compared_service:
+    - name: "Old Platform versus New Platform on GCP"
+      groups:
+        - name: "GCP Legacy"
+          services:
+            - "Compute Engine"
+        - name: "GCP New Platform"
+          services:
+            - "Cloud Run"
+            - "BigQuery"
 ```
 
 Legacy/alternate shapes also supported (backward compatible):

command/calculate/calculate.go

@@ -1583,13 +1583,17 @@ func runCloudSpendingCalculate() error {
 
 	var serviceFilter []string
 	var groups []config.DetailedServiceGroup
+	var compared []config.ComparedService
 	if _, err := os.Stat(cfgPath); err == nil {
 		cfg, err := config.Load(cfgPath)
 		if err == nil {
 			serviceFilter = cfg.CloudSpending.Services
 			if len(cfg.CloudSpending.DetailedService) > 0 {
 				groups = cfg.CloudSpending.DetailedService
 			}
+			if len(cfg.CloudSpending.ComparedService) > 0 {
+				compared = cfg.CloudSpending.ComparedService
+			}
 		}
 	}
 
@@ -1619,6 +1623,15 @@ func runCloudSpendingCalculate() error {
 	}
 	slog.Info("cloudspending.calculate.services.done", "output", servicesPath)
 
+	// Aggregate compared services
+	if len(compared) > 0 {
+		comparedPath := filepath.Join("data", "cloud_spending_compared.csv")
+		if err := writeCloudSpendingCompared(comparedPath, records, compared); err != nil {
+			return fmt.Errorf("failed to write compared aggregation: %w", err)
+		}
+		slog.Info("cloudspending.calculate.compared.done", "output", comparedPath)
+	}
+
 	slog.Info("cloudspending.calculate.done")
 	return nil
 }
@@ -1878,3 +1891,99 @@ func writeCloudSpendingServices(path string, records []cloudCostRecord, groups [
 
 	return w.Error()
 }
+
+func writeCloudSpendingCompared(path string, records []cloudCostRecord, comparisons []config.ComparedService) error {
+	// Build map: comparison_name -> service -> group_name
+	compToServiceToGroup := make(map[string]map[string]string)
+	for _, comp := range comparisons {
+		serviceToGroup := make(map[string]string)
+		for _, g := range comp.Groups {
+			gname := strings.TrimSpace(g.Name)
+			for _, s := range g.Services {
+				serviceToGroup[strings.TrimSpace(s)] = gname
+			}
+		}
+		compToServiceToGroup[comp.Name] = serviceToGroup
+	}
+
+	type key struct {
+		Comparison string
+		Group      string
+		Month      string
+		Currency   string
+	}
+	agg := make(map[key]float64)
+
+	for _, r := range records {
+		month := r.Month.Format("2006-01")
+		currency := strings.TrimSpace(r.Currency)
+
+		for _, comp := range comparisons {
+			serviceToGroup := compToServiceToGroup[comp.Name]
+			gname, ok := serviceToGroup[r.Service]
+			if !ok || gname == "" {
+				continue
+			}
+
+			k := key{
+				Comparison: comp.Name,
+				Group:      gname,
+				Month:      month,
+				Currency:   currency,
+			}
+			agg[k] += r.Cost
+		}
+	}
+
+	type row struct {
+		Comparison string
+		Month      string
+		Group      string
+		Cost       float64
+		Currency   string
+	}
+	var rows []row
+	for k, cost := range agg {
+		rows = append(rows, row{
+			Comparison: k.Comparison,
+			Month:      k.Month,
+			Group:      k.Group,
+			Cost:       cost,
+			Currency:   k.Currency,
+		})
+	}
+	sort.Slice(rows, func(i, j int) bool {
+		if rows[i].Comparison != rows[j].Comparison {
+			return rows[i].Comparison < rows[j].Comparison
+		}
+		if rows[i].Month != rows[j].Month {
+			return rows[i].Month < rows[j].Month
+		}
+		if rows[i].Group != rows[j].Group {
+			return rows[i].Group < rows[j].Group
+		}
+		return rows[i].Currency < rows[j].Currency
+	})
+
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		return err
+	}
+	f, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	w := csv.NewWriter(f)
+	defer w.Flush()
+
+	if err := w.Write([]string{"comparison", "month", "group", "cost", "currency"}); err != nil {
+		return err
+	}
+	for _, r := range rows {
+		if err := w.Write([]string{r.Comparison, r.Month, r.Group, fmt.Sprintf("%.2f", r.Cost), r.Currency}); err != nil {
+			return err
+		}
+	}
+	return w.Error()
+}

command/web/web.go

@@ -71,6 +71,7 @@ func Run(args []string) error {
 	serveCSV("/api/pr/change_requests/repo_dist", "pr_change_requests_repo_dist.csv")
 	serveCSV("/api/cloud_spending/monthly", "cloud_spending_monthly.csv")
 	serveCSV("/api/cloud_spending/services", "cloud_spending_services.csv")
+	serveCSV("/api/cloud_spending/compared", "cloud_spending_compared.csv")
 
 	// Static UI (optional)
 	indexPath := filepath.Join(*uiDir, "index.html")

connectors/config/config.go

@@ -22,16 +22,22 @@ type Config struct {
 		Services []string `yaml:"services"`
 		// Grouped services: each logical name aggregates several concrete services
 		DetailedService []DetailedServiceGroup `yaml:"detailed_service"`
+		// Compared services: list of comparisons between two groups of services
+		ComparedService []ComparedService `yaml:"compared_service"`
 	} `yaml:"cloud_spending"`
 	// Backward/forward compatibility alias to support alternate YAML shape:
 	// cloudspending:
 	//   detailed_service:
 	//     - name: "AI"
 	//       services: ["Vertex AI", "Claude Sonnet 4.5"]
+	//   compared_service:
+	//     - name: "Old vs New"
+	//       groups: [...]
 	//   or (legacy flat list): ["Vertex AI", "Compute Engine", ...]
 	// If provided, we map it to CloudSpending.DetailedService or Services so downstream code keeps working.
 	CloudSpendingAlt struct {
-		DetailedService any `yaml:"detailed_service"`
+		DetailedService any               `yaml:"detailed_service"`
+		ComparedService []ComparedService `yaml:"compared_service"`
 	} `yaml:"cloudspending"`
 }
 
@@ -41,6 +47,12 @@ type DetailedServiceGroup struct {
 	Services []string `yaml:"services"`
 }
 
+// ComparedService defines a comparison between several groups of services.
+type ComparedService struct {
+	Name   string                 `yaml:"name"`
+	Groups []DetailedServiceGroup `yaml:"groups"`
+}
+
 type Project struct {
 	ID      string   `yaml:"id"`
 	Name    string   `yaml:"name"`
@@ -114,6 +126,9 @@ func Load(path string) (*Config, error) {
 		}
 	}
 	// If only the new canonical grouped field is provided under cloud_spending, keep as is.
+	if len(c.CloudSpendingAlt.ComparedService) > 0 {
+		c.CloudSpending.ComparedService = c.CloudSpendingAlt.ComparedService
+	}
 	slog.Info(fmt.Sprintf("Loaded config: %s", path))
 	return &c, nil
 }

ui/src/App.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { useCycleTimes, useStocks, useStocksWeek, useThroughputWeek, usePRChangeRequestsWeek, useCloudSpendingMonthly, useCloudSpendingServices } from './api'
+import { useCycleTimes, useStocks, useStocksWeek, useThroughputWeek, usePRChangeRequestsWeek, useCloudSpendingMonthly, useCloudSpendingServices, useCloudSpendingCompared } from './api'
 import { Card, CardContent, CardHeader, CardTitle } from './components/ui/card'
 import { Sparkline } from './components/Sparkline'
 import { LineChart, Point } from './components/LineChart'
@@ -405,9 +405,11 @@ function CloudSpendingBlock() {
   const { t } = useTranslation()
   const monthlyQuery = useCloudSpendingMonthly()
   const servicesQuery = useCloudSpendingServices()
+  const comparedQuery = useCloudSpendingCompared()
 
   const monthlyData = monthlyQuery.data ?? []
   const servicesData = servicesQuery.data ?? []
+  const comparedData = comparedQuery.data ?? []
 
   // Process overall monthly data (Azure & GCP per month)
   const monthlyLabels = useMemo(() => {
@@ -506,6 +508,57 @@ function CloudSpendingBlock() {
     return map
   }, [servicesData, servicesLabels])
 
+  // Process compared services data
+  const comparedLabels = useMemo(() => {
+    const months = new Set<string>()
+    comparedData.forEach(r => {
+      const month = r['month']
+      if (month) months.add(month)
+    })
+    return Array.from(months).sort()
+  }, [comparedData])
+
+  const comparisons = useMemo(() => {
+    const map = new Map<string, { stacks: StackSeries[]; currency: string }>()
+    // Colors for comparison groups - can be more varied
+    const colors = ['#3B82F6', '#10B981', '#F59E0B', '#EF4444', '#8B5CF6']
+    
+    const tmp: Record<string, Record<string, number[]>> = {}
+    const cur: Record<string, Set<string>> = {}
+
+    comparedData.forEach(r => {
+      const comp = r['comparison']
+      const group = r['group']
+      const month = r['month']
+      if (!comp || !group || !month) return
+      const idx = comparedLabels.indexOf(month)
+      if (idx < 0) return
+      
+      if (!tmp[comp]) tmp[comp] = {}
+      if (!tmp[comp][group]) tmp[comp][group] = new Array(comparedLabels.length).fill(0)
+      tmp[comp][group][idx] = parseNumber(r['cost']) ?? 0
+      
+      const c = (r['currency'] || '').toString().trim()
+      if (c) {
+        if (!cur[comp]) cur[comp] = new Set<string>()
+        cur[comp].add(c)
+      }
+    })
+
+    Object.keys(tmp).forEach(comp => {
+      const groups = Object.keys(tmp[comp]).sort()
+      const stacks = groups.map((group, i) => ({
+        name: group,
+        values: tmp[comp][group],
+        color: colors[i % colors.length]
+      }))
+      const set = cur[comp]
+      const currency = set && set.size === 1 ? Array.from(set)[0] : ''
+      map.set(comp, { stacks, currency })
+    })
+    return map
+  }, [comparedData, comparedLabels])
+
   return (
     <section>
       <h2 className="text-xl font-semibold mb-3">{t('cloudSpending.sectionTitle')}</h2>
@@ -533,6 +586,27 @@ function CloudSpendingBlock() {
           </CardContent>
         </Card>
 
+        {/* Compared services: side-by-side comparison */}
+        {comparisons.size > 0 && Array.from(comparisons.entries()).map(([comp, info]) => (
+          <Card key={comp}>
+            <CardHeader>
+              <CardTitle>{comp}</CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="w-full overflow-x-auto">
+                <StackedBarChart
+                  labels={comparedLabels}
+                  stacks={info.stacks}
+                  width={Math.max(900, comparedLabels.length * 60)}
+                  height={300}
+                  yAxisLabel={info.currency ? `${t('cloudSpending.amount')} (${info.currency})` : t('cloudSpending.amount')}
+                  showLegend
+                />
+              </div>
+            </CardContent>
+          </Card>
+        ))}
+
         {/* Service-specific: one chart per service */}
         {servicesByService.size > 0 ? (
           Array.from(servicesByService.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([service, info]) => (

ui/src/api.ts

@@ -71,3 +71,10 @@ export function useCloudSpendingServices() {
     queryFn: () => fetchJSON('/api/cloud_spending/services'),
   })
 }
+
+export function useCloudSpendingCompared() {
+  return useQuery<Row[]>({
+    queryKey: ['cloud_spending_compared'],
+    queryFn: () => fetchJSON('/api/cloud_spending/compared'),
+  })
+}