Skip to content

fix prometheus output #793

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

Closed
wants to merge 2 commits into from
Closed

fix prometheus output #793

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1360036
fix prometheus output
Mar 4, 2016
cc530ae
special case 'value'
Mar 8, 2016
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
40 changes: 23 additions & 17 deletions plugins/outputs/prometheus_client/prometheus_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,42 +73,48 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
}
}

if _, ok := p.metrics[key]; !ok {
p.metrics[key] = prometheus.NewUntypedVec(
prometheus.UntypedOpts{
Name: key,
Help: fmt.Sprintf("Telegraf collected point '%s'", key),
},
labels,
)
prometheus.MustRegister(p.metrics[key])
}

l := prometheus.Labels{}
for tk, tv := range point.Tags() {
l[tk] = tv
}

for _, val := range point.Fields() {
for n, val := range point.Fields() {
var mname string
if n == "value" {
mname = key
} else {
mname = fmt.Sprintf("%s_%s", key, n)
}
if _, ok := p.metrics[mname]; !ok {
p.metrics[mname] = prometheus.NewUntypedVec(
prometheus.UntypedOpts{
Name: mname,
Help: fmt.Sprintf("Telegraf collected point '%s'", mname),
},
labels,
)
prometheus.MustRegister(p.metrics[mname])
}

switch val := val.(type) {
default:
log.Printf("Prometheus output, unsupported type. key: %s, type: %T\n",
key, val)
mname, val)
case int64:
m, err := p.metrics[key].GetMetricWith(l)
m, err := p.metrics[mname].GetMetricWith(l)
if err != nil {
log.Printf("ERROR Getting metric in Prometheus output, "+
"key: %s, labels: %v,\nerr: %s\n",
key, l, err.Error())
mname, l, err.Error())
continue
}
m.Set(float64(val))
case float64:
m, err := p.metrics[key].GetMetricWith(l)
m, err := p.metrics[mname].GetMetricWith(l)
if err != nil {
log.Printf("ERROR Getting metric in Prometheus output, "+
"key: %s, labels: %v,\nerr: %s\n",
key, l, err.Error())
mname, l, err.Error())
continue
}
m.Set(val)
Expand Down