dani/ctctl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loki filter

Browse Source
This commit is contained in:
Daniel Berteaud 2023-08-05 22:49:15 +02:00
parent 77ad7deea5
commit 039570d4ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctctl
View File

@ -286,9 +286,9 @@ load_policies(){
kill -INT $$ kill -INT $$
fi fi
for PFILE in $(ls ./vault/policies/*.hcl 2>/dev/null); do for PFILE in $(ls ./vault/policies/*.hcl 2>/dev/null); do
PNA=$(basename ${PFILE} .hcl)$(get_conf "env_suffix") PNAME=$(basename ${PFILE} .hcl)$(get_conf "env_suffix")
echo "Loading vault policy ${PNA}" echo "Loading vault policy ${PNA}"
replace_conf_var ${PFILE} | vault policy write ${PNA} - replace_conf_var ${PFILE} | vault policy write ${PNAME} -
done done
fi fi
if [ -d "./consul/policies" ]; then if [ -d "./consul/policies" ]; then
@ -495,7 +495,7 @@ job_logs(){
${LOGCLI_CMD} $@ ${LOGCLI_CMD} $@
else else
# Exclude connect-proxy logs as it's often not wanted # Exclude connect-proxy logs as it's often not wanted
SELECTOR='{job=~"'$(get_job_list | sed 's/\s/|/')'", task!~"connect-proxy-.+|tls-proxy|metrics-proxy"}' SELECTOR='{job=~"'$(get_job_list | sed 's/\s/|/g')'", task!~"connect-proxy-.+|tls-proxy|metrics-proxy"}'
echo "Running ${LOGCLI_CMD} $@ ${SELECTOR}" echo "Running ${LOGCLI_CMD} $@ ${SELECTOR}"
${LOGCLI_CMD} $@ "${SELECTOR}" ${LOGCLI_CMD} $@ "${SELECTOR}"
fi fi