Skip to content

Commit

Permalink
revert demo charts
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
Alex Boten committed Sep 28, 2023
1 parent f2bb9ae commit f759e68
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ data:
"renameByName": {
"Time": "",
"percent": "Percent",
"{exporter=\"debug\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
"{exporter=\"logging\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ data:
metrics:
exporters:
- prometheus
- debug
- logging
processors:
- k8sattributes
- memory_limiter
Expand All @@ -138,7 +138,7 @@ data:
traces:
exporters:
- otlp
- debug
- logging
- spanmetrics
processors:
- k8sattributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 39777c5c50cc7e0d6c56a42148c3ba956c4a14c5dd2593484e39c5071b786f49
checksum/config: 518c3ef7264131872ee1b376e06b047314401d2f476eff96eedaccab0f720a57
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ data:
"renameByName": {
"Time": "",
"percent": "Percent",
"{exporter=\"debug\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
"{exporter=\"logging\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ data:
metrics:
exporters:
- prometheus
- debug
- logging
processors:
- k8sattributes
- memory_limiter
Expand All @@ -145,7 +145,7 @@ data:
traces:
exporters:
- otlp
- debug
- logging
- spanmetrics
processors:
- k8sattributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: ed393caf306f4d8ed337fd1f8f582aa4c9a3281af2f8592a60d35f376d53dff2
checksum/config: 56a80372282ff051cb09972ca3e14235be5a2cb738818f70812bf9effc74e812
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ data:
"renameByName": {
"Time": "",
"percent": "Percent",
"{exporter=\"debug\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
"{exporter=\"logging\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ data:
metrics:
exporters:
- prometheus
- debug
- logging
processors:
- k8sattributes
- memory_limiter
Expand All @@ -136,7 +136,7 @@ data:
traces:
exporters:
- otlp
- debug
- logging
- spanmetrics
processors:
- k8sattributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: bebb4f0aca864376bb41acc1b61a18a97d3c3e7334371c3e492bd6932d658649
checksum/config: b80dddd04ba49616adbcd4b6beae151559b457a93866959f649eeab21a7d2728
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ data:
"renameByName": {
"Time": "",
"percent": "Percent",
"{exporter=\"debug\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
"{exporter=\"logging\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ data:
metrics:
exporters:
- prometheus
- debug
- logging
processors:
- k8sattributes
- memory_limiter
Expand All @@ -136,7 +136,7 @@ data:
traces:
exporters:
- otlp
- debug
- logging
- spanmetrics
processors:
- k8sattributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: bebb4f0aca864376bb41acc1b61a18a97d3c3e7334371c3e492bd6932d658649
checksum/config: b80dddd04ba49616adbcd4b6beae151559b457a93866959f649eeab21a7d2728
opentelemetry_community_demo: "true"
prometheus.io/port: "9464"
prometheus.io/scrape: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@
"renameByName": {
"Time": "",
"percent": "Percent",
"{exporter=\"debug\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
"{exporter=\"logging\", instance=\"otelcol:8888\", job=\"otel-collector\", service_instance_id=\"fbfa720a-ebf9-45c8-a79a-9d3b6021a663\", service_name=\"otelcol-contrib\", service_version=\"0.70.0\"}": ""
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-demo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,11 @@ opentelemetry-collector:
pipelines:
traces:
processors: [memory_limiter, resource, batch]
exporters: [otlp, debug, spanmetrics]
exporters: [otlp, logging, spanmetrics]
metrics:
receivers: [otlp, spanmetrics]
processors: [memory_limiter, filter/ottl, transform, resource, batch]
exporters: [prometheus, debug]
exporters: [prometheus, logging]

jaeger:
enabled: true
Expand Down

0 comments on commit f759e68

Please sign in to comment.