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.

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

Bring our branch up to date with upstream #15

Merged
merged 553 commits into from
Jun 30, 2023
Merged

Conversation

pauloconnor
Copy link

First PR in a while, may as well make it a doozy. Let's call this a jams project.

I got too annoyed with our fork not having some of the more modern features of Grafanalib, so pull them in.

We'll have to update a few dashboards when this is merged since our unit names don't match the ones upstream. In particular, PACKETS_PER_SEC_FORMAT and MILLISECONDS_FORMAT. Probably a few other changes too, but straight forward fixes.

Tests are passing locally. We will probably want to disable the Github actions, though this repo gets so little traffic, it shouldn't matter

Puneeth-n and others added 30 commits January 5, 2021 17:52
Use pytest --strict-marker over --strict
Add option to hide dashboard time picker
Bumps [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/readthedocs/sphinx_rtd_theme/releases)
- [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst)
- [Commits](readthedocs/sphinx_rtd_theme@0.5.0...0.5.1)

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 3.4.1 to 3.4.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](sphinx-doc/sphinx@v3.4.1...v3.4.3)

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 3.4.3 to 3.5.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](sphinx-doc/sphinx@v3.4.3...v3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
…nx-3.5.0

Bump sphinx from 3.4.3 to 3.5.0
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](sphinx-doc/sphinx@v3.5.0...v3.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
…nx-3.5.1

Bump sphinx from 3.5.0 to 3.5.1
Add alertRuleTags field to graph panel
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](sphinx-doc/sphinx@v3.5.1...v3.5.2)

Signed-off-by: dependabot[bot] <support@github.com>
…nx-3.5.2

Bump sphinx from 3.5.1 to 3.5.2
Add note to docs about supported grafana versions
@pauloconnor pauloconnor requested a review from a team as a code owner June 29, 2023 17:40
@pauloconnor pauloconnor requested review from jmilliron and removed request for a team June 29, 2023 17:40
@pauloconnor pauloconnor requested review from sabriel27 and awalther52 and removed request for jmilliron June 29, 2023 18:02
Copy link

@sabriel27 sabriel27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember at this point -- we still have to bump the version of grafanalib used in graphage, right?

As long as folks are notified that it's going in and potentially some dashboard pushes are unhappy, let's do it.

@pauloconnor
Copy link
Author

Yup, bumped version, new docker build, and a few updates. I'll try and catch them all.

@pauloconnor pauloconnor merged commit 2508870 into main Jun 30, 2023
@pauloconnor pauloconnor deleted the poconnor/merge_upstream branch June 30, 2023 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet