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

Jump to bottom

prometheus metric_version = 2 & make scrape url as a configurable tag #5767

Merged
merged 9 commits into from
Nov 21, 2019
Merged

prometheus metric_version = 2 & make scrape url as a configurable tag #5767

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ae8325
prometheus metric_version = 2
vishiy Apr 25, 2019
50cd124
enable scrape url as a configurable tag name
vishiy May 13, 2019
01de38f
fixing pr feedback
vishiy Aug 6, 2019
82882e3
fix pr feedbacks.
vishiy Oct 16, 2019
af03bc0
fix histogram metric name issue (_bucket was missing)
vishiy Oct 16, 2019
80f7dec
Fix tests for prometheus.
vishiy Oct 16, 2019
c561608
fix formatting.
vishiy Oct 16, 2019
6bfa5ef
Merge branch 'master' into master
vishiy Oct 17, 2019
58e25cf
fix go fmt
vishiy Oct 17, 2019
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
Prev Previous commit
Next Next commit
fix histogram metric name issue (_bucket was missing)
  • Loading branch information
@vishiy
vishiy committed Oct 16, 2019
commit af03bc05866ed918526d5d91ab3cf830ce9c9724
2 changes: 1 addition & 1 deletion plugins/inputs/prometheus/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func makeBucketsV2(m *dto.Metric, tags map[string]string, metricName string, met
newTags := tags
fields = make(map[string]interface{})
newTags["le"] = fmt.Sprint(b.GetUpperBound())
fields[metricName] = float64(b.GetCumulativeCount())
fields[metricName+"_bucket"] = float64(b.GetCumulativeCount())

histogramMetric, err := metric.New("prometheus", newTags, fields, t, valueType(metricType))
if err == nil {
Expand Down