From ab0d9e5f320ab20de78f9c8e4e1b632b3e0588ed Mon Sep 17 00:00:00 2001 From: Neha130 Date: Tue, 3 Jun 2025 18:58:45 +0530 Subject: [PATCH 1/6] update the chart --- charts/devtron-monitoring/Chart.yaml | 14 +++- charts/devtron-monitoring/README.MD | 2 + charts/devtron-monitoring/app-values.yaml | 85 ++++++++++++++++++++++- charts/devtron-monitoring/values.yaml | 83 +++++++++++++++++++++- 4 files changed, 180 insertions(+), 4 deletions(-) diff --git a/charts/devtron-monitoring/Chart.yaml b/charts/devtron-monitoring/Chart.yaml index 2b795245..1e87824c 100644 --- a/charts/devtron-monitoring/Chart.yaml +++ b/charts/devtron-monitoring/Chart.yaml @@ -10,8 +10,10 @@ sources: - https://github.com/kubernetes-sigs/metrics-server/tree/master/charts/metrics-server - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-blackbox-exporter - https://github.com/deliveryhero/helm-charts/tree/master/stable/k8s-event-logger + - https://github.com/grafana/pyroscope + - https://github.com/VictoriaMetrics/helm-charts -version: 0.0.3 +version: 0.0.6 appVersion: "0.0.1" dependencies: - name: fluent-bit @@ -47,6 +49,16 @@ dependencies: repository: https://victoriametrics.github.io/helm-charts/ condition: victoriametrics.enabled alias: victoriametrics +- name: pyroscope + repository: https://grafana.github.io/helm-charts + version: "1.13.2" + condition: pyroscope.enabled + alias: pyroscope +- name: victoria-logs-single + version: "0.9.8" + repository: https://victoriametrics.github.io/helm-charts/ + condition: vmlogs.enabled + alias: vmlogs maintainers: - email: badal@devtron.ai name: Badal Kumar diff --git a/charts/devtron-monitoring/README.MD b/charts/devtron-monitoring/README.MD index 762e4cb9..eebd87fd 100644 --- a/charts/devtron-monitoring/README.MD +++ b/charts/devtron-monitoring/README.MD @@ -8,6 +8,8 @@ - Kube-Prom-Stack / Victoria Metrics - Black Box - Event Logger +- VMlogs +- Pyroscope diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index e8dac449..640fc490 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -92,7 +92,6 @@ fluent-bit: endpoint https:// bucket s3_key_format /$TAG[1]/$TAG[3]/%Y-%m-%d/%H_%M_%S_$TAG[2].log - # s3_key_format /$TAG[1]/$TAG[3]/%Y-%m-%d/%H_%M_%S.log s3_key_format_tag_delimiters . static_file_path On use_put_object Off @@ -436,7 +435,7 @@ victoriametrics: path: /var/lib/grafana/dashboards/default orgId: 1 type: file - dashboards: + dashboards: default: nodeexporter: datasource: VictoriaMetrics @@ -528,10 +527,92 @@ victoriametrics: external.url: https://vmalert-.domain.com vmsingle: enabled: true + containers: + - name: oauth2-proxy + image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 + args: + - --provider=google # Change this to: google, github, azure, oidc, etc. + - --upstream=http://127.0.0.1:8429 + - --http-address=0.0.0.0:4180 + - --cookie-secure=true + - --redirect-url=https://vmsingle-.domain.com/oauth2/callback + - --email-domain=devtron.ai + env: + - name: OAUTH2_PROXY_CLIENT_ID + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: client-id + - name: OAUTH2_PROXY_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: client-secret + - name: OAUTH2_PROXY_COOKIE_SECRET + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: cookie-secret + - name: OAUTH2_PROXY_REDIRECT_URL + value: "https://vmsingle-.domain.com/oauth2/callback" + ports: + - containerPort: 4180 + name: oauth-proxy + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 50m + memory: 64Mi + livenessProbe: + httpGet: + path: /ping + port: 4180 + initialDelaySeconds: 30 + periodSeconds: 10 + readinessProbe: + httpGet: + path: /ping + port: 4180 + initialDelaySeconds: 5 + periodSeconds: 5 + # Update service to expose oauth2-proxy port + ports: + - name: http + port: 8429 + targetPort: 8429 + - name: oauth-proxy + port: 4180 + targetPort: 4180 ingress: enabled: true + annotations: + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-stage.devtron.info + # Route traffic to oauth2-proxy port instead of VMSingle directly + nginx.ingress.kubernetes.io/service-upstream: "true" hosts: - vmsingle-.domain.com + extraPaths: + - path: /oauth2 + pathType: Prefix + backend: + service: + name: vmsingle-victoria-metrics + port: + name: oauth-proxy + - path: / + pathType: Prefix + backend: + service: + name: vmsingle-victoria-metrics + port: + name: oauth-proxy ingressClassName: nginx spec: retentionPeriod: 5d +pyroscope: + enabled: false +vmlogs: + enabled: false diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index e8dac449..c271ddba 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -92,7 +92,6 @@ fluent-bit: endpoint https:// bucket s3_key_format /$TAG[1]/$TAG[3]/%Y-%m-%d/%H_%M_%S_$TAG[2].log - # s3_key_format /$TAG[1]/$TAG[3]/%Y-%m-%d/%H_%M_%S.log s3_key_format_tag_delimiters . static_file_path On use_put_object Off @@ -528,10 +527,92 @@ victoriametrics: external.url: https://vmalert-.domain.com vmsingle: enabled: true + containers: + - name: oauth2-proxy + image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 + args: + - --provider=google # Change this to: google, github, azure, oidc, etc. + - --upstream=http://127.0.0.1:8429 + - --http-address=0.0.0.0:4180 + - --cookie-secure=true + - --redirect-url=https://vmsingle-.domain.com/oauth2/callback + - --email-domain=devtron.ai + env: + - name: OAUTH2_PROXY_CLIENT_ID + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: client-id + - name: OAUTH2_PROXY_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: client-secret + - name: OAUTH2_PROXY_COOKIE_SECRET + valueFrom: + secretKeyRef: + name: google-oauth-secrets + key: cookie-secret + - name: OAUTH2_PROXY_REDIRECT_URL + value: "https://vmsingle-.domain.com/oauth2/callback" + ports: + - containerPort: 4180 + name: oauth-proxy + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 50m + memory: 64Mi + livenessProbe: + httpGet: + path: /ping + port: 4180 + initialDelaySeconds: 30 + periodSeconds: 10 + readinessProbe: + httpGet: + path: /ping + port: 4180 + initialDelaySeconds: 5 + periodSeconds: 5 + # Update service to expose oauth2-proxy port + ports: + - name: http + port: 8429 + targetPort: 8429 + - name: oauth-proxy + port: 4180 + targetPort: 4180 ingress: enabled: true + annotations: + nginx.ingress.kubernetes.io/backend-protocol: "HTTP" + nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-stage.devtron.info + # Route traffic to oauth2-proxy port instead of VMSingle directly + nginx.ingress.kubernetes.io/service-upstream: "true" hosts: - vmsingle-.domain.com + extraPaths: + - path: /oauth2 + pathType: Prefix + backend: + service: + name: vmsingle-victoria-metrics + port: + name: oauth-proxy + - path: / + pathType: Prefix + backend: + service: + name: vmsingle-victoria-metrics + port: + name: oauth-proxy ingressClassName: nginx spec: retentionPeriod: 5d +pyroscope: + enabled: false +vmlogs: + enabled: false From 2bdb76e26e1f52dfbfb594f8083fc5e8683822b1 Mon Sep 17 00:00:00 2001 From: Neha130 Date: Tue, 3 Jun 2025 19:17:26 +0530 Subject: [PATCH 2/6] update the chart --- charts/devtron-monitoring/app-values.yaml | 1 - charts/devtron-monitoring/values.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index 640fc490..fefe1dee 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -296,7 +296,6 @@ vector: - name: http port: 9090 victoriametrics: - enabled: false alertmanager: config: receivers: diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index c271ddba..681ef806 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -296,7 +296,6 @@ vector: - name: http port: 9090 victoriametrics: - enabled: false alertmanager: config: receivers: From 1d7276ee8f21e87872ee0f9c6667bb89aea409c6 Mon Sep 17 00:00:00 2001 From: Neha130 Date: Fri, 6 Jun 2025 16:09:07 +0530 Subject: [PATCH 3/6] update the changes --- charts/devtron-monitoring/app-values.yaml | 1 + charts/devtron-monitoring/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index fefe1dee..f6c9cd69 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -296,6 +296,7 @@ vector: - name: http port: 9090 victoriametrics: + enabled: true alertmanager: config: receivers: diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index 681ef806..61ea918d 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -296,6 +296,7 @@ vector: - name: http port: 9090 victoriametrics: + enabled: true alertmanager: config: receivers: From 708485de38e8c4eb2997bad49ded3325f83fdb7f Mon Sep 17 00:00:00 2001 From: Neha130 Date: Mon, 9 Jun 2025 11:18:47 +0530 Subject: [PATCH 4/6] updates the values.yaml --- charts/devtron-monitoring/app-values.yaml | 10 +++++----- charts/devtron-monitoring/values.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index f6c9cd69..5d577b3e 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -296,7 +296,7 @@ vector: - name: http port: 9090 victoriametrics: - enabled: true + enabled: false alertmanager: config: receivers: @@ -461,7 +461,7 @@ victoriametrics: nginx.ingress.kubernetes.io/force-ssl-redirect: "false" nginx.ingress.kubernetes.io/rewrite-target: /grafana/$2 nginx.ingress.kubernetes.io/ssl-redirect: "false" - enabled: true + enabled: false hosts: - .domain.com ingressClassName: nginx-new @@ -500,7 +500,7 @@ victoriametrics: disable_prometheus_converter: false prometheus_converter_add_argocd_ignore_annotations: true vmagent: - enabled: true + enabled: false ingress: enabled: true hosts: @@ -516,7 +516,7 @@ victoriametrics: promscrape.suppressScrapeErrorsDelay: 30s scrapeInterval: 20s vmalert: - enabled: true + enabled: false ingress: enabled: true hosts: @@ -526,7 +526,7 @@ victoriametrics: extraArgs: external.url: https://vmalert-.domain.com vmsingle: - enabled: true + enabled: false containers: - name: oauth2-proxy image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index 61ea918d..9f0a1673 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -296,7 +296,7 @@ vector: - name: http port: 9090 victoriametrics: - enabled: true + enabled: false alertmanager: config: receivers: @@ -412,7 +412,7 @@ victoriametrics: - continue: true match: null receiver: discord - enabled: true + enabled: false crds: enabled: true defaultDashboards: @@ -500,7 +500,7 @@ victoriametrics: disable_prometheus_converter: false prometheus_converter_add_argocd_ignore_annotations: true vmagent: - enabled: true + enabled: false ingress: enabled: true hosts: @@ -516,7 +516,7 @@ victoriametrics: promscrape.suppressScrapeErrorsDelay: 30s scrapeInterval: 20s vmalert: - enabled: true + enabled: false ingress: enabled: true hosts: @@ -526,7 +526,7 @@ victoriametrics: extraArgs: external.url: https://vmalert-.domain.com vmsingle: - enabled: true + enabled: false containers: - name: oauth2-proxy image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0 From f7cf02e2ab964a8b06b11a3185e0a7c641bb6223 Mon Sep 17 00:00:00 2001 From: Neha130 Date: Mon, 9 Jun 2025 14:23:19 +0530 Subject: [PATCH 5/6] updates the values.yaml --- charts/devtron-monitoring/app-values.yaml | 4 ++-- charts/devtron-monitoring/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index 5d577b3e..cf70ab4d 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -536,7 +536,7 @@ victoriametrics: - --http-address=0.0.0.0:4180 - --cookie-secure=true - --redirect-url=https://vmsingle-.domain.com/oauth2/callback - - --email-domain=devtron.ai + - --email-domain= env: - name: OAUTH2_PROXY_CLIENT_ID valueFrom: @@ -589,7 +589,7 @@ victoriametrics: enabled: true annotations: nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-stage.devtron.info + nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-.domain.com # Route traffic to oauth2-proxy port instead of VMSingle directly nginx.ingress.kubernetes.io/service-upstream: "true" hosts: diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index 9f0a1673..5bb969cd 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -536,7 +536,7 @@ victoriametrics: - --http-address=0.0.0.0:4180 - --cookie-secure=true - --redirect-url=https://vmsingle-.domain.com/oauth2/callback - - --email-domain=devtron.ai + - --email-domain= env: - name: OAUTH2_PROXY_CLIENT_ID valueFrom: @@ -589,7 +589,7 @@ victoriametrics: enabled: true annotations: nginx.ingress.kubernetes.io/backend-protocol: "HTTP" - nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-stage.devtron.info + nginx.ingress.kubernetes.io/upstream-vhost: vmsingle-.domain.com # Route traffic to oauth2-proxy port instead of VMSingle directly nginx.ingress.kubernetes.io/service-upstream: "true" hosts: From 8f035554093c4648766ba1fa20cc882cefec9a8f Mon Sep 17 00:00:00 2001 From: Neha130 Date: Thu, 12 Jun 2025 14:00:28 +0530 Subject: [PATCH 6/6] update the values.yaml --- charts/devtron-monitoring/app-values.yaml | 2 -- charts/devtron-monitoring/values.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/charts/devtron-monitoring/app-values.yaml b/charts/devtron-monitoring/app-values.yaml index cf70ab4d..b780471f 100644 --- a/charts/devtron-monitoring/app-values.yaml +++ b/charts/devtron-monitoring/app-values.yaml @@ -240,7 +240,6 @@ vector: inputs: - my_remap_id_audit key_prefix: '{{ print "audit-log/devtroncd/{{ container_name }}/%Y-%m-%d/" }}' - region: type: aws_s3 my_sink_id_audit: batch: @@ -254,7 +253,6 @@ vector: inputs: - my_remap_id key_prefix: '{{ print "vector-log-2/devtroncd/{{ container_name }}/%Y-%m-%d/" }}' - region: type: aws_s3 sources: kube_log: diff --git a/charts/devtron-monitoring/values.yaml b/charts/devtron-monitoring/values.yaml index 5bb969cd..cd574e6f 100644 --- a/charts/devtron-monitoring/values.yaml +++ b/charts/devtron-monitoring/values.yaml @@ -240,7 +240,6 @@ vector: inputs: - my_remap_id_audit key_prefix: '{{ print "audit-log/devtroncd/{{ container_name }}/%Y-%m-%d/" }}' - region: type: aws_s3 my_sink_id_audit: batch: @@ -254,7 +253,6 @@ vector: inputs: - my_remap_id key_prefix: '{{ print "vector-log-2/devtroncd/{{ container_name }}/%Y-%m-%d/" }}' - region: type: aws_s3 sources: kube_log: