Refactoring for better Prometheus' logic support
1) Breaking changes! Updated collection code for proper Prometheus support - Now metrics names of all subcollectors have prefixes: nsq_topic_, nsq_channel_, nsq_client_ As a result metrics registration code now passing Prometheus' client validation, also it fixes scrape warnings - "type" label in exported metrics removed as obsolete 2) Add reset of gauges before scrape (like in haproxy-exporter) 3) Refactor: subcollectors logic is simplified, multiple collectors support removed We always use 'stats' collector so it removes unnecessary flexibility and complexity.
This commit is contained in:
@ -14,7 +14,8 @@ type topicStats []struct {
|
||||
// TopicStats creates a new stats collector which is able to
|
||||
// expose the topic metrics of a nsqd node to Prometheus.
|
||||
func TopicStats(namespace string) StatsCollector {
|
||||
labels := []string{"type", "topic", "paused"}
|
||||
labels := []string{"topic", "paused"}
|
||||
namespace += "_topic"
|
||||
|
||||
return topicStats{
|
||||
{
|
||||
@ -68,17 +69,32 @@ func TopicStats(namespace string) StatsCollector {
|
||||
}
|
||||
}
|
||||
|
||||
func (ts topicStats) collect(s *stats, out chan<- prometheus.Metric) {
|
||||
func (ts topicStats) set(s *stats) {
|
||||
for _, topic := range s.Topics {
|
||||
labels := prometheus.Labels{
|
||||
"type": "topic",
|
||||
"topic": topic.Name,
|
||||
"paused": strconv.FormatBool(topic.Paused),
|
||||
}
|
||||
|
||||
for _, c := range ts {
|
||||
c.vec.With(labels).Set(c.val(topic))
|
||||
c.vec.Collect(out)
|
||||
}
|
||||
}
|
||||
}
|
||||
func (ts topicStats) collect(out chan<- prometheus.Metric) {
|
||||
for _, c := range ts {
|
||||
c.vec.Collect(out)
|
||||
}
|
||||
}
|
||||
|
||||
func (ts topicStats) describe(ch chan<- *prometheus.Desc) {
|
||||
for _, c := range ts {
|
||||
c.vec.Describe(ch)
|
||||
}
|
||||
}
|
||||
|
||||
func (ts topicStats) reset() {
|
||||
for _, c := range ts {
|
||||
c.vec.Reset()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user