File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
1313
1414# Helpers --------------------------------------------------
1515define custom-jinja
16- @.venv/bin/j2 --format=json $(1 ) $(2 ) -o $(3 )
16+ @${REPO_BASE_DIR}/ .venv/bin/j2 --format=json $(1 ) $(2 ) -o $(3 )
1717endef
1818
1919.PHONY : .data.json
Original file line number Diff line number Diff line change @@ -92,13 +92,9 @@ ${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml
9292
9393
9494.PHONY : configure
95- configure : .env # # Test is Graylog is online and configure Graylog inputs
95+ configure : .env .venv # # Test is Graylog is online and configure Graylog inputs
9696 @cd scripts; \
97- if [ ! -d " .venv" ]; \
98- then\
99- python3 -m venv .venv; \
100- fi ; \
101- source .venv/bin/activate; \
97+ source ${REPO_BASE_DIR} /.venv/bin/activate; \
10298 pip install -r requirements.txt > /dev/null 2>&1 ; \
10399 set -o allexport; \
104100 source ../$< ; \
Original file line number Diff line number Diff line change @@ -86,24 +86,16 @@ update.grafana.pwd: .env ## Change grafana pwd
8686
8787
8888.PHONY : grafana-export
89- grafana-export : # # Export the remote grafana dashboards and datasources TO YOUR LOCAL MACHINE
89+ grafana-export : .venv # # Export the remote grafana dashboards and datasources TO YOUR LOCAL MACHINE
9090 @cd grafana/scripts; \
91- if [ ! -d " .venv" ]; \
92- then\
93- python3 -m venv .venv; \
94- fi ; \
95- source .venv/bin/activate; \
91+ source ${REPO_BASE_DIR} /.venv/bin/activate; \
9692 pip install -r requirements.txt > /dev/null 2>&1 ; \
9793 python3 export.py;
9894
9995.PHONY : grafana-import
100- grafana-import : grafana/assets # # Imports AND OVERWRITES the remote grafana dashboards and datasources FROM YOUR LOCAL MACHINE
96+ grafana-import : grafana/assets .venv # # Imports AND OVERWRITES the remote grafana dashboards and datasources FROM YOUR LOCAL MACHINE
10197 @cd grafana/scripts; \
102- if [ ! -d " .venv" ]; \
103- then\
104- python3 -m venv .venv; \
105- fi ; \
106- source .venv/bin/activate; \
98+ source ${REPO_BASE_DIR} /.venv/bin/activate; \
10799 pip install -r requirements.txt > /dev/null 2>&1 ; \
108100 python3 import.py
109101
You can’t perform that action at this time.
0 commit comments