Skip to content

Fix: Varia, Cleanup #911

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

Merged
merged 20 commits into from
Jan 3, 2025
Merged

Fix: Varia, Cleanup #911

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
c9c70d6
Arch Linux Certificates Customization
mrnicegyu11 Dec 3, 2024
7b8be53
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 5, 2024
bcd61cd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 12, 2024
58e1030
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 13, 2024
bc45907
Add up-local makefile target for simcore stack
mrnicegyu11 Dec 13, 2024
0a809cb
Remove unused docker config file in monitoring stack
mrnicegyu11 Dec 13, 2024
9149de6
Remove unused env-var - grafana
mrnicegyu11 Dec 13, 2024
e8e370c
Use up-local makefile target for local simcore in deploy_everything_l…
mrnicegyu11 Dec 13, 2024
43f7479
revert arch changes
mrnicegyu11 Dec 13, 2024
c8397fe
Refactor j2 calling convention, always pass .env file path explicitly
mrnicegyu11 Dec 18, 2024
fc41673
Merge branch 'main' into 2024/variaCleanup
mrnicegyu11 Jan 3, 2025
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 scripts/common.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ venv: $(REPO_BASE_DIR)/.venv/bin/activate ## Creates a python virtual environmen
ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)

define jinja
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) $(2) -o $(3) --customize j2cli_customization.py
endef

else

define jinja
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2)
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) $(2) -o $(3)
endef

endif
Expand Down
5 changes: 4 additions & 1 deletion scripts/deployments/deploy_everything_locally.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,5 +254,8 @@ if [ "$start_opsstack" -eq 0 ]; then
fi
if [ "$start_simcore" -eq 0 ]; then
log_info "starting simcore..."
"${repo_basedir}"/scripts/deployments/start_simcore_locally.bash
service_dir="${repo_basedir}"/services/simcore
pushd "${service_dir}"
call_make "." up-"$stack_target"
popd
fi
2 changes: 1 addition & 1 deletion services/maintenance-page/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ up-master: up

.PHONY: docker-compose.yml
docker-compose.yml: .venv .env
@$(call jinja, docker-compose.yml.j2, docker-compose.yml.unlinted) && \
@$(call jinja, docker-compose.yml.j2, .env, docker-compose.yml.unlinted) && \
$(_yq) docker-compose.yml.unlinted > docker-compose.yml; \
rm docker-compose.yml.unlinted >/dev/null 2>&1;

Expand Down
10 changes: 5 additions & 5 deletions services/monitoring/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.letsencrypt.dns.yml con
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@

docker-compose.yml: docker-compose.yml.j2 .env .venv pgsql_query_exporter_config.yaml
$(call jinja,$<,$@)
$(call jinja,$<,.env,$@)

.PHONY: update.grafana.pwd
update.grafana.pwd: .env ## Change grafana pwd
Expand All @@ -101,7 +101,7 @@ grafana-import: grafana/assets .venv ## Imports AND OVERWRITES the remote grafan

.PHONY: config.grafana.dashboards
config.grafana.dashboards: grafana/templates-provisioning/dashboards/simcore/Metrics-dashboard.json.j2 .venv #Configure dashboards for aws or dalco clusters
$(call jinja, $<, grafana/provisioning/dashboards/simcore/Metrics-dashboard.json)
$(call jinja, $<, .env, grafana/provisioning/dashboards/simcore/Metrics-dashboard.json)

.PHONY: config.monitoring
config.monitoring: grafana/template-config.monitoring ${REPO_CONFIG_LOCATION}
Expand Down Expand Up @@ -133,7 +133,7 @@ config.prometheus.ceph.simcore: ${REPO_CONFIG_LOCATION} .venv
@set -o allexport; \
source $<; \
set +o allexport; \
$(call jinja, prometheus/prometheus-ceph.yml.j2, prometheus/prometheus-ceph.yml); \
$(call jinja, prometheus/prometheus-ceph.yml.j2, .env, prometheus/prometheus-ceph.yml); \
cat prometheus/prometheus-base.yml | $(_yq) '. *+ load("prometheus/prometheus-simcore.yml")' | cat | \
$(_yq) '. *+ load("prometheus/prometheus-ceph.yml")' > prometheus/prometheus.yml; \
envsubst < prometheus/prometheus.yml > prometheus/prometheus.temp.yml; \
Expand All @@ -148,10 +148,10 @@ config.prometheus: ${REPO_CONFIG_LOCATION} .venv
mv prometheus/prometheus.temp.yml prometheus/prometheus.yml

pgsql_query_exporter_config.yaml: pgsql_query_exporter_config.yaml.j2 ${REPO_CONFIG_LOCATION} .env .venv
$(call jinja, $<, $@);
$(call jinja, $<, .env, $@);

