Skip to content

Commit

Permalink
Merge pull request #99 from grafana/chore/update-minio
Browse files Browse the repository at this point in the history
[dependency] Update the Grafana version
  • Loading branch information
MichelHollands authored May 8, 2024
2 parents 95257b6 + 2de595b commit 28daa27
Showing 1 changed file with 9 additions and 25 deletions.
34 changes: 9 additions & 25 deletions charts/meta-monitoring/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ namespacesToMonitor:
- loki
# The name of the cluster where this will be installed
clusterLabelValue: "meta-monitoring"

# Set to true to write logs, metrics or traces to Grafana Cloud
# The secrets have to be created first
cloud:
Expand All @@ -16,7 +15,6 @@ cloud:
traces:
enabled: true
secret: "traces"

# Set to true for a local version of logs, metrics or traces
local:
grafana:
Expand All @@ -28,20 +26,19 @@ local:
traces:
enabled: false
minio:
enabled: false # This should be set to true if any of the previous is enabled

enabled: false # This should be set to true if any of the previous is enabled
grafana:
version: 10.0.0
version: 10.4.2
# Gateway ingress configuration
ingress:
# -- Specifies whether an ingress for the gateway should be created
enabled: true
# -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18
ingressClassName: ""
# -- Annotations for the gateway ingress
annotations: { }
annotations: {}
# -- Labels for the gateway ingress
labels: { }
labels: {}
# -- Hosts configuration for the gateway ingress, passed through the `tpl` function to allow templating
hosts:
- host: monitoring.example.com
Expand All @@ -54,18 +51,14 @@ grafana:
# - secretName: grafana-tls
# hosts:
# - monitoring.example.com


logs:
# Adding regexes here will add a stage.replace block for logs. For more information see
# https://grafana.com/docs/agent/latest/flow/reference/components/loki.process/#stagereplace-block
piiRegexes:
# This example replaces the word after password with *****
# - expression: "password (\\\\S+)"
# source: "" # Empty uses the log message
# replace: "*****""

# The lines matching these will be kept in Loki
piiRegexes: null # This example replaces the word after password with *****
# - expression: "password (\\\\S+)"
# source: "" # Empty uses the log message
# replace: "*****""
# The lines matching these will be kept in Loki
retain:
# This shows the queries
- caller=metrics.go
Expand All @@ -79,7 +72,6 @@ logs:
# - caller=push.go
# Additional log lines to retain
extraLogs: []

metrics:
# The list of metrics to retain for logging dashboards
retain:
Expand Down Expand Up @@ -180,7 +172,6 @@ metrics:
- promtail_custom_bad_words_total
# Additional metrics to retain
extraMetrics: []

# Set enabled = true to add the default logs dashboards to the local Grafana
dashboards:
logs:
Expand All @@ -189,18 +180,15 @@ dashboards:
enabled: true
traces:
enabled: true

kubeStateMetrics:
# Scrape https://github.com/kubernetes/kube-state-metrics by default
enabled: true
# This endpoint is created when the helm chart from
# https://artifacthub.io/packages/helm/prometheus-community/kube-state-metrics/
# is used. Change this if kube-state-metrics is installed somewhere else.
endpoint: kube-state-metrics.kube-state-metrics.svc.cluster.local:8080

# The following are configuration for the dependencies.
# These should usually not be changed.

loki:
loki:
auth_enabled: false
Expand Down Expand Up @@ -268,7 +256,6 @@ loki:
extraEnvFrom:
- secretRef:
name: "minio"

alloy:
alloy:
clustering:
Expand Down Expand Up @@ -300,7 +287,6 @@ alloy:
maxReplicas: 30
targetMemoryUtilizationPercentage: 90
targetCPUUtilizationPercentage: 90

mimir-distributed:
minio:
enabled: false
Expand Down Expand Up @@ -331,7 +317,6 @@ mimir-distributed:
insecure: true
limits:
compactor_blocks_retention_period: 30d

tempo-distributed:
tempo:
structuredConfig:
Expand Down Expand Up @@ -380,7 +365,6 @@ tempo-distributed:
enabled: true
grpc:
enabled: true

minio:
existingSecret: "minio"
buckets:
Expand Down

0 comments on commit 28daa27

Please sign in to comment.