[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 <[email protected]> upgrade jaeger-operator to latest 1.61.0 (jaegertracing#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]>

Signed-off-by: mehul gautam <[email protected]>

Signed-off-by: mehul <[email protected]>

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

Signed-off-by: mehul <[email protected]>

Signed-off-by: mehul gautam <[email protected]>

Signed-off-by: mehul <[email protected]>

Signed-off-by: Yuri Shkuro <[email protected]>

Signed-off-by: mehul <[email protected]>

Signed-off-by: mehul gautam <[email protected]>

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 <[email protected]>

…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 <[email protected]>

.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 <[email protected]>

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

charts/jaeger/Chart.yaml

 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 <[email protected]>

charts/jaeger/values.yaml

charts/jaeger/templates/collector-deploy.yaml

Signed-off-by: mehul <[email protected]>

* Jaeger v2 with v1 (#613) * Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi <[email protected]> upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]> * minor changes Signed-off-by: mehul <[email protected]> * added image changes Signed-off-by: mehul <[email protected]> * fix lint Signed-off-by: mehul <[email protected]> * removed v1 allInOne and added jaeger-v2 Signed-off-by: mehul <[email protected]> * removed v2 references Signed-off-by: mehul <[email protected]> * added allInOne again Signed-off-by: mehul <[email protected]> * minor fix Signed-off-by: mehul <[email protected]> * fixed how the config is being passed Signed-off-by: mehul <[email protected]> * fixed mirror template change Signed-off-by: mehul <[email protected]> * use --set-file for user config Signed-off-by: mehul <[email protected]> * removed config-test and updated configmap template Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed minor naming Signed-off-by: mehul <[email protected]> * indentation Signed-off-by: Yuri Shkuro <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> * [jaeger-v2] Add support for Elasticsearch (#617) * Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi <[email protected]> upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]> * minor changes Signed-off-by: mehul <[email protected]> * added image changes Signed-off-by: mehul <[email protected]> * fix lint Signed-off-by: mehul <[email protected]> * removed v1 allInOne and added jaeger-v2 Signed-off-by: mehul <[email protected]> * removed v2 references Signed-off-by: mehul <[email protected]> * added allInOne again Signed-off-by: mehul <[email protected]> * minor fix Signed-off-by: mehul <[email protected]> * fixed how the config is being passed Signed-off-by: mehul <[email protected]> * fixed mirror template change Signed-off-by: mehul <[email protected]> * use --set-file for user config Signed-off-by: mehul <[email protected]> * removed config-test and updated configmap template Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed minor naming Signed-off-by: mehul <[email protected]> * indentation Signed-off-by: Yuri Shkuro <[email protected]> * v2-elasticsearch Signed-off-by: mehul <[email protected]> * fix ci Signed-off-by: mehul <[email protected]> * fix ci Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed and added docs Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * added port Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed typo Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * removed test config Signed-off-by: mehul <[email protected]> * updated docs Signed-off-by: mehul <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> * bump python (#649) * Allow Configurable path for livenessProbe and readinessProbe in hotrod (#647) Signed-off-by: chahat sagar <[email protected]> * [jaeger] Add default probes path for hotrod (#651) * add deafult path Signed-off-by: chahat sagar <[email protected]> * fix Signed-off-by: chahat sagar <[email protected]> * add deafult path Signed-off-by: chahat sagar <[email protected]> --------- Signed-off-by: chahat sagar <[email protected]> * add ui-config (#654) * Remove Operator chart Signed-off-by: Yuri Shkuro <[email protected]> * Fix ES test by overriding Bitnami images Elasticsearch subchart (#661) * Fix ES test by overriding Bitnami images for provisioned Elasticsearch Signed-off-by: danish9039 <[email protected]> * . Signed-off-by: danish9039 <[email protected]> --------- Signed-off-by: danish9039 <[email protected]> * Update README to remove Jaeger-v2 note Removed outdated note about Helm Chart for Jaeger-v2. Signed-off-by: Yuri Shkuro <[email protected]> * Update main chart's README to reflect v2 specifics (#663) * Initial plan * Merge README files for Jaeger v2 chart - Updated introduction to reflect Jaeger v2 architecture (unified binary on OTel Collector framework) - Updated default deployment description (allInOne mode with memory storage) - Added new YAML-based configuration section showing OTel Collector format - Added userconfig parameter documentation - Updated storage configuration to use jaeger_storage extension format - Added Storage Configuration Options with primary and archive store settings - Updated Elasticsearch installation examples for v2 architecture - Added notes about legacy components (Cassandra, Ingester, grpc-plugin) - Added Separate Collector and Query Mode section for production deployments - Removed outdated references to jaeger-agent DaemonSet as default - Updated dependency documentation (removed deprecated incubator repo) - Fixed typo: "Offical" -> "Official" Co-authored-by: yurishkuro <[email protected]> * Create merged README.md for Jaeger v2 chart (from v2 branch) Merged content from README.md and README-v2.md in the v2 branch: - Updated introduction to reflect Jaeger v2 architecture (unified binary on OTel Collector framework) - Updated default deployment description (allInOne mode with memory storage) - Added new YAML-based configuration section showing OTel Collector format - Added userconfig parameter documentation - Updated storage configuration to use jaeger_storage extension format - Added Storage Configuration Options with primary and archive store settings - Updated Elasticsearch installation examples for v2 architecture - Added notes about legacy components (Cassandra, Ingester, grpc-plugin) - Added Separate Collector and Query Mode section for production deployments - Removed outdated references to jaeger-agent DaemonSet as default - Updated dependency documentation (removed deprecated incubator repo) - Fixed typo: "Offical" -> "Official" - Fixed typo: "Updating to Kafka to" -> "Updating Kafka to" Note: README-v2.md should be deleted from v2 branch after merging this PR Co-authored-by: yurishkuro <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: yurishkuro <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: chahat sagar <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: danish9039 <[email protected]> Co-authored-by: mehul gautam <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: chahat sagar <[email protected]> Co-authored-by: hippie-danish <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: yurishkuro <[email protected]>

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 <[email protected]>

minor changes

9e73b35

Signed-off-by: mehul <[email protected]>

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 <[email protected]>

fix lint

b980560

Signed-off-by: mehul <[email protected]>

removed v1 allInOne and added jaeger-v2

d9aa942

Signed-off-by: mehul <[email protected]>

removed v2 references

01d341b

Signed-off-by: mehul <[email protected]>

added allInOne again

ee12ee4

Signed-off-by: mehul <[email protected]>

minor fix

3012649

Signed-off-by: mehul <[email protected]>

fixed how the config is being passed

1ea257d

Signed-off-by: mehul <[email protected]>

fixed mirror template change

42c30a0

Signed-off-by: mehul <[email protected]>

use --set-file for user config

f247a95

Signed-off-by: mehul <[email protected]>

removed config-test and updated configmap template

647f7fa

Signed-off-by: mehul <[email protected]>

fixed

8069914

Signed-off-by: mehul <[email protected]>

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

742febb

Signed-off-by: mehul gautam <[email protected]>

fixed minor naming

b6bbc4b

Signed-off-by: mehul <[email protected]>

indentation

7a24558

Signed-off-by: Yuri Shkuro <[email protected]>

v2-elasticsearch

5c0e7ba

Signed-off-by: mehul <[email protected]>

fix ci

69455e7

Signed-off-by: mehul <[email protected]>

fix ci

44c7298

Signed-off-by: mehul <[email protected]>

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 <[email protected]>

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

hellspawn679 added 2 commits November 12, 2024 01:27

fixed

6fdf55a

Signed-off-by: mehul <[email protected]>

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

c3a7493

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

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

yurishkuro reviewed Nov 12, 2024

View reviewed changes

fixed and added docs

912de03

Signed-off-by: mehul <[email protected]>

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 <[email protected]>

added port

e70863b

Signed-off-by: mehul <[email protected]>

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 <[email protected]>

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 <[email protected]>

fixed typo

0ad61d2

Signed-off-by: mehul <[email protected]>

fixed

c07f325

Signed-off-by: mehul <[email protected]>

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 <[email protected]>

updated docs

37eb6ec

Signed-off-by: mehul <[email protected]>

yurishkuro approved these changes Nov 19, 2024

View reviewed changes

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

[jaeger-v2] Add support for Elasticsearch #617

[jaeger-v2] Add support for Elasticsearch #617

Uh oh!

Conversation

hellspawn679 commented Nov 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does

Which issue this PR fixes

Checklist

Uh oh!

yurishkuro commented Nov 10, 2024

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yurishkuro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hellspawn679 commented Nov 8, 2024 •

edited

Loading