Ivan Galakhov пре 4 година
родитељ
комит
d69c24a9b9

+ 1 - 1
dashboard/src/main/home/cluster-dashboard/dashboard/Dashboard.tsx

@@ -25,7 +25,7 @@ const tabOptions: {
 ];
 ];
 
 
 export const Dashboard: React.FunctionComponent = () => {
 export const Dashboard: React.FunctionComponent = () => {
-  const [currentTab, setCurrentTab] = useState<TabEnum>("metrics");
+  const [currentTab, setCurrentTab] = useState<TabEnum>("nodes");
   const [currentTabOptions, setCurrentTabOptions] = useState(tabOptions);
   const [currentTabOptions, setCurrentTabOptions] = useState(tabOptions);
   const [isAuthorized] = useAuth();
   const [isAuthorized] = useAuth();
 
 

+ 9 - 21
dashboard/src/main/home/cluster-dashboard/dashboard/Metrics.tsx

@@ -14,20 +14,10 @@ import {
 } from "../expanded-chart/metrics/types";
 } from "../expanded-chart/metrics/types";
 import SelectRow from "../../../../components/form-components/SelectRow";
 import SelectRow from "../../../../components/form-components/SelectRow";
 import { MetricNormalizer } from "../expanded-chart/metrics/MetricNormalizer";
 import { MetricNormalizer } from "../expanded-chart/metrics/MetricNormalizer";
-
-const resolutions: { [range: string]: string } = {
-  "1H": "1s",
-  "6H": "15s",
-  "1D": "15s",
-  "1M": "5h",
-};
-
-const secondsBeforeNow: { [range: string]: number } = {
-  "1H": 60 * 60,
-  "6H": 60 * 60 * 6,
-  "1D": 60 * 60 * 24,
-  "1M": 60 * 60 * 24 * 30,
-};
+import {
+  resolutions,
+  secondsBeforeNow,
+} from "../expanded-chart/metrics/MetricsSection";
 
 
 const Metrics: React.FC = () => {
 const Metrics: React.FC = () => {
   const { currentProject, currentCluster, setCurrentError } = useContext(
   const { currentProject, currentCluster, setCurrentError } = useContext(
@@ -40,11 +30,9 @@ const Metrics: React.FC = () => {
   const [ingressOptions, setIngressOptions] = useState([]);
   const [ingressOptions, setIngressOptions] = useState([]);
   const [selectedIngress, setSelectedIngress] = useState(null);
   const [selectedIngress, setSelectedIngress] = useState(null);
   const [selectedRange, setSelectedRange] = useState("1H");
   const [selectedRange, setSelectedRange] = useState("1H");
-  const [selectedMetric, setSelectedMetric] = useState(
-    "nginx:latency-histogram"
-  );
+  const [selectedMetric, setSelectedMetric] = useState("nginx:errors");
   const [selectedMetricLabel, setSelectedMetricLabel] = useState(
   const [selectedMetricLabel, setSelectedMetricLabel] = useState(
-    "Latency Histogram"
+    "5XX Error Percentage (s)"
   );
   );
   const [selectedPercentile, setSelectedPercentile] = useState("0.99");
   const [selectedPercentile, setSelectedPercentile] = useState("0.99");
   const [data, setData] = useState<NormalizedMetricsData[]>([]);
   const [data, setData] = useState<NormalizedMetricsData[]>([]);
@@ -103,15 +91,15 @@ const Metrics: React.FC = () => {
               ...metricsOptions,
               ...metricsOptions,
               {
               {
                 value: "nginx:errors",
                 value: "nginx:errors",
-                label: "5XX Error Percentage",
+                label: "5XX Error Percentage (s)",
               },
               },
               {
               {
                 value: "nginx:latency",
                 value: "nginx:latency",
-                label: "Request Latency",
+                label: "Request Latency (s)",
               },
               },
               {
               {
                 value: "nginx:latency-histogram",
                 value: "nginx:latency-histogram",
-                label: "Latency Histogram",
+                label: "Percentile Response Times (s)",
               },
               },
             ]);
             ]);
             setLoading(false);
             setLoading(false);

+ 2 - 2
dashboard/src/main/home/cluster-dashboard/expanded-chart/metrics/MetricsSection.tsx

@@ -19,14 +19,14 @@ type PropsType = {
   currentChart: ChartTypeWithExtendedConfig;
   currentChart: ChartTypeWithExtendedConfig;
 };
 };
 
 
-const resolutions: { [range: string]: string } = {
+export const resolutions: { [range: string]: string } = {
   "1H": "1s",
   "1H": "1s",
   "6H": "15s",
   "6H": "15s",
   "1D": "15s",
   "1D": "15s",
   "1M": "5h",
   "1M": "5h",
 };
 };
 
 
-const secondsBeforeNow: { [range: string]: number } = {
+export const secondsBeforeNow: { [range: string]: number } = {
   "1H": 60 * 60,
   "1H": 60 * 60,
   "6H": 60 * 60 * 6,
   "6H": 60 * 60 * 6,
   "1D": 60 * 60 * 24,
   "1D": 60 * 60 * 24,

+ 0 - 1
dashboard/src/main/home/dashboard/ClusterList.tsx

@@ -81,7 +81,6 @@ class Templates extends Component<PropsType, StateType> {
         {},
         {},
         { project_id: this.context.currentProject.id, cluster_id: clusterId }
         { project_id: this.context.currentProject.id, cluster_id: clusterId }
       );
       );
-      console.log(res);
       if (res.data) {
       if (res.data) {
         this.setState((prevState) => {
         this.setState((prevState) => {
           const currentCluster = prevState.clusters[currentClusterIndex];
           const currentCluster = prevState.clusters[currentClusterIndex];