diff --git a/.changelog/1341.breaking.txt b/.changelog/1341.breaking.txt new file mode 100644 index 0000000000..921c91e76b --- /dev/null +++ b/.changelog/1341.breaking.txt @@ -0,0 +1 @@ +feat(exporter/syslog)!: replace syslog exporter with syslog exporter from opentelemetry-collector-contrib \ No newline at end of file diff --git a/README.md b/README.md index b62d48913b..c03b5789b4 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ In order to learn more, pleasee see [purpose of Sumo Logic Distribution for Open ## Supported OS and architectures | Linux | MacOS | Windows | -| ----------------------------- | ----------------------------- | --------------------------- | +|-------------------------------|-------------------------------|-----------------------------| | [amd64 (x86_64)][linux_amd64] | [amd64 (x86_64)][mac_amd64] | [amd64 (x86_64)][win_amd64] | | [arm64][linux_arm64] | [arm64 (Apple M1)][mac_arm64] | | @@ -66,19 +66,19 @@ The rest of the components in the table are pure upstream OpenTelemetry componen The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated. | Receivers | Processors | Exporters | Extensions | Connectors | -| :------------------------------------------------------: | :----------------------------------------------------------: | :------------------------------------: | :------------------------------------------: | :-----------------------------------: | +|:--------------------------------------------------------:|:------------------------------------------------------------:|:--------------------------------------:|:--------------------------------------------:|:-------------------------------------:| | [active_directory_ds][activedirectorydsreceiver] | [attributes][attributesprocessor] | [awss3][awss3exporter] | [asapclient][asapauthextension] | [forward][forwardconnector] | | [`active_directory_inv`][activedirectoryinvreceiver] | [batch][batchprocessor] | [carbon][carbonexporter] | [awsproxy][awsproxy] | [count][countconnector] | | [aerospike][aerospikereceiver] | [`cascading_filter`][cascadingfilterprocessor] | [debug][debugexporter] | [basicauth][basicauthextension] | [routing][routingconnector] | | [apache][apachereceiver] | [cumulativetodelta][cumulativetodeltaprocessor] | [file][fileexporter] | [bearertokenauth][bearertokenauthextension] | [servicegraph][servicegraphconnector] | | [awscloudwatch][awscloudwatchreceiver] | [deltatorate][deltatorateprocessor] | [kafka][kafkaexporter] | [db_storage][dbstorage] | [spanmetrics][spanmetricsconnector] | | [awscontainerinsight][awscontainerinsightreceiver] | [experimental_metricsgeneration][metricsgenerationprocessor] | [loadbalancing][loadbalancingexporter] | [docker_observer][dockerobserver] | | -| [awsecscontainermetrics][awsecscontainermetricsreceiver] | [filter][filterprocessor] | ⚠️ ~~[logging][loggingexporter]~~ ⚠️ | [ecs_observer][ecsobserver] | | +| [awsecscontainermetrics][awsecscontainermetricsreceiver] | [filter][filterprocessor] | ⚠️ ~~[logging][loggingexporter]~~ ⚠️ | [ecs_observer][ecsobserver] | | | [awsfirehose][awsfirehosereceiver] | [groupbyattrs][groupbyattrsprocessor] | [otlp][otlpexporter] | [ecs_task_observer][ecstaskobserver] | | | [awsxray][awsxrayreceiver] | [groupbytrace][groupbytraceprocessor] | [otlphttp][otlphttpexporter] | [file_storage][filestorage] | | | [azureeventhub][azureeventhubreceiver] | [`k8s_tagger`][k8sprocessor] | [prometheus][prometheusexporter] | [headerssetter][headerssetterextension] | | | [bigip][bigipreceiver] | [k8sattributes][k8sattributesprocessor] | [`sumologic`][sumologicexporter] | [health_check][healthcheckextension] | | -| [carbon][carbonreceiver] | [logstransform][logstransformprocessor] | [`syslog`][syslogexporter] | [host_observer][hostobserver] | | +| [carbon][carbonreceiver] | [logstransform][logstransformprocessor] | [syslog][syslogexporter] | [host_observer][hostobserver] | | | [chrony][chronyreceiver] | [memory_limiter][memorylimiterprocessor] | | [http_forwarder][httpforwarder] | | | [cloudflare][cloudflarereceiver] | [`metric_frequency`][metricfrequencyprocessor] | | [jaegerremotesampling][jaegerremotesampling] | | | [cloudfoundry][cloudfoundryreceiver] | [metricstransform][metricstransformprocessor] | | [k8s_observer][k8sobserver] | | @@ -89,12 +89,12 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated. | [elasticsearch][elasticsearchreceiver] | [resourcedetection][resourcedetectionprocessor] | | [sigv4auth][sigv4authextension] | | | [expvar][expvarreceiver] | [routing][routingprocessor] | | [`sumologic`][sumologicextension] | | | [filelog][filelogreceiver] | [schema][schemaprocessor] | | [zpages][zpagesextension] | | -| [filestats][filestatsreceiver] | ⚠️ ~~[servicegraph][servicegraphprocessor]~~ ⚠️ | | | | +| [filestats][filestatsreceiver] | ⚠️ ~~[servicegraph][servicegraphprocessor]~~ ⚠️ | | | | | [flinkmetrics][flinkmetricsreceiver] | [`source`][sourceprocessor] | | | | | [fluentforward][fluentforwardreceiver] | [span][spanprocessor] | | | | -| [googlecloudpubsub][googlecloudpubsubreceiver] | ⚠️ ~~[spanmetrics][spanmetricsprocessor]~~ ⚠️ | | | | +| [googlecloudpubsub][googlecloudpubsubreceiver] | ⚠️ ~~[spanmetrics][spanmetricsprocessor]~~ ⚠️ | | | | | [googlecloudspanner][googlecloudspannerreceiver] | [sumologic][sumologicprocessor] | | | | -| [haproxy][haproxyreceiver] | ⚠️ ~~[`sumologic_schema`][sumologicschemaprocessor]~~ ⚠️ | | | | +| [haproxy][haproxyreceiver] | ⚠️ ~~[`sumologic_schema`][sumologicschemaprocessor]~~ ⚠️ | | | | | [hostmetrics][hostmetricsreceiver] | [`sumologic_syslog`][sumologicsyslogprocessor] | | | | | [httpcheck][httpcheckreceiver] | [tail_sampling][tailsamplingprocessor] | | | | | [iis][iisreceiver] | [transform][transformprocessor] | | | | @@ -284,7 +284,7 @@ The ⚠️ ~~strikethrough~~ ⚠️ components are deprecated. [otlphttpexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.89.0/exporter/otlphttpexporter [prometheusexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.89.0/exporter/prometheusexporter [sumologicexporter]: ./pkg/exporter/sumologicexporter -[syslogexporter]: ./pkg/exporter/syslogexporter +[syslogexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.89.0/exporter/syslogexporter [asapauthextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.89.0/extension/asapauthextension [awsproxy]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.89.0/extension/awsproxy diff --git a/docs/migration.md b/docs/migration.md index f1be275011..f36f7f8b1b 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -2509,7 +2509,7 @@ Windows Active Directory Source is not supported by the OpenTelemetry Collector. [network-semantic-convention]: https://github.com/open-telemetry/semantic-conventions/blob/cee22ec91448808ebcfa53df689c800c7171c9e1/docs/general/attributes.md#other-network-attributes [sumologicextension]: ../pkg/extension/sumologicextension/README.md [sumologicexporter]: ../pkg/exporter/sumologicexporter/README.md -[syslogexporter]: ../pkg/exporter/syslogexporter/README.md +[syslogexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.89.0/exporter/syslogexporter/README.md [user.properties]: https://help.sumologic.com/docs/send-data/installed-collectors/collector-installation-reference/user-properties [proxy]: https://opentelemetry.io/docs/collector/configuration/#proxy-support [common-parameters]: https://help.sumologic.com/docs/send-data/use-json-configure-sources#common-parameters-for-log-source-types diff --git a/docs/upgrading.md b/docs/upgrading.md index 1596e3718c..4132136ed6 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -35,6 +35,43 @@ - [Removing unnecessary metadata using the resourceprocessor](#removing-unnecessary-metadata-using-the-resourceprocessor) - [Moving record-level attributes used for metadata to the resource level](#moving-record-level-attributes-used-for-metadata-to-the-resource-level) +## Upgrading to v0.90.0-sumo-0 + +### Change configuration for `syslogexporter` + +To migrate, rename the following keys in configuration for `syslogexporter`: + +- rename `protocol` property to `network` +- rename `format` property to `protocol` + +For example, given the following configuration: + +```yaml + syslog: + protocol: tcp + port: 514 + endpoint: 127.0.0.1 + format: rfc5424 + tls: + ca_file: ca.pem + cert_file: cert.pem + key_file: key.pem +``` + +change it to: + +```yaml + syslog: + network: tcp + port: 514 + endpoint: 127.0.0.1 + protocol: rfc5424 + tls: + ca_file: ca.pem + cert_file: cert.pem + key_file: key.pem +``` + ## Upgrading to v0.89.0-sumo-0 ### `remoteobserver` processor: renamed to `remotetap` processor diff --git a/otelcolbuilder/.otelcol-builder.yaml b/otelcolbuilder/.otelcol-builder.yaml index 5de0b0c12e..0562fff512 100644 --- a/otelcolbuilder/.otelcol-builder.yaml +++ b/otelcolbuilder/.otelcol-builder.yaml @@ -14,8 +14,6 @@ exporters: # Exporters with non-upstreamed changes: - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/exporter/sumologicexporter v0.0.0-00010101000000-000000000000 path: ./../pkg/exporter/sumologicexporter - - gomod: github.com/SumoLogic/sumologic-otel-collector/pkg/exporter/syslogexporter v0.0.0-00010101000000-000000000000 - path: ./../pkg/exporter/syslogexporter # Upstream exporters: @@ -32,6 +30,7 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.89.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.89.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.89.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.89.0 processors: # Processors with non-upstreamed changes: