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

[pull] master from grafana:master #53

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 13, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

dependabot bot and others added 2 commits October 13, 2023 10:25
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.12.0 to 0.17.0.
- [Commits](golang/net@v0.12.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Deprecate --directory/-d flag in favor of os.Stat

* Add tests for grizzly.Pull
@pull pull bot added the ⤵️ pull label Oct 13, 2023
undef1nd and others added 21 commits October 17, 2023 11:23
* Add support for pulling and pushing json

* Apply review feedback

* Pass -s flag instead of a separate command to save json spec of the dashboard

* Cleanup parsing json

* Apply review feedback
* Add grafana-openapi-client-go, add to provider

* Update unit test for rules and workflow

* folders use Grafana golang api

* datasources use Grafana golang api

* dashboards use Grafana golang api

* Remove code that is dead due to previous changes

* Unit test fixes
* Fix test and bug

* Make tests work
* Simplify DashboardHandler

* Simplify DataSourceHandler

* Simplify FolderHandler

* Simplify SM

* Simplify prometheus rules
* Implement contexts with fallback

* Add init and set

* Tests pass

* Remove debugging

* Add create, fix set

* Convert synthetic monitoring

* Add mimir rules

* Add docs

* Initialise from envvars

* s/init/import/

* Redocument envvars

* PR comments

* Switch to viper for configs

* Update docs

* Update docs/content/authentication.md

Co-authored-by: Julien Duchesne <[email protected]>

* Make it clear envvars need removing

* Base 'config' no longer needed

---------

Co-authored-by: Julien Duchesne <[email protected]>
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.2 to 1.58.3.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.58.2...v1.58.3)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This fixes an issue in the folder update logic by passing the folder ID and
setting the overwrite property. Without this fix, subsequent applies of the same
folder will fail.
Since the dashboard API uses the same request for create and update, we need to
make sure the create request does not contain the "id" property as this results
in a 404 response.
This updates the openapi client dependency to the latest version.

Requirement for supporting alerting since some options are only available in the
latest version
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0.
- [Commits](golang/crypto@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add support for library elements

This is a reimplementation/follow up to
#218, using the openapi client to keep in
line with the rest of the codebase. It allows pull & push of library panels and
variables.

Tested pull & push with a simple library panel and a dashboard using this panel

* fix: correctly order handlers
* feat: add basic alerting resources

This allows for pull/push of alert rules & alert rule groups.

Will create a follow up PR for contact points & notification policies

* refactor: use only AlertRuleGroup resource
* feat: add contact points

* refactor: rename to AlertContactPoint
* feat: add notificationpolicy type

This adds the notification policy resource type. As the NotificationPolicy is a
single global object, I've made the decision to just use "global" as the UID and
validate this on parsing resources. It's also saved into the single
"notificationpolicy.yaml" file directly.

* refactor: rename to AlertNotificationPolicy

---------

Co-authored-by: Julien Duchesne <[email protected]>
The previous implementation was broken because of the way viper implements
"Sub". The "overrides" section of the config only exists as env vars and can
therefore not be used as a subconfig.
@theSuess theSuess deleted the branch admariner:master December 29, 2023 12:57
@theSuess theSuess deleted the master branch December 29, 2023 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants