Просмотр исходного кода

Merge branch 'develop' into extra_buildx_debugging

Matt Ray 2 лет назад
Родитель
Сommit
81ed37dd99

+ 0 - 7
pkg/cloud/config/controller_handlers.go

@@ -14,7 +14,6 @@ import (
 	"github.com/opencost/opencost/pkg/cloud/aws"
 	"github.com/opencost/opencost/pkg/cloud/azure"
 	"github.com/opencost/opencost/pkg/cloud/gcp"
-	"github.com/opencost/opencost/pkg/env"
 )
 
 var protocol = proto.HTTP()
@@ -27,12 +26,6 @@ func (c *Controller) cloudCostChecks() func(w http.ResponseWriter, r *http.Reque
 		}
 	}
 
-	if !env.IsCloudCostEnabled() {
-		return func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-			http.Error(w, "ConfigController: is not enabled", http.StatusServiceUnavailable)
-		}
-	}
-
 	return nil
 }
 

+ 3 - 3
ui/src/Reports.js

@@ -158,7 +158,7 @@ const ReportsPage = () => {
   const searchParams = new URLSearchParams(routerLocation.search);
   const routerHistory = useHistory();
   useEffect(() => {
-    setWindow(searchParams.get("window") || "6d");
+    setWindow(searchParams.get("window") || "7d");
     setAggregateBy(searchParams.get("agg") || "namespace");
     setAccumulate(searchParams.get("acc") === "true" || false);
     setCurrency(searchParams.get("currency") || "USD");
@@ -207,12 +207,12 @@ const ReportsPage = () => {
           {
             primary: "Failed to load report data",
             secondary:
-              "Please update Kubecost to the latest version, then contact support if problems persist.",
+              "Please update OpenCost to the latest version, then open an Issue on GitHub if problems persist.",
           },
         ]);
       } else {
         let secondary =
-          "Please contact Kubecost support with a bug report if problems persist.";
+          "Please open an Issue on GitHub if problems persist.";
         if (err.message.length > 0) {
           secondary = err.message;
         }

+ 2 - 2
ui/src/cloudCost/cloudCostDetails.js

@@ -73,12 +73,12 @@ const CloudCostDetails = ({
           {
             primary: "Failed to load report data",
             secondary:
-              "Please update Kubecost to the latest version, then contact support if problems persist.",
+              "Please update OpenCost to the latest version, then open an Issue on GitHub if problems persist.",
           },
         ]);
       } else {
         let secondary =
-          "Please contact Kubecost support with a bug report if problems persist.";
+          "Please open an Issue on GitHub if problems persist.";
         if (err.message.length > 0) {
           secondary = err.message;
         }

+ 1 - 0
ui/src/services/allocation.js

@@ -12,6 +12,7 @@ class AllocationService {
     const params = {
       window: win,
       aggregate: aggregate,
+      includeIdle: true,
       step: "1d",
     };
     if (typeof accumulate === "boolean") {