Skip to content

Commit

Permalink
admission: add '-pri' prefix to segmented work-queue metrics
Browse files Browse the repository at this point in the history 
And use naming directly derived from the names we currently use in
protos.

Release note: None
  • Loading branch information
@irfansharif
irfansharif committed Oct 24, 2022
1 parent 83f7d67 commit 0fab64d
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 88 deletions.
160 changes: 80 additions & 80 deletions pkg/ts/catalog/chart_catalog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3532,54 +3532,54 @@ var charts = []sectionDescription{
"admission.requested.elastic-cpu",
"admission.admitted.elastic-cpu",
"admission.errored.elastic-cpu",
"admission.admitted.elastic-cpu.normal",
"admission.admitted.elastic-cpu.bulk",
"admission.admitted.kv-stores.bulk",
"admission.admitted.kv-stores.locking",
"admission.admitted.kv-stores.ttl",
"admission.admitted.kv-stores.normal",
"admission.admitted.kv.locking",
"admission.admitted.kv.normal",
"admission.admitted.sql-kv-response.locking",
"admission.admitted.sql-kv-response.normal",
"admission.admitted.sql-leaf-start.locking",
"admission.admitted.sql-leaf-start.normal",
"admission.admitted.sql-root-start.locking",
"admission.admitted.sql-root-start.normal",
"admission.admitted.sql-sql-response.locking",
"admission.admitted.sql-sql-response.normal",
"admission.errored.elastic-cpu.normal",
"admission.errored.elastic-cpu.bulk",
"admission.errored.kv-stores.bulk",
"admission.errored.kv-stores.locking",
"admission.errored.kv-stores.ttl",
"admission.errored.kv-stores.normal",
"admission.errored.kv.locking",
"admission.errored.kv.normal",
"admission.errored.sql-kv-response.locking",
"admission.errored.sql-kv-response.normal",
"admission.errored.sql-leaf-start.locking",
"admission.errored.sql-leaf-start.normal",
"admission.errored.sql-root-start.locking",
"admission.errored.sql-root-start.normal",
"admission.errored.sql-sql-response.locking",
"admission.errored.sql-sql-response.normal",
"admission.requested.elastic-cpu.normal",
"admission.requested.elastic-cpu.bulk",
"admission.requested.kv-stores.bulk",
"admission.requested.kv-stores.locking",
"admission.requested.kv-stores.ttl",
"admission.requested.kv-stores.normal",
"admission.requested.kv.locking",
"admission.requested.kv.normal",
"admission.requested.sql-kv-response.locking",
"admission.requested.sql-kv-response.normal",
"admission.requested.sql-leaf-start.locking",
"admission.requested.sql-leaf-start.normal",
"admission.requested.sql-root-start.locking",
"admission.requested.sql-root-start.normal",
"admission.requested.sql-sql-response.locking",
"admission.requested.sql-sql-response.normal",
"admission.admitted.elastic-cpu.normal-pri",
"admission.admitted.elastic-cpu.bulk-normal-pri",
"admission.admitted.kv-stores.bulk-normal-pri",
"admission.admitted.kv-stores.locking-pri",
"admission.admitted.kv-stores.ttl-low-pri",
"admission.admitted.kv-stores.normal-pri",
"admission.admitted.kv.locking-pri",
"admission.admitted.kv.normal-pri",
"admission.admitted.sql-kv-response.locking-pri",
"admission.admitted.sql-kv-response.normal-pri",
"admission.admitted.sql-leaf-start.locking-pri",
"admission.admitted.sql-leaf-start.normal-pri",
"admission.admitted.sql-root-start.locking-pri",
"admission.admitted.sql-root-start.normal-pri",
"admission.admitted.sql-sql-response.locking-pri",
"admission.admitted.sql-sql-response.normal-pri",
"admission.errored.elastic-cpu.normal-pri",
"admission.errored.elastic-cpu.bulk-normal-pri",
"admission.errored.kv-stores.bulk-normal-pri",
"admission.errored.kv-stores.locking-pri",
"admission.errored.kv-stores.ttl-low-pri",
"admission.errored.kv-stores.normal-pri",
"admission.errored.kv.locking-pri",
"admission.errored.kv.normal-pri",
"admission.errored.sql-kv-response.locking-pri",
"admission.errored.sql-kv-response.normal-pri",
"admission.errored.sql-leaf-start.locking-pri",
"admission.errored.sql-leaf-start.normal-pri",
"admission.errored.sql-root-start.locking-pri",
"admission.errored.sql-root-start.normal-pri",
"admission.errored.sql-sql-response.locking-pri",
"admission.errored.sql-sql-response.normal-pri",
"admission.requested.elastic-cpu.normal-pri",
"admission.requested.elastic-cpu.bulk-normal-pri",
"admission.requested.kv-stores.bulk-normal-pri",
"admission.requested.kv-stores.locking-pri",
"admission.requested.kv-stores.ttl-low-pri",
"admission.requested.kv-stores.normal-pri",
"admission.requested.kv.locking-pri",
"admission.requested.kv.normal-pri",
"admission.requested.sql-kv-response.locking-pri",
"admission.requested.sql-kv-response.normal-pri",
"admission.requested.sql-leaf-start.locking-pri",
"admission.requested.sql-leaf-start.normal-pri",
"admission.requested.sql-root-start.locking-pri",
"admission.requested.sql-root-start.normal-pri",
"admission.requested.sql-sql-response.locking-pri",
"admission.requested.sql-sql-response.normal-pri",
},
},
{
Expand All @@ -3592,22 +3592,22 @@ var charts = []sectionDescription{
"admission.wait_queue_length.sql-leaf-start",
"admission.wait_queue_length.sql-root-start",
"admission.wait_queue_length.elastic-cpu",
"admission.wait_queue_length.elastic-cpu.normal",
"admission.wait_queue_length.elastic-cpu.bulk",
"admission.wait_queue_length.kv-stores.bulk",
"admission.wait_queue_length.kv-stores.locking",
"admission.wait_queue_length.kv-stores.ttl",
"admission.wait_queue_length.kv-stores.normal",
"admission.wait_queue_length.kv.locking",
"admission.wait_queue_length.kv.normal",
"admission.wait_queue_length.sql-kv-response.locking",
"admission.wait_queue_length.sql-kv-response.normal",
"admission.wait_queue_length.sql-leaf-start.locking",
"admission.wait_queue_length.sql-leaf-start.normal",
"admission.wait_queue_length.sql-root-start.locking",
"admission.wait_queue_length.sql-root-start.normal",
"admission.wait_queue_length.sql-sql-response.locking",
"admission.wait_queue_length.sql-sql-response.normal",
"admission.wait_queue_length.elastic-cpu.normal-pri",
"admission.wait_queue_length.elastic-cpu.bulk-normal-pri",
"admission.wait_queue_length.kv-stores.bulk-normal-pri",
"admission.wait_queue_length.kv-stores.locking-pri",
"admission.wait_queue_length.kv-stores.ttl-low-pri",
"admission.wait_queue_length.kv-stores.normal-pri",
"admission.wait_queue_length.kv.locking-pri",
"admission.wait_queue_length.kv.normal-pri",
"admission.wait_queue_length.sql-kv-response.locking-pri",
"admission.wait_queue_length.sql-kv-response.normal-pri",
"admission.wait_queue_length.sql-leaf-start.locking-pri",
"admission.wait_queue_length.sql-leaf-start.normal-pri",
"admission.wait_queue_length.sql-root-start.locking-pri",
"admission.wait_queue_length.sql-root-start.normal-pri",
"admission.wait_queue_length.sql-sql-response.locking-pri",
"admission.wait_queue_length.sql-sql-response.normal-pri",
},
},
{
Expand All @@ -3620,22 +3620,22 @@ var charts = []sectionDescription{
"admission.wait_durations.sql-leaf-start",
"admission.wait_durations.sql-root-start",
"admission.wait_durations.elastic-cpu",
"admission.wait_durations.elastic-cpu.normal",
"admission.wait_durations.elastic-cpu.bulk",
"admission.wait_durations.kv-stores.bulk",
"admission.wait_durations.kv-stores.locking",
"admission.wait_durations.kv-stores.ttl",
"admission.wait_durations.kv-stores.normal",
"admission.wait_durations.kv.locking",
"admission.wait_durations.kv.normal",
"admission.wait_durations.sql-kv-response.locking",
"admission.wait_durations.sql-kv-response.normal",
"admission.wait_durations.sql-leaf-start.locking",
"admission.wait_durations.sql-leaf-start.normal",
"admission.wait_durations.sql-root-start.locking",
"admission.wait_durations.sql-root-start.normal",
"admission.wait_durations.sql-sql-response.locking",
"admission.wait_durations.sql-sql-response.normal",
"admission.wait_durations.elastic-cpu.normal-pri",
"admission.wait_durations.elastic-cpu.bulk-normal-pri",
"admission.wait_durations.kv-stores.bulk-normal-pri",
"admission.wait_durations.kv-stores.locking-pri",
"admission.wait_durations.kv-stores.ttl-low-pri",
"admission.wait_durations.kv-stores.normal-pri",
"admission.wait_durations.kv.locking-pri",
"admission.wait_durations.kv.normal-pri",
"admission.wait_durations.sql-kv-response.locking-pri",
"admission.wait_durations.sql-kv-response.normal-pri",
"admission.wait_durations.sql-leaf-start.locking-pri",
"admission.wait_durations.sql-leaf-start.normal-pri",
"admission.wait_durations.sql-root-start.locking-pri",
"admission.wait_durations.sql-root-start.normal-pri",
"admission.wait_durations.sql-sql-response.locking-pri",
"admission.wait_durations.sql-sql-response.normal-pri",
},
},
{
Expand Down
16 changes: 8 additions & 8 deletions pkg/util/admission/admissionpb/admissionpb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ const (
// WorkPriorityDict is a mapping of the priorities to a short string name. The
// name is used as the suffix on exported work queue metrics.
var WorkPriorityDict = map[WorkPriority]string{
LowPri: "min",
TTLLowPri: "ttl",
UserLowPri: "low",
BulkNormalPri: "bulk",
NormalPri: "normal",
UserHighPri: "high",
LockingPri: "locking",
HighPri: "max",
LowPri: "low-pri",
TTLLowPri: "ttl-low-pri",
UserLowPri: "user-low-pri",
BulkNormalPri: "bulk-normal-pri",
NormalPri: "normal-pri",
UserHighPri: "user-high-pri",
LockingPri: "locking-pri",
HighPri: "high-pri",
}

// Prevent the linter from emitting unused warnings.
Expand Down

0 comments on commit 0fab64d

Please sign in to comment.