From 8d6283e698caf8f450cfbf701070e5c7c008ec7d Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 23 Nov 2022 14:55:57 +0100
Subject: [PATCH] fix(monitoring): Fix query-exposer parameter escaping
Since in the Kubernetes manifest the args are already escaped
quoting a string will just send the quotes to the application,
with the result that they cause problems, e.g. when suddenly
starting to query a string, instead of valid promql grammar as
happening here.
---
clusters/k8s01/monitoring/query-exposer.yaml | 27 ++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/clusters/k8s01/monitoring/query-exposer.yaml b/clusters/k8s01/monitoring/query-exposer.yaml
index b02b46d2d..737d161a7 100644
--- a/clusters/k8s01/monitoring/query-exposer.yaml
+++ b/clusters/k8s01/monitoring/query-exposer.yaml
@@ -28,7 +28,8 @@ spec:
args:
- -h
- http://kube-prometheus-stack-prometheus:9090
- - -q='query_exposer_alerts'
+ - -q
+ - query_exposer_alerts
resources:
requests:
cpu: 15m
@@ -45,8 +46,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
@@ -114,8 +115,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
@@ -190,8 +191,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
@@ -255,8 +256,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
@@ -324,8 +325,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
@@ -390,8 +391,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2022-11-23T13:41:11Z"
- mac: ENC[AES256_GCM,data:kmXonuhelddmdHgsoQ/MibVP4TKX22XwkZoCITgiyRPGGun9pmeNsIzfS+WPgXhvAw69ilYPyC5xoRmmTnVzIP0n2Lft7+1JPwatYtLGBUXRQP4DIL2Z9Qrky3h4ngkY+gu1eI+nCWSJnVh2gfv5ZTZ8bbwUHh05+4emUaLFTDA=,iv:ivItNUrzWkqEQbH+ZlV8i35LBpyc1ntBjYWRO+43zN8=,tag:2ePFGihY33oCDcC2XHVbsg==,type:str]
+ lastmodified: "2022-11-23T13:55:49Z"
+ mac: ENC[AES256_GCM,data:/jUTpRa7N68KX2f85AyqD4F7BgD+qJXC2HxX2wov91cBRfv+mMeoy8gENlzWSnOGkJ0b0qS7+VnGHUAiR2JmFXFB2o3WDIUBjO8zsQOk3vonMKcxULcoAm5TizdwhUGcV3h4FqBDA6+kiuuWSxDD4LbbMgLVvxMvJHu077ucjvA=,iv:y5/FLEFJgI+RmhAUZxUE3gF9jflbnMOW0GgdtVSZi9U=,tag:Xsnb7DZ5KH283LkhMBI5BA==,type:str]
pgp:
- created_at: "2022-11-23T03:44:38Z"
enc: |-
--
GitLab