[jaeger-v2] Add support for Elasticsearch

.github/workflows/lint-test.yaml

@@ -50,11 +50,32 @@ jobs:
       - name: Run chart-testing (install)
         run: |
           ct install --config ct.yaml \
-            --helm-extra-set-args "
+              --helm-extra-set-args "  \
               --set provisionDataStore.cassandra=false \
               --set storage.type=memory \
               --set allInOne.enabled=true \
               --set agent.enabled=false \
               --set collector.enabled=false \
               --set query.enabled=false "
+  test-with-elasticsearch:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v2
+          with:
+            fetch-depth: 0
+
+        - uses: ./.github/actions/prepare-k8s
+
+        - name: Run chart-testing (install)
+          run: |
+            ct install --config ct.yaml \
+                --helm-extra-set-args " \
+                --set provisionDataStore.cassandra=false \
+                --set provisionDataStore.elasticsearch=true \
+                --set storage.type=elasticsearch \
+                --set elasticsearch.master.masterOnly=false \
+                --set elasticsearch.master.replicaCount=1 \
+                --set elasticsearch.data.replicaCount=0 \
+                --set elasticsearch.coordinating.replicaCount=0 \
+                --set elasticsearch.ingest.replicaCount=0"
 

charts/jaeger/Chart.yaml

@@ -4,6 +4,8 @@ description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
 version: 4.0.0
+annotations:
+  Jaegerv1Version: "1.62.0"
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:

charts/jaeger/templates/_helpers.tpl

@@ -608,7 +608,8 @@ Create pull secrets for ingester image
 Create image name for agent image
 */}}
 {{- define "agent.image" -}}
