Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions example/otel-elastic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ If you use Quickstart you do not need to install/deploy any additional resources
The container gateway configuration required for this integration is relatively simple. We will set some environment variables in our OTel [instrumentation](./instrumentation.yaml) that the Otel Agent present on the Container Gateway will use to send logs, traces and metrics to the Otel Collector sidecar.

```
apiVersion: opentelemetry.io/v1alpha1
apiVersion: opentelemetry.io/v1beta1
kind: Instrumentation
metadata:
name: otel-instrumentation
Expand Down Expand Up @@ -398,7 +398,7 @@ export elasticPass=$(kubectl get secret quickstart-es-elastic-user -o go-templat
```
Create Dashboard
```
curl -XPOST https://kibana.brcmlabs.com/api/saved_objects/_import?createNewCopies=false -H "kbn-xsrf: true" -k -uelastic:$elasticPass -F "file=@./otel-elastic/dashboard/apim-dashboard.ndjson"
curl -XPOST "https://kibana.brcmlabs.com/api/saved_objects/_import?createNewCopies=false" -H "kbn-xsrf: true" -k -uelastic:$elasticPass -F "file=@./otel-elastic/dashboard/apim-dashboard.ndjson"
```

- wait for all components to be ready
Expand Down
6 changes: 3 additions & 3 deletions example/otel-elastic/collector.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: opentelemetry.io/v1alpha1
apiVersion: opentelemetry.io/v1beta1
kind: OpenTelemetryCollector
metadata:
name: ssg-eck
spec:
image: otel/opentelemetry-collector-contrib:0.97.0
image: otel/opentelemetry-collector-contrib:0.147.0
mode: sidecar
config: |
config:
receivers:
otlp:
protocols:
Expand Down
4 changes: 2 additions & 2 deletions example/otel-elastic/components/agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Agent
metadata:
name: elastic-agent
spec:
version: 8.8.2
version: 9.3.1
elasticsearchRefs:
- name: quickstart
daemonSet:
Expand Down Expand Up @@ -38,7 +38,7 @@ spec:
meta:
package:
name: kubernetes
version: 0.2.8
version: 1.35.2
data_stream:
namespace: k8s
streams:
Expand Down
2 changes: 1 addition & 1 deletion example/otel-elastic/components/apm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ApmServer
metadata:
name: apm-server-quickstart
spec:
version: 8.8.2
version: 9.3.1
count: 1
elasticsearchRef:
name: quickstart
Expand Down
2 changes: 1 addition & 1 deletion example/otel-elastic/components/es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ spec:
certificate: {}
updateStrategy:
changeBudget: {}
version: 8.8.2
version: 9.3.1
2 changes: 1 addition & 1 deletion example/otel-elastic/components/filebeat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: filebeat
spec:
type: filebeat
version: 8.8.2
version: 9.3.1
elasticsearchRef:
name: quickstart
kibanaRef:
Expand Down
2 changes: 1 addition & 1 deletion example/otel-elastic/components/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kibana
metadata:
name: quickstart
spec:
version: 8.8.2
version: 9.3.1
count: 1
elasticsearchRef:
name: quickstart
Expand Down
4 changes: 2 additions & 2 deletions example/otel-elastic/components/metricbeat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: metricbeat
spec:
type: metricbeat
version: 8.8.2
version: 9.3.1
elasticsearchRef:
name: quickstart
kibanaRef:
Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
- -e
- -c
- /etc/beat.yml
- -system.hostfs=/hostfs
- --system.hostfs=/hostfs
name: metricbeat
volumeMounts:
- mountPath: /hostfs/sys/fs/cgroup
Expand Down
4 changes: 2 additions & 2 deletions example/otel-elastic/dashboard/apim-dashboard.ndjson

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example/otel-elastic/instrumentation.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: opentelemetry.io/v1alpha1
apiVersion: opentelemetry.io/v1beta1
kind: Instrumentation
metadata:
name: otel-instrumentation
Expand Down
Loading