Merge pull request #1005 from huanggze/monit

fix crash when monitoring component is disabled

pkg/models/metrics/namespaces.go

@@ -40,6 +40,9 @@ func GetNamespacesWithMetrics(namespaces []*v1.Namespace) []*v1.Namespace {
 	}
 
 	rawMetrics := GetNamespaceMetrics(params)
+	if rawMetrics == nil {
+		return namespaces
+	}
 
 	for _, result := range rawMetrics.Results {
 		for _, data := range result.Data.Result {

pkg/models/metrics/util.go

@@ -68,7 +68,7 @@ func (rawMetrics *Response) SortBy(sortMetricName string, sortType string) (*Res
 		}
 	}()
 
-	if sortMetricName == "" {
+	if sortMetricName == "" || rawMetrics == nil {
 		return rawMetrics, -1
 	}