-{{- include "renderImage" ( dict "imageRoot" .Values.agent.image "context" $ ) -}}
+{{- $image := merge .Values.agent.image (dict "tag" .Chart.Annotations.Jaegerv1Version) -}}
+{{- include "renderImage" ( dict "imageRoot" $image "context" $ ) -}}
 {{- end -}}
 
 {{/*

charts/jaeger/templates/collector-deploy.yaml

@@ -43,6 +43,7 @@ spec:
             url="{{ include "elasticsearch.client.url" . }}"
             until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do
               echo "Waiting for Elasticsearch at $url"
+              echo  "$(curl -s "$url/_cluster/health")"
               sleep 5
             done
       {{- end}}
@@ -64,6 +65,8 @@ spec:
         image: {{ include "collector.image" . }}
         imagePullPolicy: {{ .Values.collector.image.pullPolicy }}
         args:
+          - "--config"
+          - "/etc/jaeger/user-config.yaml"
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.collector.cmdlineParams ) | nindent 10  }}
           {{- if not .Values.ingester.enabled -}}
           {{- include "storage.cmdArgs" . | nindent 10 }}
@@ -123,7 +126,7 @@ spec:
         - containerPort: {{ .Values.collector.service.http.port }}
           name: http
           protocol: TCP
-        - containerPort: 14269
+        - containerPort: 13133
           name: admin
           protocol: TCP
         {{- if .Values.collector.service.zipkin }}
@@ -141,15 +144,19 @@ spec:
         {{- end }}
         readinessProbe:
           httpGet:
-            path: /
+            path: /status
             port: admin
+            scheme: HTTP
         livenessProbe:
           httpGet:
-            path: /
+            path: /status
             port: admin
+            scheme: HTTP
         resources:
           {{- toYaml .Values.collector.resources | nindent 10 }}
         volumeMounts:
+          - name: user-config
+            mountPath: /etc/jaeger
         {{- range .Values.collector.extraConfigmapMounts }}
           - name: {{ .name }}
             mountPath: {{ .mountPath }}
@@ -189,6 +196,9 @@ spec:
       dnsPolicy: {{ .Values.collector.dnsPolicy }}
       restartPolicy: Always
       volumes:
+        - name: user-config
+          configMap:
+            name: user-config
       {{- range .Values.collector.extraConfigmapMounts }}
         - name: {{ .name }}
           configMap:

charts/jaeger/templates/collector-svc.yaml

@@ -60,9 +60,9 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.collector.service.otlp.http.name }}
 {{- end }}
-  - name: {{ .Values.collector.service.admin.name }}
-    port: 14269
-    targetPort: {{ .Values.collector.service.admin.targetPort }}
+  - name: {{ .Values.collector.service.healthCheck.name }}
+    port: 13133
+    targetPort: {{ .Values.collector.service.healthCheck.targetPort }}
   selector:
     {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: collector

charts/jaeger/templates/es-configmap.yaml

@@ -0,0 +1,62 @@
+{{ if (and (not .Values.userconfig) .Values.provisionDataStore.elasticsearch) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: user-config
+  namespace: {{ include "jaeger.namespace" . }}
+  labels:
+    {{- include "jaeger.labels" . | nindent 4 }}
+data:
+  user-config.yaml: |
+    service:
+      extensions: [jaeger_storage, jaeger_query, healthcheckv2]
+      pipelines:
+        traces:
+          receivers: [otlp]
+          processors: [batch]
+          exporters: [jaeger_storage_exporter]
+
+    extensions:
+      healthcheckv2:
+        use_v2: true
+        http:
+            endpoint: 0.0.0.0:13133
+
+      jaeger_query:
+        storage:
+          traces: some_storage
+          traces_archive: another_storage
+
+
+      jaeger_storage:
+        backends:
+          some_storage:
+            elasticsearch:
+              index_prefix: {{- .Values.config.extensions.jaeger_storage.backends.elasticsearch.index_prefix | quote | indent 2 }}
+              server_urls: ["{{ include "elasticsearch.client.url" . }}"]
+              username: {{- .Values.storage.elasticsearch.user | quote | indent 2 }}
+              {{- if .Values.storage.elasticsearch.password }}
+              password: {{- .Values.storage.elasticsearch.password | quote | indent 2 }}
+              {{- end }}
+          another_storage:
+            elasticsearch:
+              index_prefix: {{- .Values.config.extensions.jaeger_storage.backends.elasticsearch.index_prefix_archive | quote | indent 2 }}
+              server_urls: ["{{ include "elasticsearch.client.url" . }}"]
+              username: {{- .Values.config.extensions.jaeger_storage.backends.elasticsearch.user | quote | indent 2 }}
+              {{- if .Values.config.extensions.jaeger_storage.backends.elasticsearch.password }}
+              password: {{- .Values.config.extensions.jaeger_storage.backends.elasticsearch.password | quote | indent 2 }}
+              {{- end }}
+
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+          http:
+
+    processors:
+      batch:
+
+    exporters:
+      jaeger_storage_exporter:
+        trace_storage: some_storage
+{{- end }}

charts/jaeger/templates/query-deploy.yaml

@@ -70,6 +70,8 @@ spec:
         image: {{ include "query.image" . }}
         imagePullPolicy: {{ .Values.query.image.pullPolicy }}
         args:
+          - "--config"
+          - "/etc/jaeger/user-config.yaml"
           {{ include "extra.cmdArgs" ( dict "cmdlineParams" .Values.query.cmdlineParams ) | nindent 10  }}
           {{- include "storage.cmdArgs" . | nindent 10 }}
         env:
@@ -100,11 +102,13 @@ spec:
           containerPort: 16685
           protocol: TCP
         - name: admin
-          containerPort: 16687
+          containerPort: 13133
           protocol: TCP
         resources:
           {{- toYaml .Values.query.resources | nindent 10 }}
         volumeMounts:
+          - name: user-config
+            mountPath: /etc/jaeger
         {{- range .Values.query.extraSecretMounts }}
           - name: {{ .name }}
             mountPath: {{ .mountPath }}
@@ -143,12 +147,14 @@ spec:
         {{- end }}
         livenessProbe:
           httpGet:
-            path: /
+            path: /status
             port: admin
+            scheme: HTTP
         readinessProbe:
           httpGet:
-            path: /
+            path: /status
             port: admin
+            scheme: HTTP
 {{- if .Values.query.oAuthSidecar.enabled }}
       - name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar
         securityContext:
@@ -247,6 +253,9 @@ spec:
       dnsPolicy: {{ .Values.query.dnsPolicy }}
       restartPolicy: Always
       volumes:
+        - name: user-config
+          configMap:
+            name: user-config
       {{- range .Values.query.extraConfigmapMounts }}
         - name: {{ .name }}
           configMap:

charts/jaeger/templates/query-svc.yaml

@@ -24,7 +24,7 @@ spec:
     protocol: TCP
     targetPort: grpc
   - name: {{ .Values.query.service.admin.name }}
-    port: 16687
+    port: 13133
     protocol: TCP
     targetPort: {{ .Values.query.service.admin.targetPort }}
   selector:

charts/jaeger/values.yaml

@@ -32,6 +32,12 @@ config:
 
     jaeger_storage:
       backends:
+        elasticsearch:
+          index_prefix: jaeger
+          index_prefix_archive: jaeger-archive
+          server_urls: ["http://elasticsearch-master:9200"]
+          username: elastic
+          password: changeme
         primary_store:
           memory:
             max_traces: 100000
@@ -516,7 +522,7 @@ collector:
   annotations: {}
   image:
     registry: ""
-    repository: jaegertracing/jaeger-collector
+    repository: jaegertracing/jaeger
     tag: ""
     digest: ""
     pullPolicy: IfNotPresent
@@ -566,7 +572,7 @@ collector:
         # name: otlp-http
         # port: 4318
         # nodePort:
-    admin:
+    healthCheck:
       name: admin
       targetPort: admin
   ingress:
@@ -732,7 +738,7 @@ query:
   annotations: {}
   image:
     registry: ""
-    repository: jaegertracing/jaeger-query
+    repository: jaegertracing/jaeger
     tag: ""
     digest: ""
     pullPolicy: IfNotPresent

user-config.yaml

@@ -0,0 +1,44 @@
+service:
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [jaeger_storage_exporter]
+
+extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+        endpoint: 0.0.0.0:13133
+
+  jaeger_query:
+    storage:
+      traces: some_storage
+      traces_archive: another_storage
+
+
+  jaeger_storage:
+    backends:
+      some_storage:
+        elasticsearch:
+          index_prefix: "jaeger-main"
+          server_urls: ["http://es-elasticsearch:9200"]
+
+      another_storage:
+        elasticsearch:
+          index_prefix: "jaeger-archive"
+          server_urls: ["http://es-elasticsearch:9200"]
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+processors:
+  batch:
+
+exporters:
+  jaeger_storage_exporter:
+    trace_storage: some_storage