From 7e7d7e6b476630da92d9868a61647b2720b7eed9 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Mon, 21 Aug 2023 10:01:17 +0200 Subject: [PATCH 1/2] Add grafana dashboard selector to group entities --- CHANGELOG.md | 5 +++++ pkg/catalog/functions.go | 3 +++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1afba17..7857284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Add `grafana/dashboard-selector` annotaion to Group entities, to enable showing of dashboards for teams. + ## [0.2.1] - 2023-08-18 +- Ensure deterministic order of dependencies, avoid duplicates. +- Simplify Github dependency graph query. + ## [0.2.0] - 2023-08-17 ### Added diff --git a/pkg/catalog/functions.go b/pkg/catalog/functions.go index c865aac..868857c 100644 --- a/pkg/catalog/functions.go +++ b/pkg/catalog/functions.go @@ -94,6 +94,9 @@ func CreateGroupEntity(name, displayName, description, parent string, members [] Kind: EntityKindGroup, Metadata: EntityMetadata{ Name: name, + Annotations: map[string]string{ + "grafana/dashboard-selector": "tags @> 'owner:team-atlas'", + }, }, } spec := GroupSpec{ From 0a5482ac2debc8fbfc14065dd86def5e4d26f493 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Mon, 21 Aug 2023 11:28:19 +0200 Subject: [PATCH 2/2] Fix selector format --- pkg/catalog/functions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/catalog/functions.go b/pkg/catalog/functions.go index 868857c..05f4457 100644 --- a/pkg/catalog/functions.go +++ b/pkg/catalog/functions.go @@ -95,7 +95,7 @@ func CreateGroupEntity(name, displayName, description, parent string, members [] Metadata: EntityMetadata{ Name: name, Annotations: map[string]string{ - "grafana/dashboard-selector": "tags @> 'owner:team-atlas'", + "grafana/dashboard-selector": fmt.Sprintf("tags @> 'owner:team-%s'", name), }, }, }