Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade built-tools Prometheus and Grafana #2618

Merged
merged 2 commits into from
Jun 9, 2022
Merged

Upgrade built-tools Prometheus and Grafana #2618

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f05225
Upgrade built-tools Prometheus and Grafana
markmandel Jun 8, 2022
9fbf0a2
Merge branch 'main' into cleanup/upgrade-prom-graf
markmandel Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ setup-prometheus: SCRAPE_INTERVAL=30s
setup-prometheus:
$(DOCKER_RUN) helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
$(DOCKER_RUN) helm repo update
$(DOCKER_RUN) helm upgrade prom prometheus-community/prometheus --install --wait --version 11.16.2 \
$(DOCKER_RUN) helm upgrade prom prometheus-community/prometheus --install --wait --version 15.9.2 \
--namespace metrics --create-namespace \
--set server.global.scrape_interval=$(SCRAPE_INTERVAL),server.persistentVolume.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \
$(HELM_ARGS) -f $(mount_path)/build/prometheus.yaml
Expand All @@ -665,7 +665,7 @@ setup-grafana:
$(DOCKER_RUN) helm repo add grafana https://grafana.github.io/helm-charts
$(DOCKER_RUN) helm repo update
$(DOCKER_RUN) kubectl apply -f $(mount_path)/build/grafana/
$(DOCKER_RUN) helm upgrade grafana grafana/grafana --install --wait --version=5.7.10 \
$(DOCKER_RUN) helm upgrade grafana grafana/grafana --install --wait --version=6.29.6 \
--namespace metrics --create-namespace \
--set persistence.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \
--set adminPassword=$(PASSWORD) $(HELM_ARGS) -f $(mount_path)/build/grafana.yaml
Expand Down