Skip to content

Commit

Permalink
feat: support grafana org/tenant id input for push-gha-metrics-action…
Browse files Browse the repository at this point in the history
… v2.1.0 (#153)

* bump untagged push-gha-metrics-action references to v2.1.0
* feat: support grafana org/tenant id input
* fix: add grafana org-id input for action template
  • Loading branch information
erikburt authored Feb 1, 2024
1 parent 6dde7a8 commit df8e6ca
Show file tree
Hide file tree
Showing 19 changed files with 162 additions and 61 deletions.
21 changes: 21 additions & 0 deletions .changeset/large-walls-hear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
"cicd-build-publish-artifacts-go": patch
"cicd-build-publish-artifacts-ts": patch
"guard-from-missing-changesets": patch
"helm-version-bump-receiver": patch
"cicd-build-publish-charts": patch
"cicd-changesets": patch
"ci-lint-charts": patch
"manifest-build": patch
"update-actions": patch
"ci-lint-misc": patch
"ci-sonarqube": patch
"ci-test-sol": patch
"ci-lint-go": patch
"ci-lint-ts": patch
"ci-test-go": patch
"ci-test-ts": patch
"setup-gap": patch
---

Support grafana org/tenant id input for push-gha-metrics-action v2.1.0
10 changes: 7 additions & 3 deletions actions/ci-lint-charts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ inputs:
description: "chart-testing extra args"
required: false
default: ""
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-lint-charts
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false

runs:
Expand Down Expand Up @@ -59,5 +62,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-lint-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ inputs:
description: "number of commits to fetch"
required: false
default: "0"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-lint
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# aws inputs
aws-role-duration-seconds:
Expand Down Expand Up @@ -149,5 +152,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-lint-misc/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ inputs:
description: "number of commits to fetch"
required: false
default: "0"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-lint-misc
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false

runs:
Expand All @@ -47,5 +50,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
11 changes: 8 additions & 3 deletions actions/ci-lint-ts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,21 @@ inputs:
description: ""
required: false
default: main
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-lint
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false

# nodejs inputs
node-version-file:
description: ""
Expand Down Expand Up @@ -75,5 +79,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-sonarqube/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ inputs:
description: "number of commits to fetch"
required: false
default: "0"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-sonarqube
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# sonarqube inputs
sonar-token:
Expand Down Expand Up @@ -89,5 +92,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-test-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ inputs:
description: "number of commits to fetch"
required: false
default: "0"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-test
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# aws inputs
aws-role-duration-seconds:
Expand Down Expand Up @@ -148,5 +151,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-test-sol/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,19 @@ inputs:
description: ""
required: false
default: "--report lcov"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-test-sol
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# nodejs inputs
node-version-file:
Expand Down Expand Up @@ -142,5 +145,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/ci-test-ts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ inputs:
description: ""
required: false
default: main
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: ci-test
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# nodejs inputs
node-version-file:
Expand Down Expand Up @@ -75,5 +78,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/cicd-build-publish-artifacts-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,19 @@ inputs:
description: ""
required: false
default: "false"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: cicd-build-publish-artifacts
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# aws inputs
aws-role-duration-seconds:
Expand Down Expand Up @@ -224,5 +227,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/cicd-build-publish-artifacts-ts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,19 @@ inputs:
monorepo-release-version:
description: ""
required: false
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: cicd-build-publish-artifacts
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# nodejs inputs
node-version-file:
Expand Down Expand Up @@ -148,5 +151,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/cicd-build-publish-charts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ inputs:
description: "number of commits to fetch"
required: false
default: "0"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: cicd-build-publish-charts
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# general inputs
package-dir:
Expand Down Expand Up @@ -114,5 +117,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
10 changes: 7 additions & 3 deletions actions/cicd-changesets/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,19 @@ inputs:
description: "Use cache for pnpm"
required: false
default: "true"
# grafana cloud inputs
# grafana inputs
metrics-job-name:
description: "grafana metrics job name"
required: false
default: cicd-changesets
gc-host:
description: "grafana cloud hostname"
description: "grafana hostname"
required: false
gc-basic-auth:
description: "grafana cloud basic auth"
description: "grafana basic auth"
required: false
gc-org-id:
description: "grafana org/tenant id"
required: false
# changesets inputs
changesets-publish-cmd:
Expand Down Expand Up @@ -141,5 +144,6 @@ runs:
with:
basic-auth: ${{ inputs.gc-basic-auth }}
hostname: ${{ inputs.gc-host }}
org-id: ${{ inputs.gc-org-id}}
this-job-name: ${{ inputs.metrics-job-name }}
continue-on-error: true
Loading

0 comments on commit df8e6ca

Please sign in to comment.