diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 44a0cfc987b..70f69f2449b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,7 +14,7 @@ # Documentation /.changelog-archive @grafana/docs-grafana /.codespellignore @grafana/docs-tooling -/CHANGELOG.md @grafana/grafana-delivery +/CHANGELOG.md @grafana/grafana-release-guild /CODE_OF_CONDUCT.md @grafana/docs-grafana /CONTRIBUTING.md @grafana/docs-grafana /GOVERNANCE.md @RichiH @@ -228,15 +228,15 @@ # Continuous Integration -.drone.yml @grafana/grafana-delivery -.drone.star @grafana/grafana-delivery -/scripts/drone/ @grafana/grafana-delivery -/pkg/build/ @grafana/grafana-delivery -/.dockerignore @grafana/grafana-delivery -/Dockerfile @grafana/grafana-delivery -/Makefile @grafana/grafana-delivery -/scripts/build/ @grafana/grafana-delivery -/scripts/list-release-artifacts.sh @grafana/grafana-delivery +.drone.yml @grafana/grafana-release-guild +.drone.star @grafana/grafana-release-guild +/scripts/drone/ @grafana/grafana-release-guild +/pkg/build/ @grafana/grafana-release-guild +/.dockerignore @grafana/grafana-release-guild +/Dockerfile @grafana/grafana-release-guild +/Makefile @grafana/grafana-release-guild +/scripts/build/ @grafana/grafana-release-guild +/scripts/list-release-artifacts.sh @grafana/grafana-release-guild # OSS Plugin Partnerships backend code /pkg/tsdb/cloudwatch/ @grafana/aws-datasources @@ -475,26 +475,26 @@ lerna.json @grafana/frontend-ops /scripts/benchmark-access-control.sh @grafana/grafana-authnz-team /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend -/scripts/ci-* @grafana/grafana-delivery -/scripts/circle-* @grafana/grafana-delivery -/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend -/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend +/scripts/ci-* @grafana/grafana-release-guild +/scripts/circle-* @grafana/grafana-release-guild +/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend +/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend /scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad /scripts/cli/ @grafana/grafana-frontend-platform /scripts/clean-git-or-error.sh @grafana/grafana-as-code /scripts/grafana-server/ @grafana/grafana-frontend-platform -/scripts/helpers/ @grafana/grafana-delivery +/scripts/helpers/ @grafana/grafana-release-guild /scripts/import_many_dashboards.sh @torkelo /scripts/mixin-check.sh @bergquist /scripts/openapi3/ @grafana/grafana-operator-experience-squad /scripts/prepare-packagejson.js @grafana/frontend-ops /scripts/protobuf-check.sh @grafana/plugins-platform-backend /scripts/stripnulls.sh @grafana/grafana-as-code -/scripts/tag_release.sh @grafana/grafana-delivery -/scripts/trigger_docker_build.sh @grafana/grafana-delivery -/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery -/scripts/trigger_windows_build.sh @grafana/grafana-delivery -/scripts/verify-repo-update/ @grafana/grafana-delivery +/scripts/tag_release.sh @grafana/grafana-release-guild +/scripts/trigger_docker_build.sh @grafana/grafana-release-guild +/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild +/scripts/trigger_windows_build.sh @grafana/grafana-release-guild +/scripts/verify-repo-update/ @grafana/grafana-release-guild /scripts/webpack/ @grafana/frontend-ops /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform @@ -595,17 +595,17 @@ embed.go @grafana/grafana-as-code /.github/renovate.json5 @grafana/frontend-ops /.github/teams.yml @armandgrillet /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend-product -/.github/workflows/auto-milestone.yml @grafana/grafana-delivery -/.github/workflows/backport.yml @grafana/grafana-delivery -/.github/workflows/bump-version.yml @grafana/grafana-delivery -/.github/workflows/close-milestone.yml @grafana/grafana-delivery +/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild +/.github/workflows/backport.yml @grafana/grafana-release-guild +/.github/workflows/bump-version.yml @grafana/grafana-release-guild +/.github/workflows/close-milestone.yml @grafana/grafana-release-guild /.github/workflows/codeowners-validator.yml @tolzhabayev /.github/workflows/codeql-analysis.yml @DanCech /.github/workflows/commands.yml @torkelo /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend /.github/workflows/doc-validator.yml @grafana/docs-tooling /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina -/.github/workflows/github-release.yml @grafana/grafana-delivery +/.github/workflows/github-release.yml @grafana/grafana-release-guild /.github/workflows/issue-labeled.yml @armandgrillet /.github/workflows/issue-opened.yml @grafana/grafana-community-support /.github/workflows/metrics-collector.yml @torkelo @@ -617,16 +617,16 @@ embed.go @grafana/grafana-as-code /.github/workflows/pr-codeql-analysis-python.yml @DanCech /.github/workflows/pr-commands-closed.yml @tolzhabayev /.github/workflows/pr-commands.yml @marefr -/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery -/.github/workflows/sync-mirror.yml @grafana/grafana-delivery +/.github/workflows/pr-patch-check.yml @grafana/grafana-release-guild +/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling -/.github/workflows/remove-milestone.yml @grafana/grafana-delivery +/.github/workflows/remove-milestone.yml @grafana/grafana-release-guild /.github/workflows/sbom-report.yml @grafana/security-team /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend -/.github/workflows/stale.yml @grafana/grafana-delivery -/.github/workflows/update-changelog.yml @grafana/grafana-delivery +/.github/workflows/stale.yml @grafana/grafana-release-guild +/.github/workflows/update-changelog.yml @grafana/grafana-release-guild /.github/workflows/update-make-docs.yml @grafana/docs-tooling /.github/workflows/snyk.yml @grafana/security-team /.github/workflows/scripts/kinds/verify-kinds.go @grafana/grafana-as-code @@ -636,7 +636,7 @@ embed.go @grafana/grafana-as-code /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad /.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad /.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad -/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery +/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild # Generated files not requiring owner approval diff --git a/.github/workflows/create-security-patch-from-security-mirror.yml b/.github/workflows/create-security-patch-from-security-mirror.yml index 413addb6827..e187149b8b4 100644 --- a/.github/workflows/create-security-patch-from-security-mirror.yml +++ b/.github/workflows/create-security-patch-from-security-mirror.yml @@ -1,5 +1,5 @@ -# Owned by grafana-delivery-squad -# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. +# Owned by grafana-release-guild +# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. name: Create security patch run-name: create-security-patch on: @@ -17,7 +17,7 @@ jobs: trigger_downstream_create_security_patch: concurrency: create-patch-${{ github.ref_name }} uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main - if: github.repository == 'grafana/grafana-security-mirror' + if: github.repository == 'grafana/grafana-security-mirror' with: repo: "${{ github.repository }}" src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing" diff --git a/.github/workflows/pr-patch-check.yml b/.github/workflows/pr-patch-check.yml index 1ff327ebdef..a7896130e31 100644 --- a/.github/workflows/pr-patch-check.yml +++ b/.github/workflows/pr-patch-check.yml @@ -1,4 +1,4 @@ -# Owned by grafana-delivery-squad +# Owned by grafana-release-guild # Intended to be dropped into the base repo Ex: grafana/grafana name: Check for patch conflicts run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }} diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml index fd8d93d6226..09c8f87d509 100644 --- a/.github/workflows/sync-mirror.yml +++ b/.github/workflows/sync-mirror.yml @@ -1,4 +1,4 @@ -# Owned by grafana-delivery-squad +# Owned by grafana-release-guild # Intended to be dropped into the base repo, Ex: grafana/grafana name: Sync to mirror run-name: sync-to-mirror-${{ github.ref_name }} diff --git a/contribute/drone-pipeline.md b/contribute/drone-pipeline.md index 2d0b74db046..b75ab2649c7 100644 --- a/contribute/drone-pipeline.md +++ b/contribute/drone-pipeline.md @@ -14,4 +14,4 @@ The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/star - Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo. - Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file. -For further questions, reach out to the grafana-delivery squad. +For further questions, reach out to the grafana-release-guild squad. diff --git a/go.mod b/go.mod index 1f5706b7de1..f9233136868 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go v1.44.234 // @grafana/aws-datasources github.com/beevik/etree v1.2.0 // @grafana/backend-platform github.com/benbjohnson/clock v1.3.3 // @grafana/alerting-squad-backend - github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-delivery + github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // @grafana/backend-platform github.com/centrifugal/centrifuge v0.30.2 // @grafana/grafana-app-platform-squad github.com/crewjam/saml v0.4.13 // @grafana/backend-platform @@ -80,7 +80,7 @@ require ( github.com/lib/pq v1.10.6 // @grafana/backend-platform github.com/linkedin/goavro/v2 v2.10.0 // @grafana/backend-platform github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform - github.com/magefile/mage v1.15.0 // @grafana/grafana-delivery + github.com/magefile/mage v1.15.0 // @grafana/grafana-release-guild github.com/mattn/go-isatty v0.0.18 // @grafana/backend-platform github.com/mattn/go-sqlite3 v1.14.16 // @grafana/backend-platform github.com/matttproud/golang_protobuf_extensions v1.0.4 // @grafana/alerting-squad-backend @@ -237,10 +237,10 @@ require ( github.com/blugelabs/bluge_segment_api v0.2.0 // @grafana/backend-platform github.com/bufbuild/connect-go v1.4.1 // @grafana/observability-traces-and-profiling github.com/dlmiddlecote/sqlstats v1.0.2 // @grafana/backend-platform - github.com/drone/drone-cli v1.6.1 // @grafana/grafana-delivery + github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild github.com/getkin/kin-openapi v0.115.0 // @grafana/grafana-operator-experience-squad github.com/golang-migrate/migrate/v4 v4.7.0 // @grafana/backend-platform - github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-delivery + github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-release-guild github.com/grafana/codejen v0.0.3 // @grafana/dataviz-squad github.com/grafana/dskit v0.0.0-20230706162620-5081d8ed53e6 // @grafana/backend-platform github.com/grafana/phlare/api v0.1.4-0.20230426005640-f90edba05413 // @grafana/observability-traces-and-profiling @@ -258,7 +258,7 @@ require ( require ( buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4 // @grafana/observability-traces-and-profiling - github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-delivery + github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-release-guild github.com/alicebob/miniredis/v2 v2.30.1 // @grafana/alerting-squad-backend github.com/dave/dst v0.27.2 // @grafana/grafana-as-code github.com/go-jose/go-jose/v3 v3.0.0 // @grafana/backend-platform @@ -433,7 +433,7 @@ require ( github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect - github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-delivery + github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-release-guild github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect github.com/emirpasic/gods v1.12.0 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect diff --git a/scripts/modowners/README.md b/scripts/modowners/README.md index a06435ed262..4392590af6d 100644 --- a/scripts/modowners/README.md +++ b/scripts/modowners/README.md @@ -35,7 +35,7 @@ Example CLI command to get a list of all owners with a count of the number of de Example output: ``` -@grafana/grafana-delivery 5 +@grafana/grafana-release-guild 5 @grafana/grafana-bi-squad 2 @grafana/grafana-app-platform-squad 13 @grafana/observability-metrics 4 @@ -67,7 +67,7 @@ List all dependencies of given owner(s). Example CLI command to list all direct dependencies owned by Delivery and Authnz: -`go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/grafana-authnz-team go.mod` +`go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/grafana-authnz-team go.mod` Example output: diff --git a/scripts/modowners/modowners.go b/scripts/modowners/modowners.go index 9650e532432..851e0edbe66 100755 --- a/scripts/modowners/modowners.go +++ b/scripts/modowners/modowners.go @@ -129,7 +129,7 @@ func owners(fileSystem fs.FS, logger *log.Logger, args []string) error { } // Print dependencies for a given owner. Can specify one or more owners. -// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/grafana-authnz-team go.mod` +// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/grafana-authnz-team go.mod` func modules(fileSystem fs.FS, logger *log.Logger, args []string) error { fs := flag.NewFlagSet("modules", flag.ExitOnError) indirect := fs.Bool("i", false, "print indirect dependencies")