Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace 'max wait time' with 'out of mem' #108

Merged
merged 1 commit into from
Jul 19, 2017
Merged

Replace 'max wait time' with 'out of mem' #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lustre_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,6 +1260,7 @@ func TestCollector(t *testing.T) {
{"lustre_grows_failure_total", "Total number of failures while attempting to add pages.", counter, []labelPair{{"Generic", "sptlrpc"}}, 0, false},
{"lustre_shrinks_total", "Total number of shrinks.", counter, []labelPair{{"Generic", "sptlrpc"}}, 0, false},
{"lustre_free_page_low", "Lowest number of free pages reached.", gauge, []labelPair{{"Generic", "sptlrpc"}}, 0, false},
{"lustre_out_of_memory_request_total", "Total number of out of memory requests.", 0, []labelPair{{"Generic", "sptlrpc"}}, 0, false},

// LNET Metrics
{"lustre_console_max_delay_centiseconds", "Minimum time in centiseconds before the console logs a message", gauge, []labelPair{{"lnet", "lnet"}}, 60000, false},
Expand Down
3 changes: 0 additions & 3 deletions sources/procfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const (
cacheMissingHelp string = "Total number of cache misses."
lowFreeMarkHelp string = "Lowest number of free pages reached."
maxWaitQueueDepthHelp string = "Maximum waitqueue length."
maxWaitTimeHelp string = "Maximum wait time in jiffies."
outOfMemHelp string = "Total number of out of memory requests."

// string mappings for 'health_check' values
Expand Down Expand Up @@ -311,7 +310,6 @@ func (s *lustreProcfsSource) generateGenericMetricTemplates() {
{"encrypt_page_pools", "cache_miss_total", cacheMissingHelp, s.counterMetric, false},
{"encrypt_page_pools", "free_page_low", lowFreeMarkHelp, s.gaugeMetric, false},
{"encrypt_page_pools", "maximum_waitqueue_depth", maxWaitQueueDepthHelp, s.gaugeMetric, false},
{"encrypt_page_pools", "maximum_wait_time_jiffies", maxWaitTimeHelp, s.gaugeMetric, false},
{"encrypt_page_pools", "out_of_memory_request_total", outOfMemHelp, s.counterMetric, false},
},
}
Expand Down Expand Up @@ -492,7 +490,6 @@ func getStatsIOMetrics(statsFile string, promName string, helpText string) (metr
cacheMissingHelp: {pattern: "cache missing: .*", index: 2},
lowFreeMarkHelp: {pattern: "low free mark: .*", index: 3},
maxWaitQueueDepthHelp: {pattern: "max waitqueue depth: .*", index: 3},
maxWaitTimeHelp: {pattern: "max wait time: .*", index: 3},
outOfMemHelp: {pattern: "out of mem: .*", index: 3},
}
pattern := bytesMap[helpText].pattern
Expand Down