Sync with upstream #18
Merged
+346
−79
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add color in Stat(Panel) * add color in Stat(Panel)
* add unit to tables and hide flag to es targets * Update CHANGELOG.rst --------- Co-authored-by: Gil Popilski <gilou@gils-mbp.lan>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
python 3.11 is part of tests so README should not mislead about only supporting up to python 3.10
* added axisSoftMin and axisSoftMax to TimeSeries * Update CHANGELOG.rst --------- Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
Bumps [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) from 1.2.2 to 1.3.0. - [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst) - [Commits](readthedocs/sphinx_rtd_theme@1.2.2...1.3.0) --- updated-dependencies: - dependency-name: sphinx-rtd-theme dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix sphinx 7.2.5 ci build * Use newer sphinx docker image and upgrade pip
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.5 to 7.2.6. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](sphinx-doc/sphinx@v7.2.5...v7.2.6) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add missing options, functionality to DashboardLink Includes the ability to create direct links or a list of dashboard links, extra options like includeVars and targetBlank. * Add docstring to DashboardLink, remove the unused `dashboard` param Removing this parameter is a breaking change... It didn't actually impact the generated link, other than acting as an alias to 'title' in some cases. If preferred, I can restore it to retain that alias behaviour, and perhaps add a warning log message? * Update changelog * Fix the DashboardLink type param in docstrings * Fix the field name for URL in DashboardLinks * Correct type annotations for py37, py38 * Fix flake8 warnigns in docstring for DashboardLink * Add tests for DashboardLink * Fix flake8 complaints in tests/test_core.py
* Add the Unit field to Graph Panels * Update changelog for Graph Panel
Bumps [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) from 1.3.0 to 2.0.0. - [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst) - [Commits](readthedocs/sphinx_rtd_theme@1.3.0...2.0.0) --- updated-dependencies: - dependency-name: sphinx-rtd-theme dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.7.0 to 5.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4.7.0...v5.0.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Heatmap default options * update changelog --------- Co-authored-by: Sergey Galkin <v.sergey.galkin@reddit.com>
…orks#635) Co-authored-by: Alan Christopher <alanchristopher@berkeley.edu>
Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.8.0 to 1.9.1. - [Release notes](https://github.com/lycheeverse/lychee-action/releases) - [Commits](lycheeverse/lychee-action@v1.8.0...v1.9.1) --- updated-dependencies: - dependency-name: lycheeverse/lychee-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/lycheeverse/lychee-action/releases) - [Commits](lycheeverse/lychee-action@v1.9.1...v1.9.3) --- updated-dependencies: - dependency-name: lycheeverse/lychee-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v5.0.0...v5.1.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…eaveworks#652) The package is no longer compatible with Python 3.7 after starting to use `typing.Literal` recently.
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.2.6 to 7.4.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](sphinx-doc/sphinx@v7.2.6...v7.4.3) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v5.1.0...v5.1.1) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add mappings to field config for Table * add entry in changelog --------- Co-authored-by: anson <ac@atomicsemi.com>
Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.9.3 to 1.10.0. - [Release notes](https://github.com/lycheeverse/lychee-action/releases) - [Commits](lycheeverse/lychee-action@v1.9.3...v1.10.0) --- updated-dependencies: - dependency-name: lycheeverse/lychee-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add account to CloudwatchMetricsTarget * docs: update changelog * Update grafanalib/cloudwatch.py --------- Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
* added tooltipSort to Piechartv2 Panel * added tooltipSort to PieChartv2 Panel --------- Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
* fix: correct spelling errors for temperature units * fix: add breaking change to changelog
* Some targets (Influx for example) use alias insted of legendFormat (which is Prometheus 'alias'). This commit setup both of them by legendFormat. * Added `neutral` option for `GaugePanel` (supported by Grafana 9.3.0 - grafana/grafana#38273) --------- Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
…hich is Prometheus 'alias'). This commit setup both of them by legendFormat. (weaveworks#648) Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
* cloudwatch: add queryMode attribute * cloudwatch: add doc for queryMode --------- Co-authored-by: JamesGibo <22477854+JamesGibo@users.noreply.github.com>
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 7.4.3 to 7.4.7. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](sphinx-doc/sphinx@v7.4.3...v7.4.7) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…sync_with_upstream
|
@pauloconnor looks like you did this sync last time, so tagging you. |
|
Do we even need to maintain this fork any more? |
|
I think we do, unfortunately. Weaveworks is no more, and while I am okay using whatever the latest version of the library was from them, we've modified our fork enough that we'll need to use it for the immediate future. |
|
Weaveworks is gone, but grafanalib is still being updated. We haven't made that many changes to our fork, mostly things that now exist in Grafana, and I know for a fact that part of our branch breaks with modern Grafana, specifically the table resource. |
pauloconnor
approved these changes
Sep 23, 2024
|
Ah interesting. I'll add a todo for us to look at getting off the fork then. I had also noticed issues with our table type as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was doing some dashboard work and I needed a new
TimeSeries.tooltipSortconstructor arg that was added to upstream grafanalib in weaveworks@1a0a0e8.I did my best to ensure any merge conflicts were fixed, largely by just picking the incoming code since it seems we haven't modified things too much. But let me know if that is a wrong approach to take.