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:
@ -15,7 +15,8 @@ type channelStats []struct {
|
||||
// expose the channel metrics of a nsqd node to Prometheus. The
|
||||
// channel metrics are reported per topic.
|
||||
func ChannelStats(namespace string) StatsCollector {
|
||||
labels := []string{"type", "topic", "channel", "paused"}
|
||||
labels := []string{"topic", "channel", "paused"}
|
||||
namespace += "_channel"
|
||||
|
||||
return channelStats{
|
||||
{
|
||||
@ -101,11 +102,10 @@ func ChannelStats(namespace string) StatsCollector {
|
||||
}
|
||||
}
|
||||
|
||||
func (cs channelStats) collect(s *stats, out chan<- prometheus.Metric) {
|
||||
func (cs channelStats) set(s *stats) {
|
||||
for _, topic := range s.Topics {
|
||||
for _, channel := range topic.Channels {
|
||||
labels := prometheus.Labels{
|
||||
"type": "channel",
|
||||
"topic": topic.Name,
|
||||
"channel": channel.Name,
|
||||
"paused": strconv.FormatBool(channel.Paused),
|
||||
@ -113,8 +113,25 @@ func (cs channelStats) collect(s *stats, out chan<- prometheus.Metric) {
|
||||
|
||||
for _, c := range cs {
|
||||
c.vec.With(labels).Set(c.val(channel))
|
||||
c.vec.Collect(out)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (cs channelStats) collect(out chan<- prometheus.Metric) {
|
||||
for _, c := range cs {
|
||||
c.vec.Collect(out)
|
||||
}
|
||||
}
|
||||
|
||||
func (cs channelStats) describe(ch chan<- *prometheus.Desc) {
|
||||
for _, c := range cs {
|
||||
c.vec.Describe(ch)
|
||||
}
|
||||
}
|
||||
|
||||
func (cs channelStats) reset() {
|
||||
for _, c := range cs {
|
||||
c.vec.Reset()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user