Update prometheus and nginx ingress versions

k8s/applications/templates/ingress-nginx.yaml

@@ -10,7 +10,7 @@ spec:
   source:
     path: ''
     repoURL: 'https://kubernetes.github.io/ingress-nginx'
-    targetRevision: 4.0.6
+    targetRevision: 4.13.0
     chart: ingress-nginx
   project: default
   syncPolicy:
@@ -24,4 +24,4 @@ spec:
       backoff:
         duration: 5s 
         factor: 2 
-        maxDuration: 3m 
+        maxDuration: 3m 

k8s/monitoring/Chart.yaml

@@ -3,5 +3,5 @@ name: monitoring
 version: '1.0'
 dependencies:
   - name: kube-prometheus-stack
-    version: "19.3.0"
-    repository: "https://prometheus-community.github.io/helm-charts"
+    version: "75.12.0"
+    repository: "https://prometheus-community.github.io/helm-charts"

k8s/monitoring/values-production.yaml

@@ -3,22 +3,26 @@ kube-prometheus-stack:
   prometheus:
     ingress:
       enabled: true
+      pathType: Prefix
       annotations:
         kubernetes.io/ingress.class: nginx
         nginx.ingress.kubernetes.io/rewrite-target: /$2
         cert-manager.io/cluster-issuer: letsencrypt-nginx-production
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
         # nginx.ingress.kubernetes.io/auth-type: basic
         # nginx.ingress.kubernetes.io/auth-secret: basic-auth
         # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
       hosts:
       - monitoring.video.jamkazam.com
       paths:
-      - /prometheus(/|$)(.*)
+      - /prometheus
       tls:
       - secretName: monitoring
         hosts:
         - monitoring.video.jamkazam.com
     prometheusSpec:
+      retention: 60d
+      retentionSize: 20GB
       routePrefix: /
       externalUrl: https://monitoring.video.jamkazam.com/prometheus
       storageSpec:
@@ -27,54 +31,58 @@ kube-prometheus-stack:
             storageClassName: linode-block-storage-retain
             resources:
               requests:
-                storage: 10Gi
+                storage: 30Gi
 
   alertmanager:
     ingress:
       enabled: true
+      pathType: Prefix
       annotations:
         kubernetes.io/ingress.class: nginx
         nginx.ingress.kubernetes.io/rewrite-target: /$2
         cert-manager.io/cluster-issuer: letsencrypt-nginx-production
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
         # nginx.ingress.kubernetes.io/auth-type: basic
         # nginx.ingress.kubernetes.io/auth-secret: basic-auth
         # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
       hosts:
       - monitoring.video.jamkazam.com
       paths:
-      - /alertmanager(/|$)(.*)
+      - /alertmanager
       tls:
       - secretName: monitoring
         hosts:
         - monitoring.video.jamkazam.com
     alertmanagerSpec:
-      routePrefix: /
-      externalUrl: https://monitoring.video.jamkazam.com/alertmanager
+      #routePrefix: /
+      #externalUrl: https://monitoring.video.jamkazam.com/alertmanager
       storage:
         volumeClaimTemplate:
           spec:
             storageClassName: linode-block-storage-retain
             resources:
               requests:
-                storage: 10Gi
+                storage: 30Gi
 
   grafana:
     persistence:
       enabled: true
       storageClassName: linode-block-storage-retain
-      size: 10Gi
+      size: 30Gi
     ingress:
       enabled: true
+      pathType: Prefix
       annotations:
         kubernetes.io/ingress.class: nginx
         nginx.ingress.kubernetes.io/rewrite-target: /$2
         cert-manager.io/cluster-issuer: letsencrypt-nginx-production
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
         # nginx.ingress.kubernetes.io/auth-type: basic
         # nginx.ingress.kubernetes.io/auth-secret: basic-auth
         # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
       hosts:
       - monitoring.video.jamkazam.com
-      path: /grafana(/|$)(.*)
+      path: /grafana
       tls:
       - secretName: monitoring
         hosts:
@@ -84,6 +92,7 @@ kube-prometheus-stack:
         domain: monitoring.video.jamkazam.com
         root_url: "%(protocol)s://%(domain)s/grafana/"
         enable_gzip: "true"
+        serve_from_sub_path: true
 
   # Disable control plane metrics
   kubeEtcd:
@@ -94,4 +103,4 @@ kube-prometheus-stack:
 
   kubeScheduler:
     enabled: false
-      
+