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

[chore] Minor updates #40

Merged
merged 4 commits into from
Jul 16, 2024
Merged

[chore] Minor updates #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
940300b
align docs
bpschmitt Jul 16, 2024
c05f423
add cluster name and change frontendproxy service type defaults
bpschmitt Jul 16, 2024
908effd
remove flagd override
bpschmitt Jul 16, 2024
0a38445
remove custom flagd configmap
bpschmitt Jul 16, 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
2 changes: 1 addition & 1 deletion docs/kubernetes_deployment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ helm upgrade --install newrelic-otel open-telemetry/opentelemetry-demo --values
helm upgrade --install newrelic-otel open-telemetry/opentelemetry-demo --values ./helm/values.yaml --set opentelemetry-collector.config.exporters.otlp.endpoint="otlp.eu01.nr-data.net:4317" -n opentelemetry-demo
```

## (optional) New Relic Overrides
## New Relic Overrides (Optional)

Optionally, you can enable a version of the `recommendationService` that is instrumented with New Relic APM instead of OpenTelemetry. New Relic APM instrumented services are interoperable with OpenTelemetry instrumented services as New Relic supports W3C trace context.

Expand Down
123 changes: 0 additions & 123 deletions helm/flagd_override_values.yaml
View file
Open in desktop

This file was deleted.

22 changes: 12 additions & 10 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
fieldRef:
apiVersion: v1
fieldPath: metadata.uid
- name: OTEL_K8S_CLUSTER_NAME
value: opentelemetry-demo
- name: OTEL_COLLECTOR_NAME
value: '{{ include "otel-demo.name" . }}-otelcol'
- name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
Expand All @@ -38,7 +40,8 @@
service.instance.id=$(OTEL_K8S_POD_NAME),
k8s.pod.uid=$(OTEL_K8S_POD_UID),
k8s.node.name=$(OTEL_K8S_NODE_NAME),
k8s.pod.name=$(OTEL_K8S_POD_NAME)
k8s.pod.name=$(OTEL_K8S_POD_NAME),
k8s.cluster.name=$(OTEL_K8S_CLUSTER_NAME)
# Allows overriding and additions to .Values.default.env
envOverrides: []
# - name: OTEL_K8S_NODE_NAME
Expand Down Expand Up @@ -71,8 +74,8 @@

components:
# configuring load balancer
frontendProxy:
serviceType: LoadBalancer
# frontendProxy:
# serviceType: LoadBalancer
## Demo Components are named objects (services) with several properties
# demoService:
## Enable the component (service)
Expand Down Expand Up @@ -431,8 +434,6 @@
runAsUser: 101 # envoy
runAsGroup: 101
runAsNonRoot: true
service:
type: LoadBalancer

imageprovider:
enabled: true
Expand Down Expand Up @@ -672,7 +673,7 @@
enabled: true
resources:
limits:
memory: 200Mi
memory: 250Mi
service:
type: ClusterIP
ports:
Expand Down Expand Up @@ -734,26 +735,27 @@
detectors: [env]
resource:
attributes:
- key: service.instance.id

Check failure on line 738 in helm/values.yaml

View workflow job for this annotation

GitHub Actions / yamllint 

738:9 [indentation] wrong indentation: expected 10 but found 8
from_attribute: k8s.pod.uid
action: insert

connectors:
spanmetrics: {}
# connectors:
# spanmetrics: {}

service:
pipelines:
traces:
processors: [memory_limiter, resource, resourcedetection, batch]
exporters: [otlphttp/newrelic, debug, spanmetrics]
exporters: [otlphttp/newrelic, debug]
# exporters: [otlp, debug, spanmetrics]
metrics:
receivers: [httpcheck/frontendproxy, redis, otlp, spanmetrics]
# receivers: [httpcheck/frontendproxy, redis, otlp, spanmetrics]
receivers: [httpcheck/frontendproxy, redis, otlp]
processors: [memory_limiter, resource, resourcedetection, batch]
exporters: [otlphttp/newrelic, debug]
# exporters: [otlphttp/prometheus, debug]
logs:
processors: [memory_limiter, resource,resourcedetection, batch]

Check failure on line 758 in helm/values.yaml

View workflow job for this annotation

GitHub Actions / yamllint 

758:49 [commas] too few spaces after comma
exporters: [otlphttp/newrelic, debug]
# exporters: [opensearch, debug]

Expand Down Expand Up @@ -928,3 +930,3 @@
value: "true"
resources:
limits:
Expand Down
Loading