Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move prometheus exporter config to use readers #1337

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from
Draft

move prometheus exporter config to use readers #1337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ac4ee9c
move prometheus exporter config to use readers
codeboten Sep 9, 2024
e4adb40
missed a file
codeboten Sep 9, 2024
a650880
Merge branch 'main' into codeboten/prom-use-readers
codeboten Oct 1, 2024
c32b184
[opentelemetry-kube-stack]: Fix missing "release" label to openteleme…
davidcaste Oct 2, 2024
8a57314
Update default collector to 0.111.0 (#1369)
TylerHelmuth Oct 4, 2024
891804d
[opentelemetry-kube-stack]: Fix "Additional property selector is not …
suresh-target Oct 5, 2024
5234e27
Bump kyverno/action-install-chainsaw from 0.2.10 to 0.2.11 (#1373)
dependabot[bot] Oct 7, 2024
4ea4523
[chore] bump operator to 109 (#1374)
jaronoff97 Oct 7, 2024
5d51c1c
[chore] Bump operator to 0.110.0 (#1376)
swiatekm Oct 9, 2024
09ca308
[kube-stack] Bump opentelemetry-operator chart to 0.71 (#1384)
rogercoll Oct 15, 2024
2ee8b73
[opentelemetry-kube-stack] Adding additional labels (#1388)
suresh-target Oct 17, 2024
d056e64
Fix volume and mount indentation (#1390)
jaronoff97 Oct 17, 2024
c7ff3b1
[opentelemetry-operator] Fix Collector CRD referencing disabled webho…
ElderMael Oct 18, 2024
5375e7d
[kube-stack] Bump operator chart dependency version (#1393)
rogercoll Oct 21, 2024
5ae819a
[opentelemetry-operator] Update kube-rbac-proxy image to 0.18.1 to re…
edwintye Oct 28, 2024
18c43b8
docs: docs: adjust a description error in NOTES.txt file (#1395)
dartagnanli Nov 1, 2024
4d6748c
[operator] Bump default version to v0.111.0 (#1405)
TylerHelmuth Nov 1, 2024
32801f5
Deploy podmonitor for all modes (#1407)
Infogrid-MattBuckland Nov 5, 2024
31585fa
[demo] - update to 1.12 release including new flagd UI (#1367)
klucsik Nov 5, 2024
faea2ea
[operator] bump default version to v0.112.0 (#1410)
TylerHelmuth Nov 7, 2024
72afabd
[collector] bump default version to v0.113.0 (#1409)
TylerHelmuth Nov 7, 2024
58ba623
Release operator 0.113.0 (#1411)
pavolloffay Nov 12, 2024
4409d4d
feat: Add ability to configure extra resources based on feature gates…
thefirstofthe300 Nov 13, 2024
90f1f3f
fix: Configure feature gates appropriately (#1414)
thefirstofthe300 Nov 13, 2024
d7f6f42
Revert "missed a file"
codeboten Nov 14, 2024
5c51ff8
Revert "move prometheus exporter config to use readers"
codeboten Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,9 @@ data:
- otlp
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion ...opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-collector/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,12 @@ config:
service:
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be equivalent for anyone who is not configuring config.service.telemetry.metrics.address but what will happen if someone has done something like --set config.service.telemetry.metrics.address=${env:MY_POD_IP}:9090?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there would be 2 prometheus ports exposed in that case

Copy link
Member

@TylerHelmuth TylerHelmuth Sep 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should introduce a template in config that will build the reader yaml from .Values.config.service.telemetry.metrics.address if it is set and otherwise use .Values.config.service.telemetry.metrics.readers.

extensions:
- health_check
pipelines:
Expand Down
7 changes: 6 additions & 1 deletion ...emo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion ...emo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion ...xamples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
7 changes: 6 additions & 1 deletion ...metry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,9 @@ data:
- zipkin
telemetry:
metrics:
address: ${env:MY_POD_IP}:8888
readers:
- pull:
exporter:
prometheus:
host: ${env:MY_POD_IP}
port: 8888
Loading