diff --git a/helm-guestbook/templates/cluster_analysis.yaml b/helm-guestbook/templates/cluster_analysis.yaml index de805eb..ff52513 100644 --- a/helm-guestbook/templates/cluster_analysis.yaml +++ b/helm-guestbook/templates/cluster_analysis.yaml @@ -12,6 +12,4 @@ spec: prometheus: address: "http://a0179abbebc504fe1a02cc2868d10d20-1436141555.us-east-2.elb.amazonaws.com:9090" query: | - avg(rate(app_not_founds_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m])) / - (avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m])) > 0) or - avg(rate(app_requests_total{kubernetes_namespace="default", kubernetes_name="{{ template "helm-guestbook.fullname" . }}"}[5m])) \ No newline at end of file + round(sum(irate(nginx_ingress_controller_requests{controller_pod=~"$controller",controller_class=~"nginx",controller_namespace=~"ingress-nginx",ingress=~"$ingress"}[2m])) by (ingress), 0.001) \ No newline at end of file diff --git a/helm-guestbook/templates/ingress.yaml b/helm-guestbook/templates/ingress.yaml index 691def9..67abbee 100644 --- a/helm-guestbook/templates/ingress.yaml +++ b/helm-guestbook/templates/ingress.yaml @@ -13,7 +13,7 @@ spec: # - host: argo.cirruslabs.io - http: paths: - - path: / + - path: {{ .Values.ingress.path }} backend: # serviceName must match canary.stableService serviceName: {{ template "helm-guestbook.fullname" . }} diff --git a/helm-guestbook/values.yaml b/helm-guestbook/values.yaml index 4a68f5d..fdda896 100644 --- a/helm-guestbook/values.yaml +++ b/helm-guestbook/values.yaml @@ -54,8 +54,8 @@ ingress: # nginx.ingress.kubernetes.io/canary-by-header-pattern: "aspc|eu" # kubernetes.io/tls-acme: "true" path: / - hosts: - - chart-example.local + # hosts: + # - chart-example.local tls: [] # - secretName: chart-example-tls # hosts: