You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
This is a new tool that will be developed further in future releases. It can be pointed at a Grafana instance or at a Grafana Cloud account and it will find all Grafana provider resources and generate the Terraform config for them.
Example (with the binary from this release):
./terraform-provider-grafana-generate_3.0.0_darwin_arm64 --output-dir test --grafana-auth=admin:admin --grafana-url=http://localhost:3000/
Grafana 11 Support
Some Terraform features had to be removed to enable full Grafana 11 support. All resources should now work with Grafana 11 (Cloud, on-prem Enterprise and on-prem OSS).
Breaking changes
Removed the global (provider-level) org_id setting
Reasons for its removal:
The attribute was already added on each resource, so it doesn't remove any functionality
It's irrelevant to all parts of the provider other than Grafana resources, possibly causing confusing since there's also an org concept on cloud resources
Even for Grafana, it does not apply to all resources. For example, users are not org-scoped. By setting it on a resource level, this is much better defined
When using it globally, it prevents looping on multiple orgs. Ex: Create dashboards for a list of orgs. Providers cannot be created dynamically
Removed support for old ID separators (converge on :)
This makes importing resources consistent across all parts of the provider. For example:
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Trivy will check the following folders:
terraform/environments/observability-platform/modules/grafana/xray-source
Running Trivy in terraform/environments/observability-platform/modules/grafana/xray-source
2024-05-15T00:22:01Z INFO Need to update DB
2024-05-15T00:22:01Z INFO Downloading DB... repository="ghcr.io/aquasecurity/trivy-db:2"
2024-05-15T00:22:03Z INFO Vulnerability scanning is enabled
2024-05-15T00:22:03Z INFO Misconfiguration scanning is enabled
2024-05-15T00:22:03Z INFO Need to update the built-in policies
2024-05-15T00:22:03Z INFO Downloading the built-in policies...
50.41 KiB / 50.41 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-05-15T00:22:03Z INFO Secret scanning is enabled
2024-05-15T00:22:03Z INFO If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-05-15T00:22:03Z INFO Please see also https://aquasecurity.github.io/trivy/v0.51/docs/scanner/secret/#recommendation for faster secret detection
2024-05-15T00:22:04Z INFO Number of language-specific files num=0
2024-05-15T00:22:04Z INFO Detected config files num=1
trivy_exitcode=0
</details> #### `Checkov Scan` Success
<details><summary>Show Output</summary>
```hcl
*****************************
Checkov will check the following folders:
terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running Checkov in terraform/environments/observability-platform/modules/grafana/xray-source
Excluding the following checks: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
checkov_exitcode=0
CTFLint Scan Failed
Show Output
*****************************
Setting default tflint config...
Running tflint --init...
Installing "terraform" plugin...
Installed "terraform" (source:github.com/terraform-linters/tflint-ruleset-terraform, version:0.5.0)
tflint will check the following folders:terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running tflint in terraform/environments/observability-platform/modules/grafana/xray-source
Excluding the following checks: terraform_unused_declarations
1issue(s) found:
Warning:terraform"required_version" attribute is required (terraform_required_version)
on line 0:
(sourcecodenotavailable)
Reference: https://github.com/terraform-linters/tflint-ruleset-terraform/blob/v0.5.0/docs/rules/terraform_required_version.mdtflint_exitcode=2
Trivy Scan Success
Show Output
*****************************
Trivy will check the following folders:terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running Trivy in terraform/environments/observability-platform/modules/grafana/xray-source
2024-05-15T00:22:01Z INFO Need to update DB
2024-05-15T00:22:01Z INFO Downloading DB...repository="ghcr.io/aquasecurity/trivy-db:2"2024-05-15T00:22:03Z INFO Vulnerability scanning is enabled2024-05-15T00:22:03Z INFO Misconfiguration scanning is enabled2024-05-15T00:22:03Z INFO Need to update the built-in policies2024-05-15T00:22:03Z INFO Downloading the built-in policies...50.41 KiB / 50.41 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-05-15T00:22:03Z INFO Secret scanning is enabled2024-05-15T00:22:03Z INFO If your scanning is slow, please try '--scanners vuln' to disable secret scanning2024-05-15T00:22:03Z INFO Please see also https://aquasecurity.github.io/trivy/v0.51/docs/scanner/secret/#recommendation for faster secret detection2024-05-15T00:22:04Z INFO Number of language-specific files num=02024-05-15T00:22:04Z INFO Detected config files num=1trivy_exitcode=0
Trivy will check the following folders:
terraform/environments/observability-platform/modules/grafana/xray-source
Running Trivy in terraform/environments/observability-platform/modules/grafana/xray-source
2024-05-22T08:15:49Z INFO Need to update DB
2024-05-22T08:15:49Z INFO Downloading DB... repository="ghcr.io/aquasecurity/trivy-db:2"
2024-05-22T08:15:52Z INFO Vulnerability scanning is enabled
2024-05-22T08:15:52Z INFO Misconfiguration scanning is enabled
2024-05-22T08:15:52Z INFO Need to update the built-in policies
2024-05-22T08:15:52Z INFO Downloading the built-in policies...
50.41 KiB / 50.41 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-05-22T08:15:52Z INFO Secret scanning is enabled
2024-05-22T08:15:52Z INFO If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-05-22T08:15:52Z INFO Please see also https://aquasecurity.github.io/trivy/v0.51/docs/scanner/secret/#recommendation for faster secret detection
2024-05-22T08:15:53Z INFO Number of language-specific files num=0
2024-05-22T08:15:53Z INFO Detected config files num=1
trivy_exitcode=0
</details> #### `Checkov Scan` Success
<details><summary>Show Output</summary>
```hcl
*****************************
Checkov will check the following folders:
terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running Checkov in terraform/environments/observability-platform/modules/grafana/xray-source
Excluding the following checks: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
checkov_exitcode=0
CTFLint Scan Success
Show Output
*****************************
Setting default tflint config...
Running tflint --init...
Installing "terraform" plugin...
Installed "terraform" (source:github.com/terraform-linters/tflint-ruleset-terraform, version:0.5.0)
tflint will check the following folders:terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running tflint in terraform/environments/observability-platform/modules/grafana/xray-source
Excluding the following checks: terraform_unused_declarations
tflint_exitcode=0
Trivy Scan Success
Show Output
*****************************
Trivy will check the following folders:terraform/environments/observability-platform/modules/grafana/xray-source
*****************************
Running Trivy in terraform/environments/observability-platform/modules/grafana/xray-source
2024-05-22T08:15:49Z INFO Need to update DB
2024-05-22T08:15:49Z INFO Downloading DB...repository="ghcr.io/aquasecurity/trivy-db:2"2024-05-22T08:15:52Z INFO Vulnerability scanning is enabled2024-05-22T08:15:52Z INFO Misconfiguration scanning is enabled2024-05-22T08:15:52Z INFO Need to update the built-in policies2024-05-22T08:15:52Z INFO Downloading the built-in policies...50.41 KiB / 50.41 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-05-22T08:15:52Z INFO Secret scanning is enabled2024-05-22T08:15:52Z INFO If your scanning is slow, please try '--scanners vuln' to disable secret scanning2024-05-22T08:15:52Z INFO Please see also https://aquasecurity.github.io/trivy/v0.51/docs/scanner/secret/#recommendation for faster secret detection2024-05-22T08:15:53Z INFO Number of language-specific files num=02024-05-22T08:15:53Z INFO Detected config files num=1trivy_exitcode=0
dependenciesPull requests that update a dependency fileenvironments-repositoryUsed to exclude PRs from this repo in our Slack PR updateterraformPull requests that update Terraform code
0 participants
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.
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
dependabot
bot
added
dependencies
github-actions
bot
added
the
environments-repository
Updates the requirements on grafana/grafana to permit the latest version.
Release notes
Sourced from grafana/grafana's releases.
... (truncated)
Commits
3e2cef5Cloud: More test fixes (#1569)9bb8e44Cloud: Fix SM installation test (#1568)b761830Run tests on Grafana v11 (#1415)514d787Bump github.com/hashicorp/go-retryablehttp from 0.7.5 to 0.7.6 (#1563)2248b2cBump github.com/fatih/color from 1.16.0 to 1.17.0 (#1564)4002138Bump github.com/hashicorp/terraform-plugin-mux in the terraform group (#1562)5e1d47bClear out CHANGELOG.md (#1560)eeea35aUpdate synthetic monitoring frequency value validation (#1561)e585d9cLink changelog in TF provider docs (#1559)84f3501Code Generation: Add readme and warnings (#1556)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)