unteem/php-fpm-exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename label for phpfpm_processes_* from pid to pid_hash

Browse source
This commit is contained in:
Enrico Stahn 2018-02-28 15:53:04 +11:00
parent 514090d054
commit 7e6f6c32c5
No known key found for this signature in database
GPG key ID: 5263621C269A50DE
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpfpm/exporter.go
View file

@ -139,25 +139,25 @@ func NewExporter(pm PoolManager) *Exporter {
processRequests: prometheus.NewDesc( processRequests: prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "process_requests"), prometheus.BuildFQName(namespace, "", "process_requests"),
"", "",
[]string{"pool", "pid"}, []string{"pool", "pid_hash"},
nil), nil),
processLastRequestMemory: prometheus.NewDesc( processLastRequestMemory: prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "process_last_request_memory"), prometheus.BuildFQName(namespace, "", "process_last_request_memory"),
"", "",
[]string{"pool", "pid"}, []string{"pool", "pid_hash"},
nil), nil),
processLastRequestCPU: prometheus.NewDesc( processLastRequestCPU: prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "process_last_request_cpu"), prometheus.BuildFQName(namespace, "", "process_last_request_cpu"),
"", "",
[]string{"pool", "pid"}, []string{"pool", "pid_hash"},
nil), nil),
processState: prometheus.NewDesc( processState: prometheus.NewDesc(
prometheus.BuildFQName(namespace, "", "process_state"), prometheus.BuildFQName(namespace, "", "process_state"),
"The process state.", "The process state.",
[]string{"pool", "pid", "state"}, []string{"pool", "pid_hash", "state"},
nil), nil),
} }
} }
@ -203,11 +203,11 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
ch <- prometheus.MustNewConstMetric(e.slowRequests, prometheus.CounterValue, float64(pool.SlowRequests), pool.Name) ch <- prometheus.MustNewConstMetric(e.slowRequests, prometheus.CounterValue, float64(pool.SlowRequests), pool.Name)
for _, process := range pool.Processes { for _, process := range pool.Processes {
pid := calculateProcessHash(process) pidHash := calculateProcessHash(process)
ch <- prometheus.MustNewConstMetric(e.processState, prometheus.GaugeValue, 1, pool.Name, pid, process.State) ch <- prometheus.MustNewConstMetric(e.processState, prometheus.GaugeValue, 1, pool.Name, pidHash, process.State)
ch <- prometheus.MustNewConstMetric(e.processRequests, prometheus.CounterValue, float64(process.Requests), pool.Name, pid) ch <- prometheus.MustNewConstMetric(e.processRequests, prometheus.CounterValue, float64(process.Requests), pool.Name, pidHash)
ch <- prometheus.MustNewConstMetric(e.processLastRequestMemory, prometheus.GaugeValue, float64(process.LastRequestMemory), pool.Name, pid) ch <- prometheus.MustNewConstMetric(e.processLastRequestMemory, prometheus.GaugeValue, float64(process.LastRequestMemory), pool.Name, pidHash)
ch <- prometheus.MustNewConstMetric(e.processLastRequestCPU, prometheus.GaugeValue, process.LastRequestCPU, pool.Name, pid) ch <- prometheus.MustNewConstMetric(e.processLastRequestCPU, prometheus.GaugeValue, process.LastRequestCPU, pool.Name, pidHash)
} }
} }
} }