Public/grafana-meta-monitoring-chart
2
0
Fork 0
forked from RemoteSync/grafana-meta-monitoring-chart
Code Pull Requests Activity

Compare commits

merge into: Public:update_grafana
Branches Tags
Public:main Public:modified Public:chore/update-dependencies Public:chore/update-minio Public:slim-bean-patch-1 Public:update-metrics-port Public:add_loki_team_to_prs Public:test_branch Public:update_version Public:update_main_page Public:cleanup_ci Public:add_ci_install Public:add_ksm_docs Public:fix_cluster_name Public:fix_dashboards Public:fix_loki_write_endpoint Public:fix_traces_forwarding Public:change_default_sampling_type Public:update_ingress_documentation Public:create_new_version Public:add_more_metrics Public:fix_rules Public:remove_rules_files_mimir_tempo Public:split_up_grafana_template Public:remove_redundant_variables Public:fix_dependency_check Public:chore/update-tempo-distributed Public:fix_alloy_config_for_traces Public:fix_minio_secret_name Public:combine_ci Public:update_grafana Public:chore/update-loki Public:use_secret_for_minio Public:set_step_time_to_1_minute_in_dashboards Public:add_extra_metrics Public:more_dashboard_cleanup Public:remove_non_loki_dashboards Public:open_extra_ports_for_otlp Public:get_logs_from_all_namespaces Public:fix_correct_version Public:fix_logic_for_secrets Public:use_updated_dashboards2 Public:filter_cadvisor_kubelet_metrics_on_namespace Public:add_creation_of_dashboard Public:more_docs_fixes Public:add_more_docs Public:update_installation_instructions Public:fix_release_flow Public:add_ci_to_release_helm_chart Public:remove_reviewers Public:chore/update-grafana-alloy Public:chore/update-mimir-distributed Public:fix_action Public:add_helm_chart_updater Public:add_agent_metrics Public:filter_out_errors_local_loki Public:filter_log_lines Public:filter_only_important_log_lines Public:remove_helm_test_step Public:add_create_kind_cluster_to_ci Public:add_lint_to_ci Public:add_ci Public:add_skip_cdrs_to_installation_step Public:add_retention Public:fix_tempo_dashboards Public:fix_mimir_dashboards Public:add_agent_dashboards Public:add_ruler Public:add_tempo_dashboards.yaml Public:add_scraping_of_cadvisor Public:add_mimir_dashboards Public:use_loki_ssd_dashboards Public:add_kube_state_metrics_scraping Public:add_regexes_to_filter_log_lines Public:add_validation Public:enable_dbs_individually Public:add_minio
Public:v1.3.0 Public:v1.2.0 Public:v1.1.0 Public:v1.0.0 Public:v0.0.3 Public:v0.0.2 Public:v0.0.1
...
pull from: Public:chore/update-tempo-distributed
Branches Tags
Public:modified Public:chore/update-dependencies Public:main Public:chore/update-minio Public:slim-bean-patch-1 Public:update-metrics-port Public:add_loki_team_to_prs Public:test_branch Public:update_version Public:update_main_page Public:cleanup_ci Public:add_ci_install Public:add_ksm_docs Public:fix_cluster_name Public:fix_dashboards Public:fix_loki_write_endpoint Public:fix_traces_forwarding Public:change_default_sampling_type Public:update_ingress_documentation Public:create_new_version Public:add_more_metrics Public:fix_rules Public:remove_rules_files_mimir_tempo Public:split_up_grafana_template Public:remove_redundant_variables Public:fix_dependency_check Public:chore/update-tempo-distributed Public:fix_alloy_config_for_traces Public:fix_minio_secret_name Public:combine_ci Public:update_grafana Public:chore/update-loki Public:use_secret_for_minio Public:set_step_time_to_1_minute_in_dashboards Public:add_extra_metrics Public:more_dashboard_cleanup Public:remove_non_loki_dashboards Public:open_extra_ports_for_otlp Public:get_logs_from_all_namespaces Public:fix_correct_version Public:fix_logic_for_secrets Public:use_updated_dashboards2 Public:filter_cadvisor_kubelet_metrics_on_namespace Public:add_creation_of_dashboard Public:more_docs_fixes Public:add_more_docs Public:update_installation_instructions Public:fix_release_flow Public:add_ci_to_release_helm_chart Public:remove_reviewers Public:chore/update-grafana-alloy Public:chore/update-mimir-distributed Public:fix_action Public:add_helm_chart_updater Public:add_agent_metrics Public:filter_out_errors_local_loki Public:filter_log_lines Public:filter_only_important_log_lines Public:remove_helm_test_step Public:add_create_kind_cluster_to_ci Public:add_lint_to_ci Public:add_ci Public:add_skip_cdrs_to_installation_step Public:add_retention Public:fix_tempo_dashboards Public:fix_mimir_dashboards Public:add_agent_dashboards Public:add_ruler Public:add_tempo_dashboards.yaml Public:add_scraping_of_cadvisor Public:add_mimir_dashboards Public:use_loki_ssd_dashboards Public:add_kube_state_metrics_scraping Public:add_regexes_to_filter_log_lines Public:add_validation Public:enable_dbs_individually Public:add_minio
Public:v1.3.0 Public:v1.2.0 Public:v1.1.0 Public:v1.0.0 Public:v0.0.3 Public:v0.0.2 Public:v0.0.1

