-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update: monitoring mixins set to v1.12.0 for pyroscope-mixin (#934)
Signed-off-by: Nicolas Lamirault <[email protected]> Co-authored-by: Nicolas Lamirault <[email protected]>
- Loading branch information
1 parent
591387d
commit a41d243
Showing
5 changed files
with
41 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,8 @@ keywords: | |
| - kubernetes | ||
| - monitoring-mixin | ||
| - portefaix | ||
| version: 1.4.1 | ||
| appVersion: 1.2.0 | ||
| version: 1.5.0 | ||
| appVersion: 1.10.0 | ||
| maintainers: | ||
| - name: nlamirault | ||
| email: [email protected] | ||
|
|
@@ -51,5 +51,5 @@ annotations: | |
| fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C | ||
| url: https://keybase.io/nlamirault/pgp_keys.asc | ||
| artifacthub.io/changes: | | ||
| - kind: fixed | ||
| description: ConfigMap dashboards naming | ||
| - kind: changed | ||
| description: pyroscope-mixin v1.10.0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,3 @@ | ||
| # Copyright (C) Nicolas Lamirault <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| {{ if .Values.grafanaDashboard.enabled -}} | ||
| {{- $files := .Files.Glob "dashboards/*.json" }} | ||
| {{- if $files }} | ||
|
|
@@ -22,15 +6,17 @@ apiVersion: v1 | |
| kind: ConfigMapList | ||
| items: | ||
| {{- range $path, $fileContents := $files }} | ||
| {{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }} | ||
| {{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" | lower }} | ||
| - apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: | ||
| grafana-folder: {{ $.Values.grafanaDashboard.folder }} | ||
| {{- include "pyroscope-mixin.annotations" $ | indent 6 }} | ||
| labels: | ||
| grafana-dashboard: {{ $dashboardName }} | ||
| {{- include "pyroscope-mixin.labels" $ | indent 6 }} | ||
| app.kubernetes.io/component: dashboard | ||
| name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-" }} | ||
| namespace: {{ include "pyroscope-mixin.namespace" $ }} | ||
| data: | ||
|
|
@@ -46,6 +32,7 @@ kind: GrafanaDashboard | |
| metadata: | ||
| labels: | ||
| {{- include "pyroscope-mixin.labels" $ | indent 4 }} | ||
| app.kubernetes.io/component: dashboard | ||
| name: {{ printf "%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }} | ||
| namespace: {{ $.Release.Namespace }} | ||
| spec: | ||
|
|
||
Oops, something went wrong.