Add parameter idle (default true) which toggles includeIdle and idle query params to Allocation API (#164)

* Force includeIdle=true for Opencost

Signed-off-by: Michael Dresser <[email protected]>

* Include idle based on parameter

Signed-off-by: Michael Dresser <[email protected]>

* Rename idle param for ease

Signed-off-by: Michael Dresser <[email protected]>

---------

Signed-off-by: Michael Dresser <[email protected]>

Author: michaelmdresser

pkg/cmd/aggregatedcommandbuilder.go

@@ -76,6 +76,8 @@ func runAggregatedAllocationCommand(ko *utilities.KubeOptions, o AggregatedAlloc
 			"window":           o.window,
 			"aggregate":        strings.Join(aggregation, ","),
 			"accumulate":       "true",
+			"includeIdle":      fmt.Sprintf("%t", o.includeIdle),
+			"idle":             fmt.Sprintf("%t", o.includeIdle),
 			"filterNamespaces": o.filterNamespace,
 		},
 		QueryBackendOptions: o.QueryBackendOptions,

pkg/cmd/common.go

@@ -15,6 +15,7 @@ import (
 type CostOptions struct {
 	window          string
 	filterNamespace string
+	includeIdle     bool
 
 	isHistorical bool
 
@@ -24,6 +25,7 @@ type CostOptions struct {
 func addCostOptionsFlags(cmd *cobra.Command, options *CostOptions) {
 	cmd.Flags().StringVar(&options.window, "window", "1d", "The window of data to query. See https://github.com/kubecost/docs/blob/master/allocation.md#querying for a detailed explanation of what can be passed here.")
 	cmd.Flags().BoolVar(&options.isHistorical, "historical", false, "show the total cost during the window instead of the projected monthly rate based on the data in the window")
+	cmd.Flags().BoolVar(&options.includeIdle, "idle", true, "include the __idle__ cost row in the response")
 
 	query.AddQueryBackendOptionsFlags(cmd, &options.QueryBackendOptions)
 }

pkg/cmd/label.go

@@ -81,9 +81,11 @@ func runCostLabel(ko *utilities.KubeOptions, no *CostOptionsLabel) error {
 	allocations, err := query.QueryAllocation(query.AllocationParameters{
 		Ctx: context.Background(),
 		QueryParams: map[string]string{
-			"window":     no.window,
-			"aggregate":  strings.Join(aggregation, ","),
-			"accumulate": "true",
+			"window":      no.window,
+			"aggregate":   strings.Join(aggregation, ","),
+			"accumulate":  "true",
+			"includeIdle": fmt.Sprintf("%t", no.includeIdle),
+			"idle":        fmt.Sprintf("%t", no.includeIdle),
 		},
 		QueryBackendOptions: no.QueryBackendOptions,
 	})

pkg/cmd/tui.go

@@ -278,9 +278,10 @@ func runTUI(ko *utilities.KubeOptions, do display.AllocationDisplayOptions, qo q
 			queriedAllocs, err := query.QueryAllocation(query.AllocationParameters{
 				Ctx: queryContext,
 				QueryParams: map[string]string{
-					"window":     windowOptions[windowIndex],
-					"aggregate":  strings.Join(aggregation, ","),
-					"accumulate": "true",
+					"window":      windowOptions[windowIndex],
+					"aggregate":   strings.Join(aggregation, ","),
+					"accumulate":  "true",
+					"includeIdle": "true",
 				},
 				QueryBackendOptions: qo,
 			})