diff --git a/.gitignore b/.gitignore index 14d51568..ed9c7b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ lac-values.yaml -my-values.yaml \ No newline at end of file +my-values.yaml +stag-values.yaml \ No newline at end of file diff --git a/src/digma/Chart.yaml b/src/digma/Chart.yaml index c16b7c88..326b6855 100644 --- a/src/digma/Chart.yaml +++ b/src/digma/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 # version: this Chart version -version: 1.0.206 +version: 1.0.229 name: digma description: A Helm chart containing Digma's services and dbs home: https://github.com/digma-ai/digma diff --git a/src/digma/templates/digma-measurement-analysis.yaml b/src/digma/templates/digma-measurement-analysis.yaml index 4f090c0c..bb1d6600 100644 --- a/src/digma/templates/digma-measurement-analysis.yaml +++ b/src/digma/templates/digma-measurement-analysis.yaml @@ -44,14 +44,6 @@ spec: value: {{ .Values.digmaSelfDiagnosis.otlpSamplerProbability| quote}} - name: BACKEND_DEPLOYMENT_TYPE value: {{ .Values.deploymentType | quote}} - - name: ThresholdOptions__RecentActivityUpdateThresholdSeconds - value: {{ .Values.traceCollectorThresholds.recentActivityUpdateThresholdSeconds | quote }} - - name: ThresholdOptions__UpsertEndpointThresholdSeconds - value: {{ .Values.traceCollectorThresholds.upsertEndpointThresholdSeconds | quote }} - - name: ThresholdOptions__UpsertSpansThresholdSeconds - value: {{ .Values.traceCollectorThresholds.upsertSpansThresholdSeconds | quote }} - - name: ThresholdOptions__UpsertSpanFlowMetadataThresholdSeconds - value: {{ .Values.traceCollectorThresholds.upsertSpanFlowMetadataThresholdSeconds | quote }} - name: Kafka__SpanDurationSummaryCG__Workers value: '2' - name: Kafka__SpanDurationTotalCG__Workers diff --git a/src/digma/templates/external-network.yaml b/src/digma/templates/external-network.yaml index 234dda6d..a6f1c5b8 100644 --- a/src/digma/templates/external-network.yaml +++ b/src/digma/templates/external-network.yaml @@ -1,3 +1,72 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ .Release.Name }}-analytics-nginx-ingress + annotations: + nginx.ingress.kubernetes.io/rewrite-target: / +spec: + ingressClassName: nginx + rules: + - host: analytics.stag01.digma.systems + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ tpl .Values.digmaAnalytics.host . }} + port: + number: 5051 + +--- + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ .Release.Name }}-collector-http-nginx-ingress + annotations: + nginx.ingress.kubernetes.io/rewrite-target: /$1 + nginx.ingress.kubernetes.io/enable-debug: "true" +spec: + ingressClassName: nginx + rules: + - host: collector-http.stag01.digma.systems + http: + paths: + - path: /(.*) + pathType: ImplementationSpecific + backend: + service: + name: {{ tpl .Values.digmaCollectorApi.host . }} + port: + number: 5049 + +--- + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ .Release.Name }}-collector-grpc-nginx-ingress + annotations: + nginx.ingress.kubernetes.io/rewrite-target: /$1 + nginx.ingress.kubernetes.io/enable-debug: "true" + nginx.ingress.kubernetes.io/backend-protocol: "GRPC" +spec: + ingressClassName: nginx + rules: + - host: collector-grpc.stag01.digma.systems + http: + paths: + - path: /(.*) + pathType: ImplementationSpecific + backend: + service: + name: {{ tpl .Values.digmaCollectorApi.host . }} + port: + number: 5050 + +--- + kind: Service apiVersion: v1 metadata: diff --git a/src/digma/values.yaml b/src/digma/values.yaml index 3f63429e..6e07a719 100644 --- a/src/digma/values.yaml +++ b/src/digma/values.yaml @@ -9,6 +9,8 @@ presets: replicas: 1 digmaPipelineWorker: replicas: 1 + digmaSpanProcessor: + replicas: 1 medium: digmaCollectorWorker: replicas: 4 @@ -16,6 +18,8 @@ presets: replicas: 4 digmaPipelineWorker: replicas: 1 + digmaSpanProcessor: + replicas: 1 large: digmaCollectorWorker: replicas: 6 @@ -23,6 +27,8 @@ presets: replicas: 4 digmaPipelineWorker: replicas: 4 + digmaSpanProcessor: + replicas: 4 deploymentType: Helm exposeInternalErrorDetails: false @@ -216,6 +222,19 @@ digmaMeasurementAnalysis: } } +digmaSpanProcessor: + replicas: "{{ index .Values.presets .Values.size \"digmaSpanProcessor\" \"replicas\" }}" + resources: { + requests: { + memory: 100Mi, + cpu: 200m + }, + limits: { + memory: 500Mi, + cpu: 800m + } + } + digmaSelfDiagnosis: otlpExportTraces: false otlpExportMetrics: false