[jaeger-v2] Add support for Elasticsearch #617

hellspawn679 · 2024-11-08T12:24:40Z

What this PR does

added support for elasticsearch in jaeger-v2 helm chart

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format,
will close that issue when PR gets merged)

fixes add support for elasticsearch for jaeger v2

Checklist

DCO signed
Commits are GPG signed
Chart Version bumped
Title of the PR starts with chart name ([jaeger] or [jaeger-operator])
README.md has been updated to match version/contain new values

Signed-off-by: Reddysekhar Gaduputi <gsekhar73@gmail.com> upgrade jaeger-operator to latest 1.61.0 (jaegertracing#605) Signed-off-by: Blair Bowden <blair@radiusmethod.com> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <mehulsharma4786@gmail.com> lint fix Signed-off-by: Mehul <mehulsharma4786@gmail.com> fixed Signed-off-by: Mehul <mehulsharma4786@gmail.com> lint fix Signed-off-by: Mehul <mehulsharma4786@gmail.com> lint fix Signed-off-by: Mehul <mehulsharma4786@gmail.com> fixed using pre-hook Signed-off-by: Mehul <mehulsharma4786@gmail.com> fixed --config flag is not been passed Signed-off-by: mehul <mehulsharam4786@gmail.com> release ns for config-map.yaml Signed-off-by: mehul <mehulsharam4786@gmail.com> testing ci Signed-off-by: mehul <mehulsharam4786@gmail.com> testing ci Signed-off-by: mehul <mehulsharam4786@gmail.com> fixed ns Signed-off-by: mehul <mehulsharam4786@gmail.com> fixed ns Signed-off-by: mehul <mehulsharam4786@gmail.com> fixed template Signed-off-by: mehul <mehulsharam4786@gmail.com> removed sampling Signed-off-by: mehul <mehulsharam4786@gmail.com> removed adaptive sampling from processors Signed-off-by: mehul <mehulsharam4786@gmail.com> Revert "Jaeger v2 test2" Signed-off-by: mehul <mehulsharam4786@gmail.com> attempt to create v2 chart in v1 Signed-off-by: mehul <mehulsharam4786@gmail.com> enabled collector query and agent Signed-off-by: mehul <mehulsharam4786@gmail.com> version bump Signed-off-by: mehul <mehulsharam4786@gmail.com> testing-v2-ci Signed-off-by: mehul <mehulsharam4786@gmail.com> testing-v2-ci Signed-off-by: mehul <mehulsharam4786@gmail.com> added --helm-extra-set-args flag Signed-off-by: mehul <mehulsharam4786@gmail.com> fixed healthcheck port-v2 Signed-off-by: mehul <mehulsharam4786@gmail.com> Fix health check path Signed-off-by: Yuri Shkuro <github@ysh.us> minor changes Signed-off-by: mehul <mehulsharam4786@gmail.com>

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

Signed-off-by: mehul <mehulsharam4786@gmail.com>

…elm-charts into jaeger-v2-with-v1

Signed-off-by: mehul <mehulsharam4786@gmail.com>

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

Signed-off-by: mehul <mehulsharma4786@gmail.com>

Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>

Signed-off-by: mehul <mehulsharma4786@gmail.com>

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

yurishkuro · 2024-11-10T22:10:33Z

please write complete PR title and description

charts/jaeger/Chart.yaml

charts/jaeger/templates/collector-svc.yaml

yurishkuro · 2024-11-10T22:18:03Z

charts/jaeger/templates/es-user-config.yaml

+        backends:
+          some_storage:
+            elasticsearch:
+              index_prefix: {{- .Values.storage.elasticsearch.index_prefix | quote | indent 2 }}


I don't like this. Values.storage.elasticsearch.index_prefix is a separate domain-specific configuration language that exists only in the Operator - why do we need it? The users can provide their own custom config if they want to customize these things. If we still want to allow overriding specific fields of the built-in configuration, then those overrides should be using the OTEL config syntax, e.g. Values.config.extensions.jaeger_storage...etc...

I wanted to keep the flag syntax same as jaeger-v1 so if the users wants to run it with old flag he can set it that way and helm will use es-user-conifg.yaml for that but if the user wants to provide there own config he can use the -set-file flag in that case we will use user-config.yaml

The old chart had no choice but to invent a new configuration scheme since jaeger-v1 did not support configuration, only cli flags. V2 supports configuration, so using a different scheme in the operator means the user needs to learn two different schemes, jaeger config and operator config. We need to avoid it. Use new scheme only when absolutely necessary, like in provision storage instructions, but for everything that can already be expressed in otel config just use that config directly.

yurishkuro · 2024-11-10T22:19:24Z

user-config.yaml

@@ -0,0 +1,45 @@
+service:


should this file be called user-config.yaml? It's ES-specific.

No, if the user provides their own config, this will be used instead of es-user-config.yaml.

is this file meant to be an example config?

Please add comments in the header explaining the purpose of the file

.github/workflows/lint-test.yaml

Signed-off-by: mehul <mehulsharma4786@gmail.com>

…elm-charts into jaeger-v2-with-v1

yurishkuro

please document in the README how the user is expected to use the chart with ES, using different options such as providing params via --set or a full config via --set-file

charts/jaeger/templates/es-configmap.yaml

charts/jaeger/values.yaml

yurishkuro · 2024-11-12T01:03:50Z

user-config.yaml

@@ -0,0 +1,45 @@
+service:


is this file meant to be an example config?

Signed-off-by: mehul <mehulsharma4786@gmail.com>

.github/workflows/lint-test.yaml

charts/jaeger/README-v2.md

.github/workflows/lint-test.yaml

charts/jaeger/templates/es-configmap.yaml

charts/jaeger/values.yaml

yurishkuro · 2024-11-14T20:52:05Z

user-config.yaml

@@ -0,0 +1,45 @@
+service:


Please add comments in the header explaining the purpose of the file

Signed-off-by: mehul <mehulsharma4786@gmail.com>

yurishkuro · 2024-11-18T18:49:46Z

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"


Can you elaborate why this variable is defined in annotations instead of values.yaml? What is the significance of having it here?

charts/jaeger/templates/user-config.yaml

charts/jaeger/templates/query-svc.yaml

charts/jaeger/templates/agent-ds.yaml

Signed-off-by: mehul <mehulsharma4786@gmail.com>

charts/jaeger/values.yaml

charts/jaeger/templates/collector-deploy.yaml

Signed-off-by: mehul <mehulsharma4786@gmail.com>

rgaduput and others added 21 commits October 21, 2024 02:04

Merge branch 'main' into jaeger-v2-with-v1

7212b86

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

minor changes

9e73b35

Signed-off-by: mehul <mehulsharam4786@gmail.com>

Merge branch 'jaeger-v2-with-v1' of https://github.com/hellspawn679/h…

0dd3924

…elm-charts into jaeger-v2-with-v1

added image changes

f7db758

Signed-off-by: mehul <mehulsharam4786@gmail.com>

fix lint

b980560

Signed-off-by: mehul <mehulsharam4786@gmail.com>

removed v1 allInOne and added jaeger-v2

d9aa942

Signed-off-by: mehul <mehulsharam4786@gmail.com>

removed v2 references

01d341b

Signed-off-by: mehul <mehulsharam4786@gmail.com>

added allInOne again

ee12ee4

Signed-off-by: mehul <mehulsharam4786@gmail.com>

minor fix

3012649

Signed-off-by: mehul <mehulsharam4786@gmail.com>

fixed how the config is being passed

1ea257d

Signed-off-by: mehul <mehulsharam4786@gmail.com>

fixed mirror template change

42c30a0

Signed-off-by: mehul <mehulsharam4786@gmail.com>

use --set-file for user config

f247a95

Signed-off-by: mehul <mehulsharam4786@gmail.com>

removed config-test and updated configmap template

647f7fa

Signed-off-by: mehul <mehulsharam4786@gmail.com>

fixed

8069914

Signed-off-by: mehul <mehulsharam4786@gmail.com>

Merge branch 'v2' into jaeger-v2-with-v1

742febb

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

fixed minor naming

b6bbc4b

Signed-off-by: mehul <mehulsharma4786@gmail.com>

indentation

7a24558

Signed-off-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>

v2-elasticsearch

5c0e7ba

Signed-off-by: mehul <mehulsharma4786@gmail.com>

fix ci

69455e7

Signed-off-by: mehul <mehulsharma4786@gmail.com>

fix ci

44c7298

Signed-off-by: mehul <mehulsharma4786@gmail.com>

hellspawn679 requested review from davidvonthenen, naseemkullah and pavelnikolov as code owners November 8, 2024 12:24

Merge branch 'v2' into jaeger-v2-with-v1

bf68edc

Signed-off-by: mehul gautam <mehulsharma4786@gmail.com>

yurishkuro reviewed Nov 10, 2024

View reviewed changes

charts/jaeger/Chart.yaml Outdated Show resolved Hide resolved

yurishkuro reviewed Nov 10, 2024

View reviewed changes

charts/jaeger/templates/collector-svc.yaml Outdated Show resolved Hide resolved

yurishkuro reviewed Nov 10, 2024

View reviewed changes

pavelnikolov reviewed Nov 11, 2024

View reviewed changes

.github/workflows/lint-test.yaml Outdated Show resolved Hide resolved

pavelnikolov reviewed Nov 11, 2024

View reviewed changes

.github/workflows/lint-test.yaml Outdated Show resolved Hide resolved

hellspawn679 added 2 commits November 12, 2024 01:27

fixed

6fdf55a

Signed-off-by: mehul <mehulsharma4786@gmail.com>

Merge branch 'jaeger-v2-with-v1' of https://github.com/hellspawn679/h…

c3a7493

…elm-charts into jaeger-v2-with-v1

hellspawn679 requested review from yurishkuro and pavelnikolov November 11, 2024 21:43

yurishkuro reviewed Nov 12, 2024

View reviewed changes

fixed and added docs

912de03

Signed-off-by: mehul <mehulsharma4786@gmail.com>

yurishkuro changed the title ~~[Jaeger] Jaeger v2 with v1~~ [jaeger-v2] Add support for Elasticsearch Nov 13, 2024

hellspawn679 requested a review from yurishkuro November 14, 2024 19:53

yurishkuro reviewed Nov 14, 2024

View reviewed changes

hellspawn679 added 2 commits November 18, 2024 21:33

fixed

d82e1cb

Signed-off-by: mehul <mehulsharma4786@gmail.com>

added port

e70863b

Signed-off-by: mehul <mehulsharma4786@gmail.com>

hellspawn679 requested a review from yurishkuro November 18, 2024 16:12

yurishkuro reviewed Nov 18, 2024

View reviewed changes

charts/jaeger/templates/user-config.yaml Outdated Show resolved Hide resolved

yurishkuro reviewed Nov 18, 2024

View reviewed changes

charts/jaeger/templates/query-svc.yaml Outdated Show resolved Hide resolved

yurishkuro reviewed Nov 18, 2024

View reviewed changes

charts/jaeger/templates/agent-ds.yaml Outdated Show resolved Hide resolved

fixed

b2a3977

Signed-off-by: mehul <mehulsharma4786@gmail.com>

hellspawn679 requested a review from yurishkuro November 18, 2024 22:06

yurishkuro reviewed Nov 19, 2024

View reviewed changes

charts/jaeger/values.yaml Outdated Show resolved Hide resolved

yurishkuro reviewed Nov 19, 2024

View reviewed changes

charts/jaeger/templates/collector-deploy.yaml Outdated Show resolved Hide resolved

hellspawn679 added 3 commits November 19, 2024 20:39

fixed

7eabf48

Signed-off-by: mehul <mehulsharma4786@gmail.com>

fixed typo

0ad61d2

Signed-off-by: mehul <mehulsharma4786@gmail.com>

fixed

c07f325

Signed-off-by: mehul <mehulsharma4786@gmail.com>

hellspawn679 requested a review from yurishkuro November 19, 2024 16:00

hellspawn679 added 2 commits November 19, 2024 23:09

removed test config

8700626

Signed-off-by: mehul <mehulsharma4786@gmail.com>

updated docs

37eb6ec

Signed-off-by: mehul <mehulsharma4786@gmail.com>

yurishkuro approved these changes Nov 19, 2024

View reviewed changes

yurishkuro merged commit e9655bc into jaegertracing:v2 Nov 19, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[jaeger-v2] Add support for Elasticsearch #617

[jaeger-v2] Add support for Elasticsearch #617

hellspawn679 commented Nov 8, 2024 •

edited

Loading

yurishkuro commented Nov 10, 2024

yurishkuro Nov 10, 2024

hellspawn679 Nov 11, 2024

yurishkuro Nov 11, 2024

yurishkuro Nov 10, 2024

hellspawn679 Nov 11, 2024

yurishkuro Nov 12, 2024

yurishkuro Nov 14, 2024

yurishkuro Nov 18, 2024

yurishkuro left a comment

yurishkuro Nov 12, 2024

yurishkuro Nov 14, 2024

yurishkuro Nov 18, 2024

[jaeger-v2] Add support for Elasticsearch #617

[jaeger-v2] Add support for Elasticsearch #617

Conversation

hellspawn679 commented Nov 8, 2024 • edited Loading

What this PR does

Which issue this PR fixes

Checklist

yurishkuro commented Nov 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hellspawn679 commented Nov 8, 2024 •

edited

Loading