Skip to content

Commit

Permalink
Merge branch 'main' into gauge_panel_neutral
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesGibo authored Jul 16, 2024
2 parents 223f239 + 16e2bcf commit 44c98f9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ x.x.x ?

* Added `neutral` option for `GaugePanel` (supported by Grafana 9.3.0 - https://github.com/grafana/grafana/discussions/38273)
* Added support `alias` via the `legendFormat` option for `Target`
* **Breaking change:** Fixed spelling errors for temperature units, corrected 'CELSUIS' to 'CELSIUS' and 'FARENHEIT' to 'FAHRENHEIT'.
* Added ``tooltipSort`` parameter to PieChartv2 panel
* Fix mappings for Table
* Added support for AWS Cross-Account in CloudwatchMetricsTarget
Expand Down
6 changes: 3 additions & 3 deletions grafanalib/formatunits.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@
RADS_PER_SEC = 'rotrads' # rad/s
DEGREES_PER_SECOND = 'rotdegs' # °/s
# Temperature
CELSUIS = 'celsius' # °C
FARENHEIT = 'fahrenheit' # °F
KELVIN = 'kelvin' # K
CELSIUS = 'celsius' # °C
FAHRENHEIT = 'fahrenheit' # °F
KELVIN = 'kelvin' # K
# Time
HERTZ = 'hertz' # Hz
NANO_SECONDS = 'ns' # ns
Expand Down

0 comments on commit 44c98f9

Please sign in to comment.