Skip to content

Commit

Permalink
rework rbac for grafana and add namespace question
Browse files Browse the repository at this point in the history
  • Loading branch information
eumel8 committed May 11, 2023
1 parent 0bfe9a7 commit a80a7e9
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ annotations:
catalog.cattle.io/certified: rancher
name: caas-project-monitoring
description: A Helm chart for Rancher Project Monitoring V3
version: 0.0.19
version: 0.0.20
appVersion: "40.1.2"
icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
keywords:
Expand Down
5 changes: 5 additions & 0 deletions questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ questions:
group: "Grafana"
show_subquestion_if: false
subquestions:
- variable: kube-prometheus-stack.grafana.sidecar.datasources.searchNamespace
description: "A comma separated list of namespaces to view"
type: string
label: Grafana view namespaces (by comma)
group: "Grafana"
- variable: kube-prometheus-stack.grafana.image.repository
description: "Repository of Grafana Image"
type: string
Expand Down
9 changes: 9 additions & 0 deletions templates/caas-project-monitoring-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- configmaps
- secrets
verbs:
- get
- watch
- list
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down
9 changes: 7 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,12 @@ kube-prometheus-stack:
supplementalGroups:
- 472
rbac:
create: false
pspEnabled: false
namespaced: true
serviceAccount:
create: false
name: project-monitoring
resources:
limits:
memory: 600Mi
Expand Down Expand Up @@ -308,11 +312,12 @@ kube-prometheus-stack:
provider:
allowUiUpdates: false
datasources:
enabled: true
defaultDatasourceEnabled: true
createPrometheusReplicasDatasources: false
defaultDatasourceEnabled: true
enabled: true
label: grafana_datasource
labelValue: "1"
searchNamespace: ""
serviceMonitor:
enabled: true
path: "/metrics"
Expand Down

0 comments on commit a80a7e9

Please sign in to comment.