Skip to content

Commit 5a93ece

Browse files
authored
Merge pull request #210 from cloudogu/feature/ingress-monitoring
Add monitoring for ingress-nginx
2 parents 0d8e0de + ced425d commit 5a93ece

File tree

10 files changed

+4239
-19
lines changed

10 files changed

+4239
-19
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,12 @@ The user on the scm has to have privileges to:
844844

845845
Set the parameter `--monitoring` so the [kube-prometheus-stack](https://github.com/prometheus-operator/kube-prometheus)
846846
via its [helm-chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
847-
is being deployed including Argo CD dashboards.
847+
is being deployed including dashboards for
848+
- ArgoCD
849+
- Ingress Nginx Controller
850+
- Prometheus
851+
- SCMManager
852+
- Jenkins.
848853

849854
This leads to the following tools to be exposed:
850855

applications/cluster-resources/ingress-nginx-helm-values.ftl.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,11 @@ controller:
3737
#force-ssl-redirect: "true"
3838
# customize access log format to include requested hostname ($host)
3939
# https://github.com/kubernetes/ingress-nginx/blob/controller-v1.2.1/docs/user-guide/nginx-configuration/log-format.md
40-
log-format-upstream: '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" "$host" $request_length $request_time [$proxy_upstream_name] [$proxy_alternative_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status $req_id'
40+
log-format-upstream: '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" "$host" $request_length $request_time [$proxy_upstream_name] [$proxy_alternative_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status $req_id'
41+
<#if monitoring.active == true>
42+
metrics:
43+
enabled: true
44+
serviceMonitor:
45+
enabled: true
46+
namespace: ${namePrefix}monitoring
47+
</#if>

0 commit comments

Comments
 (0)