mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-15 01:54:06 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #54 from grafana/upgrade-upstream

Browse source 
Upgrade Prometheus upstream
This commit is contained in:
Marco Pracucci 2021-11-25 12:40:09 +01:00 committed by GitHub
parent 16e2a6a520 8e743bbc1c
commit 63537ea653
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
promql/value.go
View file

@ -77,9 +77,6 @@ func (s Series) String() string {
}
// Point represents a single data point for a given timestamp.
//
// Note that Point's JSON marshaling is done in an optimized fashion in
// web/api/v1/api.go. Therefore, no MarshalJSON method is provided here.
type Point struct {
T int64
V float64
@ -90,6 +87,12 @@ func (p Point) String() string {
return fmt.Sprintf("%v @[%v]", v, p.T)
}
// MarshalJSON implements json.Marshaler.
func (p Point) MarshalJSON() ([]byte, error) {
v := strconv.FormatFloat(p.V, 'f', -1, 64)
return json.Marshal([...]interface{}{float64(p.T) / 1000, v})
}
// Sample is a single sample belonging to a metric.
type Sample struct {
Point