fix: add new dashboard metrics (#2952)

portal-ui/src/screens/Console/Common/FormComponents/DateTimePickerWrapper/DateTimePickerWrapper.tsx

@@ -316,8 +316,8 @@ const DateTimePickerWrapper = ({
         xs={12}
         className={`${containerCls} ${classNamePrefix}input-field-container`}
         sx={{
-          display: "flex",
-          alignItems: "center",
+          display: "grid",
+          gridAutoColumns: "max-content",
         }}
       >
         {label !== "" && (

portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx

@@ -736,11 +736,7 @@ export const widgetDetailsToPanel = (
         if (panelItem.customStructure) {
           values = panelItem.customStructure.map((structureItem) => {
             const metricTake = chartBars.find((element: any) => {
-              const metricKeyItem = Object.keys(element.metric);
-
-              const metricName = element.metric[metricKeyItem[0]];
-
-              return metricName === structureItem.originTag;
+              return element.metric.range === structureItem.originTag;
             });
 
             const elements = get(metricTake, "values", []);

restapi/admin_info.go

@@ -305,7 +305,7 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `sum(minio_bucket_usage_total_bytes{$__query}) by (instance)`,
+				Expr:         `minio_cluster_usage_total_bytes{$__query}`,
 				LegendFormat: "Used Capacity",
 				InitialTime:  -180,
 				Step:         10,
@@ -331,7 +331,7 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `max by (range) (minio_bucket_objects_size_distribution{$__query})`,
+				Expr:         `minio_cluster_objects_size_distribution{$__query}`,
 				LegendFormat: "{{range}}",
 				Step:         300,
 			},
@@ -471,7 +471,7 @@ var widgets = []Metric{
 		ID:            66,
 		Title:         "Number of Buckets",
 		Type:          "stat",
-		MaxDataPoints: 100,
+		MaxDataPoints: 5,
 		GridPos: GridPos{
 			H: 3,
 			W: 3,
@@ -487,8 +487,9 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `count(count by (bucket) (minio_bucket_usage_total_bytes{$__query}))`,
+				Expr:         `minio_cluster_bucket_total{$__query}`,
 				LegendFormat: "",
+				Step:         100,
 			},
 		},
 	},
@@ -598,7 +599,7 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `topk(1, sum(minio_bucket_usage_object_total{$__query}) by (instance))`,
+				Expr:         `minio_cluster_usage_object_total{$__query}`,
 				LegendFormat: "",
 			},
 		},