Skip to content

Commit

Permalink
Merge branch 'pipo02mix-patch-1' of github.com:giantswarm/dashboards …
Browse files Browse the repository at this point in the history
…into pipo02mix-patch-1
  • Loading branch information
pipo02mix committed Dec 20, 2024
2 parents 5abd652 + 9622e10 commit 1a10274
Show file tree
Hide file tree
Showing 100 changed files with 18,587 additions and 20,497 deletions.
240 changes: 122 additions & 118 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,139 +1,143 @@
version: 2.1

orbs:
architect: giantswarm/architect@5.2.1
architect: giantswarm/architect@5.11.2

jobs:
build-and-deploy-dashboards:
docker:
- image: cimg/go:1.22.4
- image: cimg/go:1.23.4
steps:
- run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
- run: git clone https://github.com/grafana/grafonnet-lib.git $GOPATH/src/github.com/grafana/grafonnet-lib
- checkout
- run: ./scripts/make-dashboards.sh
- run:
command: |
if [ "${CIRCLE_BRANCH}" == "main" ]; then
./scripts/upload-dashboards.sh
fi
- run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
- run: git clone https://github.com/grafana/grafonnet-lib.git $GOPATH/src/github.com/grafana/grafonnet-lib
- checkout
- run: ./scripts/make-dashboards.sh
- run:
command: |
if [ "${CIRCLE_BRANCH}" == "main" ]; then
./scripts/upload-dashboards.sh
fi
workflows:
package-and-push-chart-on-tag:
jobs:
- build-and-deploy-dashboards:
filters:
tags:
only: /^v.*/
- build-and-deploy-dashboards:
filters:
tags:
only: /^v.*/

- architect/push-to-app-catalog:
context: "architect"
executor: app-build-suite
name: app-catalog
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "dashboards"
- architect/push-to-app-catalog:
context: architect
executor: app-build-suite
name: app-catalog
app_catalog: control-plane-catalog
app_catalog_test: control-plane-test-catalog
chart: dashboards
# Trigger job on git tag.
filters:
tags:
only: /^v.*/
requires:
- build-and-deploy-dashboards
filters:
tags:
only: /^v.*/
branches:
ignore:
- main
- master
requires:
- build-and-deploy-dashboards

- architect/push-to-app-collection:
context: "architect"
name: aws-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "aws-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: aws-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: aws-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: "architect"
name: azure-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "azure-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: azure-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: azure-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: "architect"
name: vsphere-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "vsphere-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
- architect/push-to-app-collection:
context: architect
name: vsphere-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: vsphere-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:

context: architect
name: cloud-director-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "cloud-director-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
context: architect
name: cloud-director-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: cloud-director-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: capa-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "capa-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: capa-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: capa-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: capz-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "capz-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: capz-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: capz-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

- architect/push-to-app-collection:
context: architect
name: gcp-app-collection
app_name: "dashboards"
app_namespace: "monitoring"
app_collection_repo: "gcp-app-collection"
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
- architect/push-to-app-collection:
context: architect
name: proxmox-app-collection
app_name: dashboards
app_namespace: monitoring
app_collection_repo: proxmox-app-collection
requires:
- app-catalog
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/
2 changes: 1 addition & 1 deletion .github/workflows/update-mixins-monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
run: ./scripts/update-monitoring-mixin-dashboards.sh

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6.1.0
uses: peter-evans/create-pull-request@v7.0.5
with:
title: "[AUTO] Update Monitoring mixins dashboards"
branch: update-mixins-dashboard
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/zz_generated.create_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# devctl
#
# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/create_release.yaml.template
# https://github.com/giantswarm/devctl/blob/c90dd09846d2e87f1bad62d2089405b78da11a82/pkg/gen/input/workflows/internal/file/create_release.yaml.template
#
name: Create Release
on:
Expand Down Expand Up @@ -90,12 +90,12 @@ jobs:
- gather_facts
steps:
- name: Install architect
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
with:
binary: "architect"
version: "6.14.1"
- name: Install semver
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
with:
binary: "semver"
version: "3.2.0"
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
if: ${{ needs.gather_facts.outputs.version }}
steps:
- name: Install semver
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
with:
binary: "semver"
version: "3.0.0"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/zz_generated.create_release_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# devctl
#
# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
# https://github.com/giantswarm/devctl/blob/7345de0273fb431a392dc15f53961b523dba2b5e/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template
#
name: Create Release PR
on:
Expand Down Expand Up @@ -147,12 +147,12 @@ jobs:
steps:
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '=1.18.1'
go-version: '=1.23'
- name: Install architect
uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0
uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0
with:
binary: "architect"
version: "6.11.0"
version: "6.17.0"
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
- name: Bump go module defined in go.mod if needed
run: |
if [ "${{ needs.gather_facts.outputs.needs_major_bump }}" = true ] && test -f "go.mod"; then
go install github.com/marwan-at-work/mod/cmd/mod@v0.5.0
go install github.com/marwan-at-work/mod/cmd/mod@v0.7.1
mod upgrade
fi
- name: Set up git identity
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/zz_generated.run_ossf_scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# devctl
#
# https://github.com/giantswarm/devctl/blob/0773061f94d5eac8a0e5b8f253bc15cc35a34066/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
# https://github.com/giantswarm/devctl/blob/515bdf66b25f68db4466f9fd8fa6104793785b78/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template
#

# This workflow uses actions that are not certified by GitHub. They are provided
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -67,14 +67,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3.25.9
uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
with:
sarif_file: results.sarif
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
output/
tools/*
!tools/.gitkeep
Loading

0 comments on commit 1a10274

Please sign in to comment.