Skip to content

Commit

Permalink
chore: values cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Bruno Bressi <[email protected]>
  • Loading branch information
puffitos committed May 27, 2024
1 parent 42686f7 commit 0fc6c4a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ available config parameters:
| `kube-prometheus-stack.grafana."grafana.ini".analytics.check_for_updates` | bool | `false` | |
| `kube-prometheus-stack.grafana."grafana.ini".auth.disable_login_form` | bool | `false` | |
| `kube-prometheus-stack.grafana."grafana.ini".log.level` | string | `"info"` | |
| `kube-prometheus-stack.grafana."grafana.ini".security.allow_embedding` | bool | `true` | |
| `kube-prometheus-stack.grafana."grafana.ini".security.allow_embedding` | bool | `true` | Required to embed dashboards in Rancher Cluster Overview Dashboard on Cluster Explorer |
| `kube-prometheus-stack.grafana."grafana.ini".users.auto_assign_org_role` | string | `"Viewer"` | |
| `kube-prometheus-stack.grafana.adminPassword` | string | `"prom-operator"` | |
| `kube-prometheus-stack.grafana.containerSecurityContext.allowPrivilegeEscalation` | bool | `false` | |
Expand Down
17 changes: 7 additions & 10 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ global:
imageRegistry: mtr.devops.telekom.de

kube-prometheus-stack:
# full set of values and pre-defined for caas
# ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
## Provide custom recording or alerting rules to be deployed into the cluster.
## -- Provide custom recording or alerting rules to be deployed into the cluster.
# -- Full set of values and pre-defined for caas
# -- ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
##
alertmanager:
alertmanagerSpec:
Expand Down Expand Up @@ -151,11 +151,8 @@ kube-prometheus-stack:
enabled: true
crds:
enabled: false
#commonLabels:
# field.cattle.io/projectId: *projectId

## Create default rules for monitoring the cluster
##
## -- Default rules for monitoring the cluster
defaultRules:
appNamespacesTarget: ".*"
create: true
Expand Down Expand Up @@ -277,7 +274,7 @@ kube-prometheus-stack:
log:
level: info
security:
# Required to embed dashboards in Rancher Cluster Overview Dashboard on Cluster Explorer
# -- Required to embed dashboards in Rancher Cluster Overview Dashboard on Cluster Explorer
allow_embedding: true
users:
auto_assign_org_role: Viewer
Expand Down Expand Up @@ -671,9 +668,9 @@ kube-prometheus-stack:
repository: kubeprometheusstack/prometheus-config-reloader
thanosRuler:
enabled: false

# refer to Rancher specific things,holding as sub charts in https://github.com/rancher/charts/tree/release-v2.7/charts/rancher-monitoring/102.0.2%2Bup40.1.2/charts
# try to adapt from kps components, or copy the sub chart content here

rkeControllerManager:
clients:
https:
Expand Down Expand Up @@ -786,4 +783,4 @@ hardenedKubelet:
enabled: false
metricsPort: 10250
clients:
useLocalhost: true
useLocalhost: true

0 comments on commit 0fc6c4a

Please sign in to comment.