smokeping_prober_config.yaml: smokeping_prober_config.yaml.j2 ${REPO_CONFIG_LOCATION} .env .venv
$(call jinja, $<, $@);
$(call jinja, $<, .env, $@);

.PHONY: grafana/assets
grafana/assets: ${REPO_CONFIG_LOCATION}
Expand Down
4 changes: 1 addition & 3 deletions services/monitoring/docker-compose.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ configs:
file: ./prometheus/prometheus-federation.yml
prometheus_rules:
file: ./prometheus/prometheus.rules.yml
grafana_image_renderer_config:
file: ./grafana-image-renderer/config.json
pgsql_query_exporter_config:
file: ./pgsql_query_exporter_config.yaml
smokeping_prober_config:
Expand Down Expand Up @@ -249,7 +247,7 @@ services:
cpus: "0.1"

grafana:
image: grafana/grafana-oss:11.1.3
image: grafana/grafana-oss:11.2.4
volumes:
- grafana_data:/var/lib/grafana
env_file:
Expand Down
7 changes: 0 additions & 7 deletions services/monitoring/grafana-image-renderer/README.md
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions services/monitoring/grafana-image-renderer/config.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions services/monitoring/grafana/template-config.monitoring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ GF_SECURITY_ADMIN_USER=${SERVICES_USER}
GF_USERS_ALLOW_SIGN_UP=false
GF_SERVER_ROOT_URL=https://${MONITORING_DOMAIN}/grafana
GF_INSTALL_PLUGINS=grafana-piechart-panel, grafana-worldmap-panel, grafana-polystat-panel
# NOTE: grafana image rendering plugin: https://grafana.com/blog/2020/05/07/grafana-7.0-preview-new-image-renderer-plugin-to-replace-phantomjs/
GF_RENDERING_SERVER_URL=http://grafana-image-renderer:8081/render
GF_RENDERING_CALLBACK_URL=http://grafana:3000/
GF_LOG_FILTERS=rendering:debug
GF_SERVER_DOMAIN=${MONITORING_DOMAIN}
Expand Down
2 changes: 1 addition & 1 deletion services/redis-commander/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ ${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.d

config.json: config.json.j2 .env .venv
# generate $@
@$(call jinja, $<, $@)
@$(call jinja, $<, .env, $@)
# validate and format $@
@cat $@ | jq > /dev/null
2 changes: 1 addition & 1 deletion services/registry/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ up-public: up-dalco
# Helpers -------------------------------------------------

docker-compose.yml: docker-compose.yml.j2 .venv .env
@$(call jinja, $<, $@)
@$(call jinja, $<, .env, $@)

.PHONY: ${TEMP_COMPOSE}-local
${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.self-signed.yml .env
Expand Down
4 changes: 4 additions & 0 deletions services/simcore/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ REPO_BASE_DIR := $(shell git rev-parse --show-toplevel)
# TARGETS --------------------------------------------------
include ${REPO_BASE_DIR}/scripts/common.Makefile

.PHONY: up-local
up-local:
@${REPO_BASE_DIR}/scripts/deployments/start_simcore_locally.bash

.PHONY: compose-local
compose-local: .env ${TEMP_COMPOSE}-local ## Create docker-compose.deploy for local deployment

Expand Down
4 changes: 2 additions & 2 deletions services/traefik/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ ${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml .env

.PHONY: docker-compose.letsencrypt.dns.yml
docker-compose.letsencrypt.dns.yml: .venv .env
@$(call jinja, docker-compose.letsencrypt.dns.yml.j2, docker-compose.letsencrypt.dns.yml.unlinted) && \
@$(call jinja, docker-compose.letsencrypt.dns.yml.j2, .env, docker-compose.letsencrypt.dns.yml.unlinted) && \
$(_yq) docker-compose.letsencrypt.dns.yml.unlinted > docker-compose.letsencrypt.dns.yml; \
rm docker-compose.letsencrypt.dns.yml.unlinted >/dev/null 2>&1;

.PHONY: docker-compose.yml
docker-compose.yml: traefik_dynamic_config.yml .venv .env
@$(call jinja, docker-compose.yml.j2, docker-compose.yml.unlinted) && \
@$(call jinja, docker-compose.yml.j2, .env, docker-compose.yml.unlinted) && \
$(_yq) docker-compose.yml.unlinted > docker-compose.yml; \
rm docker-compose.yml.unlinted >/dev/null 2>&1;

Expand Down
2 changes: 1 addition & 1 deletion services/vendors/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ up-local: up

.PHONY: docker-compose.yml
docker-compose.yml: .venv .env
@$(call jinja, docker-compose.yml.j2, docker-compose.yml.unlinted) && \
@$(call jinja, docker-compose.yml.j2, .env, docker-compose.yml.unlinted) && \
$(_yq) docker-compose.yml.unlinted > docker-compose.yml; \
rm docker-compose.yml.unlinted >/dev/null 2>&1;

Expand Down
Loading