Skip to content

Commit

Permalink
Merge branch 'master' into add-link-between-prometheus-dashboards
Browse files Browse the repository at this point in the history
  • Loading branch information
marieroque authored Sep 15, 2023
2 parents e8c6fab + b3ff0b1 commit 09965bc
Show file tree
Hide file tree
Showing 24 changed files with 6,808 additions and 1,612 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2.1

orbs:
architect: giantswarm/architect@4.29.0
architect: giantswarm/architect@4.31.0

jobs:
build-and-deploy-dashboards:
docker:
- image: cimg/go:1.20.6
- image: cimg/go:1.21.1
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-mixins-monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
upgrade:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Sync dashboards
run: ./scripts/update-monitoring-mixin-dashboards.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.check_values_schema.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#
name: 'Values and schema'
on:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/zz_generated.create_release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#
name: Create Release
on:
Expand All @@ -15,7 +15,7 @@ on:
jobs:
debug_info:
name: Debug info
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Print github context JSON
run: |
Expand All @@ -24,7 +24,7 @@ jobs:
EOF
gather_facts:
name: Gather facts
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
project_go_path: ${{ steps.get_project_go_path.outputs.path }}
ref_version: ${{ steps.ref_version.outputs.refversion }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
echo "refversion=${refversion}" >> $GITHUB_OUTPUT
update_project_go:
name: Update project.go
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: ${{ needs.gather_facts.outputs.version != '' && needs.gather_facts.outputs.project_go_path != '' && needs.gather_facts.outputs.ref_version != 'true' }}
needs:
- gather_facts
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
hub pull-request -f -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }}
create_release:
name: Create release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- gather_facts
if: ${{ needs.gather_facts.outputs.version }}
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:

create-release-branch:
name: Create release branch
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- gather_facts
if: ${{ needs.gather_facts.outputs.version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/zz_generated.create_release_pr.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#
name: Create Release PR
on:
Expand Down Expand Up @@ -30,7 +30,7 @@ on:
jobs:
debug_info:
name: Debug info
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Print github context JSON
run: |
Expand All @@ -39,7 +39,7 @@ jobs:
EOF
gather_facts:
name: Gather facts
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
repo_name: ${{ steps.gather_facts.outputs.repo_name }}
branch: ${{ steps.gather_facts.outputs.branch }}
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
fi
create_release_pr:
name: Create release PR
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- gather_facts
if: ${{ needs.gather_facts.outputs.skip != 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.gitleaks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#
name: gitleaks

Expand Down
53 changes: 52 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add internal links between all Prometheus Dashboards.

## [2.42.0] - 2023-08-31

### Changed

- DNS Dashboard: add logs panel for CoreDNS
- Kong Connection Distribution: Make public

## [2.41.0] - 2023-08-30

### Changed

- Prometheus dashboard: logs panel and restart logs annotation

## [2.40.0] - 2023-08-24

### Added

- Added dashboard showing AWS Load Balancer Controller errors
- Added Karpenter dashboard

## [2.39.0] - 2023-08-22

### Changed

- Align owner tags in Grafana cloud dashboards to format `owner:TEAM-NAME`.

## [2.38.0] - 2023-08-21

### Fixed

- Added promtail to cpu & memory graphs

## [2.37.0] - 2023-08-18

### Fixed

- Fixed issues from `Loki Cost Estimate` dashboard
- Fixed cluster id in `Cilium Metrics` dashboard

### Changed

- Update Kyverno health dashboard to be compatible with Kyverno 1.10.
- Add modified "Kong (official)" dashboard
- Update Kong-Connection-Distribution dashboard to work with new kong-app versions

## [2.36.0] - 2023-07-27

### Added
Expand Down Expand Up @@ -620,7 +665,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add public grafana dashboards.


[Unreleased]: https://github.com/giantswarm/dashboards/compare/v2.36.0...HEAD
[Unreleased]: https://github.com/giantswarm/dashboards/compare/v2.42.0...HEAD
[2.42.0]: https://github.com/giantswarm/dashboards/compare/v2.41.0...v2.42.0
[2.41.0]: https://github.com/giantswarm/dashboards/compare/v2.40.0...v2.41.0
[2.40.0]: https://github.com/giantswarm/dashboards/compare/v2.39.0...v2.40.0
[2.39.0]: https://github.com/giantswarm/dashboards/compare/v2.38.0...v2.39.0
[2.38.0]: https://github.com/giantswarm/dashboards/compare/v2.37.0...v2.38.0
[2.37.0]: https://github.com/giantswarm/dashboards/compare/v2.36.0...v2.37.0
[2.36.0]: https://github.com/giantswarm/dashboards/compare/v2.35.0...v2.36.0
[2.35.0]: https://github.com/giantswarm/dashboards/compare/v2.34.0...v2.35.0
[2.34.0]: https://github.com/giantswarm/dashboards/compare/v2.33.0...v2.34.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#

include Makefile.*.mk
Expand Down
2 changes: 1 addition & 1 deletion Makefile.gen.app.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.4.0
# devctl@6.9.0
#

##@ App
Expand Down
2 changes: 1 addition & 1 deletion dashboards/docker-actions.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local stdlib = import 'stdlib.jsonnet';
stdlib.dashboard(
'Docker Actions',
'docker-actions',
['honeybadger'],
['owner:team-honeybadger'],
time_from='now-7d',
)

Expand Down
2 changes: 1 addition & 1 deletion dashboards/grafana-analytics.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local stdlib = import 'stdlib.jsonnet';
stdlib.dashboard(
'Grafana Analytics',
'grafana-analytics',
['atlas'],
['owner:team-atlas'],
time_from='now-7d',
)

Expand Down
2 changes: 1 addition & 1 deletion dashboards/metrics.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local stdlib = import 'stdlib.jsonnet';
stdlib.dashboard(
'Metrics',
'metrics',
['atlas'],
['owner:team-atlas'],
time_from='now-7d',
)

Expand Down
2 changes: 1 addition & 1 deletion dashboards/service-level.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ local burnRateChart(title, queries) =
stdlib.dashboard(
'Service Level',
'service-level',
['atlas'],
['owner:team-atlas'],
)

.addTemplates([
Expand Down
Loading

0 comments on commit 09965bc

Please sign in to comment.