github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45657 from gmarek/print_to_file 

Automatic merge from submit-queue (batch tested with PRs 45571, 45657, 45638, 45663, 45622)

Print API latency metrics as perfdata
pull/6/head
Kubernetes Submit Queue 2017-05-12 02:28:37 -07:00 committed by GitHub
parent 1f22204119 6dcbdfaf58
commit f74a9a129c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/framework/metrics_util.go
View File

@ -103,7 +103,7 @@ func (m *MetricsForE2E) PrintHumanReadable() string {
func (m *MetricsForE2E) PrintJSON() string {
m.filterMetrics()
return PrettyPrintJSON(*m)
return PrettyPrintJSON(m)
}
func (m *MetricsForE2E) SummaryKind() string {
@ -155,11 +155,11 @@ func (l *PodStartupLatency) SummaryKind() string {
}
func (l *PodStartupLatency) PrintHumanReadable() string {
return PrettyPrintJSON(*l)
return PrettyPrintJSON(l)
}
func (l *PodStartupLatency) PrintJSON() string {
return PrettyPrintJSON(*l)
return PrettyPrintJSON(l)
}
type SchedulingLatency struct {
@ -173,11 +173,11 @@ func (l *SchedulingLatency) SummaryKind() string {
}
func (l *SchedulingLatency) PrintHumanReadable() string {
return PrettyPrintJSON(*l)
return PrettyPrintJSON(l)
}
func (l *SchedulingLatency) PrintJSON() string {
return PrettyPrintJSON(*l)
return PrettyPrintJSON(l)
}
type SaturationTime struct {
@ -203,11 +203,11 @@ func (a *APIResponsiveness) SummaryKind() string {
}
func (a *APIResponsiveness) PrintHumanReadable() string {
return PrettyPrintJSON(*a)
return PrettyPrintJSON(a)
}
func (a *APIResponsiveness) PrintJSON() string {
return PrettyPrintJSON(*a)
return PrettyPrintJSON(ApiCallToPerfData(a))
}
func (a *APIResponsiveness) Len() int { return len(a.APICalls) }

3
test/e2e/framework/perf_util.go
View File

@ -30,7 +30,7 @@ import (
const currentApiCallMetricsVersion = "v1"
// ApiCallToPerfData transforms APIResponsiveness to PerfData.
func ApiCallToPerfData(apicalls APIResponsiveness) *perftype.PerfData {
func ApiCallToPerfData(apicalls *APIResponsiveness) *perftype.PerfData {
perfData := &perftype.PerfData{Version: currentApiCallMetricsVersion}
for _, apicall := range apicalls.APICalls {
item := perftype.DataItem{
@ -43,6 +43,7 @@ func ApiCallToPerfData(apicalls APIResponsiveness) *perftype.PerfData {
Labels: map[string]string{
"Verb": apicall.Verb,
"Resource": apicall.Resource,
"Count": fmt.Sprintf("%v", apicall.Count),
},
}
perfData.DataItems = append(perfData.DataItems, item)