Merge pull request kubernetes#1782 from mm4tt/perf-dash-all-names

Add parsers for common measurement matching any test name
byxorna · Apr 14, 2021 · 5e3b31e · 5e3b31e
2 parents a397740 + 5408a67
commit 5e3b31e
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/perfdash/Makefile b/perfdash/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # See deployment.yaml for the version currently running-- bump this ahead before rebuilding!
-TAG = 2.32
+TAG = 2.33
 
 REPO = gcr.io/k8s-testimages
 

diff --git a/perfdash/config.go b/perfdash/config.go
@@ -108,6 +108,10 @@ var (
 				OutputFilePrefix: "StatelessPodStartupLatency_PodStartupLatency",
 				Parser:           parsePerfData,
 			}},
+			"Resources": []TestDescription{{
+				OutputFilePrefix: "ResourceUsageSummary",
+				Parser:           parseResourceUsageData,
+			}},
 		},
 		"APIServer": {
 			"DensityResponsiveness": []TestDescription{{
@@ -190,6 +194,38 @@ var (
 				OutputFilePrefix: "MetricsForE2E",
 				Parser:           parseApiserverInitEventsCount,
 			}},
+			"Responsiveness": []TestDescription{{
+				OutputFilePrefix: "APIResponsiveness",
+				Parser:           parsePerfData,
+			}},
+			"RequestCount": []TestDescription{{
+				OutputFilePrefix: "APIResponsiveness",
+				Parser:           parseRequestCountData,
+			}},
+			"Responsiveness_Prometheus": []TestDescription{{
+				OutputFilePrefix: "APIResponsivenessPrometheus",
+				Parser:           parsePerfData,
+			}},
+			"RequestCount_Prometheus": []TestDescription{{
+				OutputFilePrefix: "APIResponsivenessPrometheus",
+				Parser:           parseRequestCountData,
+			}},
+			"Responsiveness_PrometheusSimple": []TestDescription{{
+				OutputFilePrefix: "APIResponsivenessPrometheus_simple",
+				Parser:           parsePerfData,
+			}},
+			"RequestCount_PrometheusSimple": []TestDescription{{
+				OutputFilePrefix: "APIResponsivenessPrometheus_simple",
+				Parser:           parseRequestCountData,
+			}},
+			"RequestCountByClient": []TestDescription{{
+				OutputFilePrefix: "MetricsForE2E",
+				Parser:           parseApiserverRequestCount,
+			}},
+			"InitEventsCount": []TestDescription{{
+				OutputFilePrefix: "MetricsForE2E",
+				Parser:           parseApiserverInitEventsCount,
+			}},
 		},
 		"Scheduler": {
 			"SchedulingLatency": []TestDescription{
@@ -385,6 +421,10 @@ var (
 				OutputFilePrefix: "DnsLookupLatency",
 				Parser:           parsePerfData,
 			}},
+			"DNSLookupLatency": []TestDescription{{
+				OutputFilePrefix: "DnsLookupLatency",
+				Parser:           parsePerfData,
+			}},
 		},
 		"SystemPodMetrics": {
 			"Load_SystemPodMetrics": []TestDescription{{
@@ -397,6 +437,10 @@ var (
 				OutputFilePrefix: "SystemPodMetrics",
 				Parser:           parseSystemPodMetrics,
 			}},
+			"SystemPodMetrics": []TestDescription{{
+				OutputFilePrefix: "SystemPodMetrics",
+				Parser:           parseSystemPodMetrics,
+			}},
 		},
 	}
 

diff --git a/perfdash/deployment.yaml b/perfdash/deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: perfdash
-        image: gcr.io/k8s-testimages/perfdash:2.32
+        image: gcr.io/k8s-testimages/perfdash:2.33
         command:
           - /perfdash
           -   --www=true

diff --git a/perfdash/metrics-downloader.go b/perfdash/metrics-downloader.go
@@ -120,7 +120,10 @@ func (g *Downloader) getJobData(wg *sync.WaitGroup, result JobToCategoryData, re
 		for categoryLabel, categoryMap := range tests.Descriptions {
 			for testLabel, testDescriptions := range categoryMap {
 				for _, testDescription := range testDescriptions {
-					filePrefix := fmt.Sprintf("%v_%v", testDescription.OutputFilePrefix, testDescription.Name)
+					filePrefix := testDescription.OutputFilePrefix
+					if testDescription.Name != "" {
+						filePrefix = fmt.Sprintf("%v_%v", filePrefix, testDescription.Name)
+					}
 					searchPrefix := g.artifactName(tests, filePrefix)
 					artifacts, err := g.MetricsBkt.ListFilesInBuild(job, buildNumber, searchPrefix)
 					if err != nil || len(artifacts) == 0 {