+1 -1

Makefile

reviewed

··· 35 35 --exclude infra/*/secrets.yaml \ 36 36 . 37 37 terragrunt hcl format 38 38 - tofu fmt -recursive 38 38 + cd infra/.modules && tofu fmt -recursive 39 39 cd controller && go fmt ./... 40 40 cd infra/.modules/tfstate && go fmt ./... 41 41 cd test && go fmt ./...

+12 -12

infra/.modules/bootstrap/istio.tf

reviewed

··· 152 152 # From https://github.com/istio/istio/blob/master/samples/addons/extras/prometheus-operator.yaml 153 153 component-monitor = { 154 154 apiVersion = "monitoring.coreos.com/v1" 155 155 - kind = "ServiceMonitor" 155 155 + kind = "ServiceMonitor" 156 156 spec = { 157 157 spec = { 158 158 endpoints = [ 159 159 { 160 160 interval = "15s" 161 161 - port = "http-monitoring" 161 161 + port = "http-monitoring" 162 162 }, 163 163 ] 164 164 jobLabel = "istio" ··· 168 168 selector = { 169 169 matchExpressions = [ 170 170 { 171 171 - key = "istio" 171 171 + key = "istio" 172 172 operator = "In" 173 173 values = [ 174 174 "pilot", ··· 184 184 } 185 185 envoy-stats-monitor = { 186 186 apiVersion = "monitoring.coreos.com/v1" 187 187 - kind = "PodMonitor" 187 187 + kind = "PodMonitor" 188 188 spec = { 189 189 spec = { 190 190 jobLabel = "envoy-stats" ··· 194 194 podMetricsEndpoints = [ 195 195 { 196 196 interval = "15s" 197 197 - path = "/stats/prometheus" 197 197 + path = "/stats/prometheus" 198 198 relabelings = [ 199 199 { 200 200 action = "keep" 201 201 - regex = "istio-proxy" 201 201 + regex = "istio-proxy" 202 202 sourceLabels = [ 203 203 "__meta_kubernetes_pod_container_name", 204 204 ] ··· 210 210 ] 211 211 }, 212 212 { 213 213 - action = "replace" 214 214 - regex = "(\\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})" 213 213 + action = "replace" 214 214 + regex = "(\\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})" 215 215 replacement = "[$2]:$1" 216 216 sourceLabels = [ 217 217 "__meta_kubernetes_pod_annotation_prometheus_io_port", ··· 220 220 targetLabel = "__address__" 221 221 }, 222 222 { 223 223 - action = "replace" 224 224 - regex = "(\\d+);((([0-9]+?)(\\.|$)){4})" 223 223 + action = "replace" 224 224 + regex = "(\\d+);((([0-9]+?)(\\.|$)){4})" 225 225 replacement = "$2:$1" 226 226 sourceLabels = [ 227 227 "__meta_kubernetes_pod_annotation_prometheus_io_port", ··· 231 231 }, 232 232 { 233 233 action = "labeldrop" 234 234 - regex = "__meta_kubernetes_pod_label_(.+)" 234 234 + regex = "__meta_kubernetes_pod_label_(.+)" 235 235 }, 236 236 { 237 237 action = "replace" ··· 253 253 selector = { 254 254 matchExpressions = [ 255 255 { 256 256 - key = "istio-prometheus-ignore" 256 256 + key = "istio-prometheus-ignore" 257 257 operator = "DoesNotExist" 258 258 }, 259 259 ]