13 Commits
update_gra ... chore/upda

Author SHA1 Message Date
MichelHollands
7e38d19814 Update Tempo Distributed 2024-05-08 07:03:26 +00:00
Michel Hollands
3879207e05 Merge pull request #101 from grafana/fix_minio_secret_name 
Fix secret name
 2024-05-07 14:40:52 +01:00
Michel Hollands
cd42da2197 Fix secret name 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-07 14:39:20 +01:00
Michel Hollands
56cab04af8 Merge pull request #92 from grafana/use_secret_for_minio 
Use a secret for the Minio access
 2024-05-07 12:37:07 +01:00
Michel Hollands
b99140d3f4 Merge pull request #97 from grafana/chore/update-tempo-distributed 
[dependency] Update the Tempo Distributed subchart
 2024-05-07 11:00:53 +01:00
MichelHollands
749e271455 Update Tempo Distributed 2024-05-07 09:22:20 +00:00
Michel Hollands
de91b4dac7 Merge pull request #96 from grafana/chore/update-tempo-distributed 
[dependency] Update the Tempo Distributed subchart
 2024-05-07 09:22:43 +01:00
MichelHollands
9f6e52d7a1 Update Tempo Distributed 2024-05-07 08:22:14 +00:00
Michel Hollands
ab42a96949 Update installation instructions 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-06 16:29:33 +01:00
Michel Hollands
386ff25fca Use the secret in the ruler for the dashboards 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-06 16:18:44 +01:00
Michel Hollands
c6889131a7 Use structuredConfig correctly 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-06 16:12:48 +01:00
Michel Hollands
2739bae0c0 Use correct variables 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-03 15:40:36 +01:00
Michel Hollands
cea8076b75 Start using a secret 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2024-05-03 15:38:07 +01:00
7 changed files with 85 additions and 36 deletions
Expand all files Collapse all files

6
charts/meta-monitoring/Chart.lock
View File

@@ -10,9 +10,9 @@ dependencies:
version: 5.3.0 version: 5.3.0
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.5 version: 1.9.9
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io
version: 5.2.0 version: 5.2.0
digest: sha256:6244c08b5829d6dbd363b736e55c5182274d65191672e7aeecaf3bb62f3f34fb digest: sha256:5328702b5f6b0487aba8f7bc77d6abfcd5e094569e9205cd725971e3e31255dd
generated: "2024-05-07T07:02:47.839270709Z" generated: "2024-05-08T07:03:21.797461955Z"

2
charts/meta-monitoring/Chart.yaml
View File

@@ -33,7 +33,7 @@ dependencies:
condition: local.metrics.enabled condition: local.metrics.enabled
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.5 version: 1.9.9
condition: local.traces.enabled condition: local.traces.enabled
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io

BIN
charts/meta-monitoring/charts/tempo-distributed-1.9.5.tgz
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/tempo-distributed-1.9.9.tgz Normal file
View File

Binary file not shown.

3
charts/meta-monitoring/templates/ruler/ruler.yaml
View File

@@ -49,6 +49,9 @@ spec:
- containerPort: 7946 - containerPort: 7946
name: memberlist name: memberlist
protocol: TCP protocol: TCP
envFrom:
- secretRef:
name: minio
readinessProbe: readinessProbe:
failureThreshold: 3 failureThreshold: 3
httpGet: httpGet:

96
charts/meta-monitoring/values.yaml
View File

