re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #761 from prometheus/mdl-kelvin 

testutil/promlint: allow Kelvin as a base unit for color temperature
This commit is contained in:
Björn Rabenstein 2020-06-02 18:06:07 +02:00 committed by GitHub
parent 3bb96180b6 3afa5ab1e1
commit 59508bb79c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prometheus/testutil/promlint/promlint.go
View File

@ -313,9 +313,10 @@ var (
// Base units. // Base units.
"amperes": "amperes", "amperes": "amperes",
"bytes": "bytes", "bytes": "bytes",
"celsius": "celsius", // Celsius is more common in practice than Kelvin. "celsius": "celsius", // Also allow Celsius because it is common in typical Prometheus use cases.
"grams": "grams", "grams": "grams",
"joules": "joules", "joules": "joules",
"kelvin": "kelvin", // SI base unit, used in special cases (e.g. color temperature, scientific measurements).
"meters": "meters", // Both American and international spelling permitted. "meters": "meters", // Both American and international spelling permitted.
"metres": "metres", "metres": "metres",
"seconds": "seconds", "seconds": "seconds",
@ -328,8 +329,7 @@ var (
"days": "seconds", "days": "seconds",
"weeks": "seconds", "weeks": "seconds",
// Temperature. // Temperature.
"kelvin": "celsius", "kelvins": "kelvin",
"kelvins": "celsius",
"fahrenheit": "celsius", "fahrenheit": "celsius",
"rankine": "celsius", "rankine": "celsius",
// Length. // Length.

22
prometheus/testutil/promlint/promlint_test.go
View File

@ -164,6 +164,14 @@ x_seconds 10
# HELP x_joules Test metric. # HELP x_joules Test metric.
# TYPE x_joules untyped # TYPE x_joules untyped
x_joules 10 x_joules 10
`,
},
{
name: "kelvin",
in: `
# HELP x_kelvin Test metric.
# TYPE x_kelvin untyped
x_kelvin 10
`, `,
}, },
// bad cases. // bad cases.
@ -287,18 +295,6 @@ x_days 10
Text: `use base unit "seconds" instead of "days"`, Text: `use base unit "seconds" instead of "days"`,
}}, }},
}, },
{
name: "kelvin",
in: `
# HELP x_kelvin Test metric.
# TYPE x_kelvin untyped
x_kelvin 10
`,
problems: []promlint.Problem{{
Metric: "x_kelvin",
Text: `use base unit "celsius" instead of "kelvin"`,
}},
},
{ {
name: "kelvins", name: "kelvins",
in: ` in: `
@ -308,7 +304,7 @@ x_kelvins 10
`, `,
problems: []promlint.Problem{{ problems: []promlint.Problem{{
Metric: "x_kelvins", Metric: "x_kelvins",
Text: `use base unit "celsius" instead of "kelvins"`, Text: `use base unit "kelvin" instead of "kelvins"`,
}}, }},
}, },
{ {