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

convert latencies in mertics name to duration

pull/564/head
danielqsj 2019-02-22 22:19:57 +08:00
parent f7b437cae0
commit c525d329ef
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics.go
View File

@ -166,7 +166,7 @@ func newMetricSet(name string, labels []string, helpTemplate string, hasSummary
prometheus.SummaryOpts{ prometheus.SummaryOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: fmt.Sprintf("%s_admission_latencies_seconds_summary", name), Name: fmt.Sprintf("%s_admission_duration_seconds_summary", name),
Help: fmt.Sprintf(helpTemplate, "latency summary in seconds"), Help: fmt.Sprintf(helpTemplate, "latency summary in seconds"),
MaxAge: latencySummaryMaxAge, MaxAge: latencySummaryMaxAge,
}, },
@ -189,7 +189,7 @@ func newMetricSet(name string, labels []string, helpTemplate string, hasSummary
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: fmt.Sprintf("%s_admission_latencies_seconds", name), Name: fmt.Sprintf("%s_admission_duration_seconds", name),
Help: fmt.Sprintf(helpTemplate, "latency histogram in seconds"), Help: fmt.Sprintf(helpTemplate, "latency histogram in seconds"),
Buckets: latencyBuckets, Buckets: latencyBuckets,
}, },

22
staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go
View File

@ -41,12 +41,12 @@ func TestObserveAdmissionStep(t *testing.T) {
"type": "admit", "type": "admit",
"rejected": "false", "rejected": "false",
} }
expectHistogramCountTotal(t, "apiserver_admission_step_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_step_admission_duration_seconds", wantLabels, 1)
expectFindMetric(t, "apiserver_admission_step_admission_latencies_seconds_summary", wantLabels) expectFindMetric(t, "apiserver_admission_step_admission_duration_seconds_summary", wantLabels)
wantLabels["type"] = "validate" wantLabels["type"] = "validate"
expectHistogramCountTotal(t, "apiserver_admission_step_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_step_admission_duration_seconds", wantLabels, 1)
expectFindMetric(t, "apiserver_admission_step_admission_latencies_seconds_summary", wantLabels) expectFindMetric(t, "apiserver_admission_step_admission_duration_seconds_summary", wantLabels)
} }
func TestObserveAdmissionController(t *testing.T) { func TestObserveAdmissionController(t *testing.T) {
@ -60,10 +60,10 @@ func TestObserveAdmissionController(t *testing.T) {
"type": "admit", "type": "admit",
"rejected": "false", "rejected": "false",
} }
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", wantLabels, 1)
wantLabels["type"] = "validate" wantLabels["type"] = "validate"
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", wantLabels, 1)
} }
func TestObserveWebhook(t *testing.T) { func TestObserveWebhook(t *testing.T) {
@ -75,7 +75,7 @@ func TestObserveWebhook(t *testing.T) {
"type": "admit", "type": "admit",
"rejected": "false", "rejected": "false",
} }
expectHistogramCountTotal(t, "apiserver_admission_webhook_admission_latencies_seconds", wantLabels, 1) expectHistogramCountTotal(t, "apiserver_admission_webhook_admission_duration_seconds", wantLabels, 1)
} }
func TestWithMetrics(t *testing.T) { func TestWithMetrics(t *testing.T) {
@ -158,9 +158,9 @@ func TestWithMetrics(t *testing.T) {
filter["rejected"] = "true" filter["rejected"] = "true"
} }
if _, mutating := test.handler.(admission.MutationInterface); mutating { if _, mutating := test.handler.(admission.MutationInterface); mutating {
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 1) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 1)
} else { } else {
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 0)
} }
if err != nil { if err != nil {
@ -183,9 +183,9 @@ func TestWithMetrics(t *testing.T) {
filter["rejected"] = "true" filter["rejected"] = "true"
} }
if _, validating := test.handler.(admission.ValidationInterface); validating { if _, validating := test.handler.(admission.ValidationInterface); validating {
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 1) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 1)
} else { } else {
expectHistogramCountTotal(t, "apiserver_admission_controller_admission_latencies_seconds", filter, 0) expectHistogramCountTotal(t, "apiserver_admission_controller_admission_duration_seconds", filter, 0)
} }
} }
} }

4
staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go
View File

@ -33,7 +33,7 @@ var (
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "transformation_latencies_seconds", Name: "transformation_duration_seconds",
Help: "Latencies in seconds of value transformation operations.", Help: "Latencies in seconds of value transformation operations.",
// In-process transformations (ex. AES CBC) complete on the order of 20 microseconds. However, when // In-process transformations (ex. AES CBC) complete on the order of 20 microseconds. However, when
// external KMS is involved latencies may climb into milliseconds. // external KMS is involved latencies may climb into milliseconds.
@ -76,7 +76,7 @@ var (
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "data_key_generation_latencies_seconds", Name: "data_key_generation_duration_seconds",
Help: "Latencies in seconds of data encryption key(DEK) generation operations.", Help: "Latencies in seconds of data encryption key(DEK) generation operations.",
Buckets: prometheus.ExponentialBuckets(5e-6, 2, 14), Buckets: prometheus.ExponentialBuckets(5e-6, 2, 14),
}, },