@@ -180,7 +180,7 @@ metrics:
# Additional metrics to retain # Additional metrics to retain
extraMetrics: [] extraMetrics: []
# Set enabled = true to add the default logs/metrics/traces dashboards to the local Grafana # Set enabled = true to add the default logs dashboards to the local Grafana
dashboards: dashboards:
logs: logs:
enabled: true enabled: true
@@ -189,11 +189,6 @@ dashboards:
traces: traces:
enabled: true enabled: true
global:
minio:
rootUser: "rootuser"
rootPassword: "rootpassword"
kubeStateMetrics: kubeStateMetrics:
# Scrape https://github.com/kubernetes/kube-state-metrics by default # Scrape https://github.com/kubernetes/kube-state-metrics by default
enabled: true enabled: true
@@ -229,9 +224,9 @@ loki:
common: common:
storage: storage:
s3: s3:
access_key_id: "{{ .Values.global.minio.rootUser }}" access_key_id: "${rootUser}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}" secret_access_key: "${rootPassword}"
compactor: compactor:
retention_enabled: true retention_enabled: true
delete_request_store: s3 delete_request_store: s3
@@ -254,8 +249,24 @@ loki:
installOperator: false installOperator: false
lokiCanary: lokiCanary:
enabled: false enabled: false
test: write:
enabled: false extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
read:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
backend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
alloy: alloy:
alloy: alloy:
@@ -292,30 +303,31 @@ alloy:
mimir-distributed: mimir-distributed:
minio: minio:
enabled: false enabled: false
global:
extraEnvFrom:
- secretRef:
name: "minio"
mimir: mimir:
structuredConfig: structuredConfig:
alertmanager_storage: alertmanager_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}"
insecure: true
blocks_storage: blocks_storage:
backend: s3 backend: s3
s3: s3:
bucket_name: mimir-tsdb bucket_name: mimir-tsdb
access_key_id: "{{ .Values.global.minio.rootUser }}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "{{ .Values.global.minio.rootPassword }}"
insecure: true
ruler_storage: ruler_storage:
s3: s3:
bucket_name: mimir-ruler bucket_name: mimir-ruler
access_key_id: "{{ .Values.global.minio.rootUser }}" common:
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" storage:
secret_access_key: "{{ .Values.global.minio.rootPassword }}" backend: s3
insecure: true s3:
bucket_name: mimir-ruler
access_key_id: "${rootUser}"
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
secret_access_key: "${rootPassword}"
insecure: true
limits: limits:
compactor_blocks_retention_period: 30d compactor_blocks_retention_period: 30d
@@ -328,12 +340,39 @@ tempo-distributed:
s3: s3:
bucket: tempo bucket: tempo
endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
access_key: "{{ .Values.global.minio.rootUser }}" access_key: "${rootUser}"
secret_key: "{{ .Values.global.minio.rootPassword }}" secret_key: "${rootPassword}"
insecure: true insecure: true
compactor: distributor:
compaction: extraArgs:
block_retention: 30d - "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
ingester:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
compactor:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
querier:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
queryFrontend:
extraArgs:
- "-config.expand-env=true"
extraEnvFrom:
- secretRef:
name: "minio"
traces: traces:
otlp: otlp:
http: http:
@@ -342,8 +381,7 @@ tempo-distributed:
enabled: true enabled: true
minio: minio:
rootUser: rootuser existingSecret: "minio"
rootPassword: rootpassword
buckets: buckets:
- name: loki-chunks - name: loki-chunks
policy: none policy: none

14
docs/installation.md
View File

@@ -25,17 +25,17 @@
``` ```
kubectl create secret generic logs -n meta \ kubectl create secret generic logs -n meta \
--from-literal=username=<logs username> \ --from-literal=username=<logs username> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push' --from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push'
kubectl create secret generic metrics -n meta \ kubectl create secret generic metrics -n meta \
--from-literal=username=<metrics username> \ --from-literal=username=<metrics username> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push' --from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push'
kubectl create secret generic traces -n meta \ kubectl create secret generic traces -n meta \
--from-literal=username=<OTLP instance ID> \ --from-literal=username=<OTLP instance ID> \
--from-literal=password=<token> --from-literal=password=<token> \
--from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp' --from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp'
``` ```
@@ -67,6 +67,14 @@
kubectl create namespace meta kubectl create namespace meta
``` ```
1. Create a secret named `minio` with the user and password for the local Minio:
```
kubectl create secret generic minio -n meta \
--from-literal=rootPassword=<password> \
--from-literal=rootUser=<user>
```
1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this: 1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this:
``` ```