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

Use MY_POD_IP var for http receiver endpoint #909

Merged
merged 2 commits into from
Jun 5, 2023
Merged

Use MY_POD_IP var for http receiver endpoint #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92cb481
Regenerate kubernetes manifest and add autogenerate comment
isaschm Jun 2, 2023
ae9511e
Merge branch 'main' into kubernetes-make-http-receiver-accessible
puckpuck Jun 5, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ release.
([#904](https://github.com/open-telemetry/opentelemetry-demo/pull/904))
* [featureflagservice] Bump OTP version to 26.0
([#903](https://github.com/open-telemetry/opentelemetry-demo/pull/903))
* Regenerate kubernetes manifest and add auto-generate comment
([#909](https://github.com/open-telemetry/opentelemetry-demo/pull/909))
* [loadgenerator] fix redirect on recommendations load
([#913](https://github.com/open-telemetry/opentelemetry-demo/pull/913))

Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,5 @@ generate-kubernetes-manifests:
helm repo update
echo "# Copyright The OpenTelemetry Authors" > kubernetes/opentelemetry-demo.yaml
echo "# SPDX-License-Identifier: Apache-2.0" >> kubernetes/opentelemetry-demo.yaml
echo "# This file is generated by 'make generate-kubernetes-manifests'" >> kubernetes/opentelemetry-demo.yaml
helm template opentelemetry-demo open-telemetry/opentelemetry-demo --namespace otel-demo | sed '/helm.sh\/chart\:/d' | sed '/helm.sh\/hook/d' | sed '/managed-by\: Helm/d' >> kubernetes/opentelemetry-demo.yaml
67 changes: 33 additions & 34 deletions kubernetes/opentelemetry-demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0
# This file is generated by 'make generate-kubernetes-manifests'
---
# Source: opentelemetry-demo/charts/grafana/templates/serviceaccount.yaml
apiVersion: v1
Expand Down Expand Up @@ -31,7 +32,7 @@ metadata:
labels:
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: opentelemetry-demo
app.kubernetes.io/version: "0.75.0"
app.kubernetes.io/version: "0.76.1"
---
# Source: opentelemetry-demo/charts/prometheus/templates/serviceaccount.yaml
apiVersion: v1
Expand Down Expand Up @@ -152,7 +153,7 @@ metadata:
labels:
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: opentelemetry-demo
app.kubernetes.io/version: "0.75.0"
app.kubernetes.io/version: "0.76.1"
data:
relay: |
connectors:
Expand Down Expand Up @@ -193,31 +194,31 @@ data:
jaeger:
protocols:
grpc:
endpoint: ${MY_POD_IP}:14250
endpoint: ${env:MY_POD_IP}:14250
thrift_compact:
endpoint: ${MY_POD_IP}:6831
endpoint: ${env:MY_POD_IP}:6831
thrift_http:
endpoint: ${MY_POD_IP}:14268
endpoint: ${env:MY_POD_IP}:14268
otlp:
protocols:
grpc:
endpoint: ${MY_POD_IP}:4317
endpoint: ${env:MY_POD_IP}:4317
http:
cors:
allowed_origins:
- http://*
- https://*
endpoint: 127.0.0.1:4318
endpoint: 0.0.0.0:4318
prometheus:
config:
scrape_configs:
- job_name: opentelemetry-collector
scrape_interval: 10s
static_configs:
- targets:
- ${MY_POD_IP}:8888
- ${env:MY_POD_IP}:8888
zipkin:
endpoint: ${MY_POD_IP}:9411
endpoint: ${env:MY_POD_IP}:9411
service:
extensions:
- health_check
Expand Down Expand Up @@ -257,7 +258,7 @@ data:
- zipkin
telemetry:
metrics:
address: ${MY_POD_IP}:8888
address: ${env:MY_POD_IP}:8888
---
# Source: opentelemetry-demo/charts/prometheus/templates/cm.yaml
apiVersion: v1
Expand Down Expand Up @@ -4912,7 +4913,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"format": "time_series",
"hide": true,
"instant": false,
Expand All @@ -4928,7 +4929,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
"hide": false,
"instant": true,
"interval": "",
Expand All @@ -4943,7 +4944,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile99",
Expand All @@ -4957,7 +4958,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile999",
Expand Down Expand Up @@ -5037,7 +5038,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,sum by (service_name) (rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
"expr": "topk(7,sum by (service_name) (rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))",
"format": "time_series",
"instant": true,
"interval": "",
Expand Down Expand Up @@ -5115,7 +5116,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
"expr": "topk(7,sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))",
"instant": true,
"interval": "",
"legendFormat": "{{service_name}}",
Expand Down Expand Up @@ -5288,7 +5289,7 @@ data:
"uid": "webstore-metrics"
},
"exemplar": false,
"expr": "topk(7, sum(rate(calls{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
"expr": "topk(7, sum(rate(calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -5301,7 +5302,7 @@ data:
"uid": "webstore-metrics"
},
"exemplar": false,
"expr": "topk(7, sum(rate(calls{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))",
"expr": "topk(7, sum(rate(calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))",
"format": "table",
"hide": false,
"instant": true,
Expand Down Expand Up @@ -5495,7 +5496,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"format": "time_series",
"hide": true,
"instant": false,
Expand All @@ -5511,7 +5512,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
"hide": false,
"instant": true,
"interval": "",
Expand All @@ -5526,7 +5527,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile99",
Expand All @@ -5540,7 +5541,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile999",
Expand Down Expand Up @@ -5611,7 +5612,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7, sum by (span_name,service_name)(increase(duration_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
"expr": "topk(7, sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
"instant": true,
"interval": "",
"legendFormat": "{{span_name}} [{{service_name}}]",
Expand Down Expand Up @@ -5715,7 +5716,7 @@ data:
},
"editorMode": "code",
"exemplar": true,
"expr": "topk(7,sum by (span_name,service_name)(increase(duration_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
"expr": "topk(7,sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
"instant": false,
"interval": "",
"legendFormat": "[{{service_name}}] {{span_name}}",
Expand Down Expand Up @@ -5744,14 +5745,14 @@ data:
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
"definition": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
"hide": 0,
"includeAll": true,
"multi": true,
"name": "service",
"options": [],
"query": {
"query": "query_result(count by (service_name)(count_over_time(calls[$__range])))",
"query": "query_result(count by (service_name)(count_over_time(calls_total[$__range])))",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand All @@ -5771,14 +5772,14 @@ data:
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))",
"definition": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))",
"hide": 0,
"includeAll": true,
"multi": true,
"name": "span_name",
"options": [],
"query": {
"query": "query_result(sum ({__name__=~\".*calls\",service_name=~\"$service\"}) by (span_name))",
"query": "query_result(sum ({__name__=~\".*calls_total\",service_name=~\"$service\"}) by (span_name))",
"refId": "StandardVariableQuery"
},
"refresh": 2,
Expand Down Expand Up @@ -6045,7 +6046,7 @@ metadata:
labels:
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: opentelemetry-demo
app.kubernetes.io/version: "0.75.0"
app.kubernetes.io/version: "0.76.1"
component: standalone-collector
spec:
type: ClusterIP
Expand Down Expand Up @@ -6729,7 +6730,7 @@ metadata:
labels:
app.kubernetes.io/name: otelcol
app.kubernetes.io/instance: opentelemetry-demo
app.kubernetes.io/version: "0.75.0"
app.kubernetes.io/version: "0.76.1"
spec:
replicas: 1
revisionHistoryLimit: 10
Expand All @@ -6743,7 +6744,7 @@ spec:
template:
metadata:
annotations:
checksum/config: f656fcfa8e308a9922ba2be0799513a217a25722c2abc9855ea3e09d534fa89c
checksum/config: 43d3318bb84ce994167ce160b46e0e06eb17a17b8de61b578bf4a3e97f4dcdd1
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand All @@ -6762,10 +6763,9 @@ spec:
command:
- /otelcol-contrib
- --config=/conf/relay.yaml
- --feature-gates=service.connectors
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.75.0"
image: "otel/opentelemetry-collector-contrib:0.76.1"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down Expand Up @@ -6808,7 +6808,6 @@ spec:
port: 13133
resources:
limits:
cpu: 256m
memory: 125Mi
volumeMounts:
- mountPath: /conf
Expand Down