Merge branch 'main' into disable-go-metrics

open-telemetry · Oct 30, 2023 · 9198c56 · 9198c56
2 parents f8fdc3d + 3a00b49
commit 9198c56
Show file tree

Hide file tree

Showing 3 changed files with 320 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,10 @@ release.
   ([#1180](https://github.com/open-telemetry/opentelemetry-demo/pull/1180))
 * [java-services] Update java, gradle and OTel agent versions
   ([#1183](https://github.com/open-telemetry/opentelemetry-demo/pull/1183))
+* [opensearch] Add OpenSearch as an OTLP Logging backend
+  ([#1151](https://github.com/open-telemetry/opentelemetry-demo/pull/1151))
+* [opensearch] Add Grafana dashboard panels for OpenSearch log data
+  ([#1193](https://github.com/open-telemetry/opentelemetry-demo/pull/1193))
 
 ## 1.5.0
 

diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ Monday at 8:30 AM PST and anyone is welcome.
 [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
 ([@open-telemetry/demo-maintainers](https://github.com/orgs/open-telemetry/teams/demo-maintainers)):
 
-- [Austin Parker](https://github.com/austinlparker), Lightstep
+- [Austin Parker](https://github.com/austinlparker), Honeycomb
 - [Carter Socha](https://github.com/cartersocha), Lightstep
 - [Juliano Costa](https://github.com/julianocosta89), Dynatrace
 - [Pierre Tessier](https://github.com/puckpuck), Honeycomb