diff --git a/cluster-manifests/ingress-nginx/deployment.yaml b/cluster-manifests/ingress-nginx/deployment.yaml index 2a9e76bd..59878e25 100644 --- a/cluster-manifests/ingress-nginx/deployment.yaml +++ b/cluster-manifests/ingress-nginx/deployment.yaml @@ -273,6 +273,9 @@ spec: minReadySeconds: 0 template: metadata: + annotations: + prometheus.io/port: "10254" + prometheus.io/scrape: "true" labels: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx @@ -346,6 +349,9 @@ spec: - name: webhook containerPort: 8443 protocol: TCP + - name: metrics + containerPort: 10254 + protocol: TCP volumeMounts: - name: webhook-cert mountPath: /usr/local/certificates/ diff --git a/cluster-manifests/kube-system/container-azm-ms-agentconfig.yaml b/cluster-manifests/kube-system/container-azm-ms-agentconfig.yaml index 1b394717..6f442488 100644 --- a/cluster-manifests/kube-system/container-azm-ms-agentconfig.yaml +++ b/cluster-manifests/kube-system/container-azm-ms-agentconfig.yaml @@ -24,7 +24,7 @@ data: [prometheus_data_collection_settings.cluster] interval = "1m" monitor_kubernetes_pods = true - monitor_kubernetes_pods_namespaces = ["a0005-i", "a0005-o", "cluster-baseline-settings", "flux-system", "falco-system", "ingress-nginx", "osm-system"] + monitor_kubernetes_pods_namespaces = ["a0005-i", "a0005-o", "cluster-baseline-settings", "flux-system", "falco-system", "ingress-nginx"] [prometheus_data_collection_settings.node] interval = "1m" urls = ["http://$NODE_IP:9103/metrics"] diff --git a/cluster-stamp.json b/cluster-stamp.json index 2978ba18..42d272f1 100644 --- a/cluster-stamp.json +++ b/cluster-stamp.json @@ -885,7 +885,7 @@ "eTag": "*", "category": "Prometheus", "displayName": "Increase number of forbidden response on the Ingress Controller", - "query": "let value = toscalar(InsightsMetrics | where Namespace == \"prometheus\" and Name == \"traefik_entrypoint_requests_total\" | where parse_json(Tags).code == 403 | summarize Value = avg(Val) by bin(TimeGenerated, 5m) | summarize min = min(Value)); InsightsMetrics | where Namespace == \"prometheus\" and Name == \"traefik_entrypoint_requests_total\" | where parse_json(Tags).code == 403 | summarize AggregatedValue = avg(Val)-value by bin(TimeGenerated, 5m) | order by TimeGenerated | render barchart", + "query": "let value = toscalar(InsightsMetrics | where Namespace == \"prometheus\" and Name == \"nginx_ingress_controller_requests\" | where parse_json(Tags).status == 403 | summarize Value = avg(Val) by bin(TimeGenerated, 5m) | summarize min = min(Value)); InsightsMetrics | where Namespace == \"prometheus\" and Name == \"nginx_ingress_controller_requests\" | where parse_json(Tags).status == 403 | summarize AggregatedValue = avg(Val)-value by bin(TimeGenerated, 5m) | order by TimeGenerated | render barchart", "version": 1 } }, diff --git a/cluster-stamp.v2.json b/cluster-stamp.v2.json index 2e53932b..51cb9431 100644 --- a/cluster-stamp.v2.json +++ b/cluster-stamp.v2.json @@ -885,7 +885,7 @@ "eTag": "*", "category": "Prometheus", "displayName": "Increase number of forbidden response on the Ingress Controller", - "query": "let value = toscalar(InsightsMetrics | where Namespace == \"prometheus\" and Name == \"traefik_entrypoint_requests_total\" | where parse_json(Tags).code == 403 | summarize Value = avg(Val) by bin(TimeGenerated, 5m) | summarize min = min(Value)); InsightsMetrics | where Namespace == \"prometheus\" and Name == \"traefik_entrypoint_requests_total\" | where parse_json(Tags).code == 403 | summarize AggregatedValue = avg(Val)-value by bin(TimeGenerated, 5m) | order by TimeGenerated | render barchart", + "query": "let value = toscalar(InsightsMetrics | where Namespace == \"prometheus\" and Name == \"nginx_ingress_controller_requests\" | where parse_json(Tags).status == 403 | summarize Value = avg(Val) by bin(TimeGenerated, 5m) | summarize min = min(Value)); InsightsMetrics | where Namespace == \"prometheus\" and Name == \"nginx_ingress_controller_requests\" | where parse_json(Tags).status == 403 | summarize AggregatedValue = avg(Val)-value by bin(TimeGenerated, 5m) | order by TimeGenerated | render barchart", "version": 1 } },