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

Jump to bottom

Added Rabbitmq receiver to the Splunk distribution of Otel Collector. #4980

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Added Rabbitmq receiver to the Splunk distribution of Otel Collector. #4980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cd14f0
Fix ansible tests for centos 8 (#4992)
jeffreyc-splunk Jun 17, 2024
ce916b3
Added Rabbitmq receiver to the Splunk distribution of Otel Collector.
samiura Jun 15, 2024
45cc3ac
added changlong for the new receiver
samiura Jun 15, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### 🚀 New components 🚀

- (Splunk) Add [upstream](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/rabbitmqreceiver) Opentelemetry Collector RabbitMQ receiver ([#4980](https://github.com/signalfx/splunk-otel-collector/pull/4980))

## v0.102.1

### 🧰 Bug fixes 🧰
Expand Down
6 changes: 1 addition & 5 deletions deployments/ansible/molecule/default/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{% if item.image not in ["opensuse12", "opensuse15", "centos9"] %}
FROM geerlingguy/docker-{{ item.image }}-ansible:latest
{% if item.image == "centos8" %}
RUN sed -i 's|#mirrorlist|mirrorlist|g' /etc/yum.repos.d/CentOS*.repo
RUN sed -i 's|^baseurl|#baseurl|' /etc/yum.repos.d/CentOS*.repo
RUN sed -i 's|\$releasever|8-stream|g' /etc/yum.repos.d/CentOS*.repo
{% elif item.image == "debian9" %}
{% if item.image == "debian9" %}
RUN sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list
RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
{% endif %}
Expand Down
1 change: 1 addition & 0 deletions docs/components.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ The distribution offers support for the following components.
| [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) | [stable] |
| [postgres](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/postgresqlreceiver) | [beta] |
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/prometheusreceiver) | [beta] |
| [rabbitmqreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/rabbitmqreceiver) | [beta] |
| [receiver_creator](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/receivercreator) | [beta] |
| [redis](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/redisreceiver) | [beta] |
| [sapm](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/sapmreceiver) | [beta] |
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.102.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlrec
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.102.0/go.mod h1:bf10iFlW4rF2+g9xtZeOtNcW5DsdYXlKZ3vhCkQzt68=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.102.0 h1:RB12IhSeXEt1y6nGtVvlqWtuzR3q/u33WFkjnot5mVg=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.102.0/go.mod h1:F6Nl+wlY/83a4wu2T6X6L4m0+ZBkzNqWjmyzYlHIQ3Q=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.102.0 h1:8Ni82SnRcS+f3wKxWdBak9uTUcarO5bgTT22r0RXqTM=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver v0.102.0/go.mod h1:tuHj+CX1sWuV+HDhKwflHpdgTCeh5vM8oGiQsqIP1mY=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.102.0 h1:JOscHzbGJ87NkDD0/ON6mwNdQcmtCkhK7+2lgOfVV7E=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.102.0/go.mod h1:5/1qR2JQh+B9r/M106Nd6vDfn9Xp2ILbT++X6GWCdyk=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.102.0 h1:YNvIRhtrY0wM8O5uF/YdH79fmV7WbbO0qNLRk55YV2M=
Expand Down
2 changes: 2 additions & 0 deletions internal/components/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver"
Expand Down Expand Up @@ -180,6 +181,7 @@ func Get() (otelcol.Factories, error) {
otlpreceiver.NewFactory(),
postgresqlreceiver.NewFactory(),
prometheusreceiver.NewFactory(),
rabbitmqreceiver.NewFactory(),
receivercreator.NewFactory(),
redisreceiver.NewFactory(),
sapmreceiver.NewFactory(),
Expand Down
1 change: 1 addition & 0 deletions internal/components/components_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ func TestDefaultComponents(t *testing.T) {
"postgresql",
"prometheus",
"prometheus_simple",
"rabbitmq",
"receiver_creator",
"redis",
"sapm",
Expand Down
Loading