Skip to content

Commit

Permalink
Merge branch 'main' into windows_filter
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	pkg/server/tls_certstore_windows.go
  • Loading branch information
mattdurham committed Sep 12, 2023
2 parents 24dbf02 + 0ea5b12 commit 1677bf9
Show file tree
Hide file tree
Showing 529 changed files with 9,152 additions and 2,558 deletions.
126 changes: 63 additions & 63 deletions .drone/drone.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Actions
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "grafana/grafana-github-actions"
path: ./actions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bump-formula-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
homebrew-core:
name: homebrew-core
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- name: Get latest release
uses: rez0n/actions-github-release@main
Expand All @@ -33,7 +33,7 @@ jobs:

homebrew-grafana:
name: homebrew-grafana
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- name: Get latest release
uses: rez0n/actions-github-release@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Check out code"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"
- name: "Build technical documentation"
run: >
docker run
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/depcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Invoke action
uses: rfratto/depcheck@main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/helm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
chartpath: ${{ steps.list-changed.outputs.chartpath }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
path: source
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
if: needs.setup.outputs.changed == 'true'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
path: source
Expand All @@ -75,7 +75,7 @@ jobs:
git config user.email "[email protected]"
- name: Checkout helm-charts
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
repository: grafana/helm-charts
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/helm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Regenerate docs
run: |
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Helm
uses: azure/setup-helm@v3
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Actions
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "grafana/grafana-github-actions"
path: ./actions
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/needs-attention.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Check whether issues or PRs need attention
on:
workflow_dispatch: {}
schedule:
- cron: '0 0 * * *'
permissions:
issues: write
pull-requests: write
jobs:
needs-attention:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
days-before-stale: 30
days-before-close: -1 # never close automatically
stale-issue-message: >
This issue has not had any activity in the past 30 days, so the
`needs-attention` label has been added to it.
If the opened issue is a bug, check to see if a newer release fixed
your issue. If it is no longer relevant, please feel free to close
this issue.
The `needs-attention` label signals to maintainers that something
has fallen through the cracks. No action is needed by you; your issue
will be kept open and you do not have to respond to this comment. The
label will be removed the next time this job runs if there is new
activity.
Thank you for your contributions!
stale-pr-message: >
This PR has not had any activity in the past 30 days, so the
`needs-attention` label has been added to it.
If you do not have enough time to follow up on this PR or you think
it's no longer relevant, consider closing it.
The `needs-attention` label signals to maintainers that something
has fallen through the cracks. No action is needed by you; your PR
will be kept open and you do not have to respond to this comment.
The label will be removed the next time this job runs if there is
new activity.
Thank you for your contributions!
stale-issue-label: needs-attention
stale-pr-label: needs-attention
exempt-issue-labels: keepalive,proposal,outdated-dependency,dev-branch
exempt-pr-labels: keepalive,proposal,outdated-dependency,dev-branch
4 changes: 2 additions & 2 deletions .github/workflows/publish-documentation-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Check out code"
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: "Build technical documentation"
run: >
docker run
Expand All @@ -28,7 +28,7 @@ jobs:
steps:

- name: "Checkout Agent repo"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Clone website-sync Action"
# WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-documentation-versioned.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Check out code"
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: "Build technical documentation"
run: >
docker run
Expand All @@ -30,12 +30,12 @@ jobs:
steps:

- name: "Checkout Agent repo"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: "Checkout Actions library"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "grafana/grafana-github-actions"
path: ./actions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: azohra/shell-linter@latest
with:
path: "packaging,production,tools/ci,tools/release,docs/sources/flow/tutorials/assets"
41 changes: 0 additions & 41 deletions .github/workflows/stale.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go 1.21
uses: actions/setup-go@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54
uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f
with:
image-ref: 'grafana/agent:main'
format: 'template'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-make-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Update procedure
if: github.repository != 'grafana/writers-toolkit'
Expand Down
19 changes: 11 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,17 @@ issues:
# Linter settings options: https://golangci-lint.run/usage/linters/
linters-settings:
depguard:
# We want to report errors on stdlib packages, not just third party modules
include-go-root: true

packages-with-error-message:
- sync/atomic: "Use go.uber.org/atomic instead of sync/atomic"
- github.com/pkg/errors: "Use errors instead of github.com/pkg/errors"
- github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
- golang.org/x/sync/errgroup: "Use github.com/oklog/run instead of golang.org/x/sync/errgroup"
rules:
main:
deny:
- pkg: "sync/atomic"
desc: Use go.uber.org/atomic instead of sync/atomic
- pkg: "github.com/pkg/errors"
desc: Use errors instead of github.com/pkg/errors
- pkg: "github.com/go-kit/kit/log"
desc: Use github.com/go-kit/log instead of github.com/go-kit/kit/log
- pkg: "golang.org/x/sync/errgroup"
desc: Use github.com/oklog/run instead of golang.org/x/sync/errgroup

whitespace:
# While there normally shouldn't be extra redundant leading/trailing
Expand Down
Loading

0 comments on commit 1677bf9

Please sign in to comment.