Skip to content

Commit

Permalink
chore: cleanup go.mod and dependency licences (influxdata#11503)
Browse files Browse the repository at this point in the history
  • Loading branch information
powersj authored Jul 14, 2022
1 parent b0819ba commit 5802df7
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/LICENSE_OF_DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ following works:
- github.com/go-redis/redis [BSD 2-Clause "Simplified" License](https://github.com/go-redis/redis/blob/master/LICENSE)
- github.com/go-sql-driver/mysql [Mozilla Public License 2.0](https://github.com/go-sql-driver/mysql/blob/master/LICENSE)
- github.com/go-stack/stack [MIT License](https://github.com/go-stack/stack/blob/master/LICENSE.md)
- github.com/go-stomp/stomp [Apache License 2.0](https://github.com/go-stomp/stomp/blob/master/LICENSE.txt)
- github.com/gobwas/glob [MIT License](https://github.com/gobwas/glob/blob/master/LICENSE)
- github.com/gofrs/uuid [MIT License](https://github.com/gofrs/uuid/blob/master/LICENSE)
- github.com/gogo/protobuf [BSD 3-Clause Clear License](https://github.com/gogo/protobuf/blob/master/LICENSE)
Expand Down Expand Up @@ -327,7 +328,6 @@ following works:
- sigs.k8s.io/json [Apache License 2.0](https://github.com/kubernetes/client-go/blob/master/LICENSE)
- sigs.k8s.io/structured-merge-diff [Apache License 2.0](https://github.com/kubernetes/client-go/blob/master/LICENSE)
- sigs.k8s.io/yaml [Apache License 2.0](https://github.com/kubernetes/client-go/blob/master/LICENSE)
- github.com/go-stomp/stomp [Apache License 2.0](https://github.com/go-stomp/stomp/blob/master/LICENSE.txt)

## Telegraf used and modified code from these projects

Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ require (
github.com/dimchansky/utfbom v1.1.1
github.com/djherbis/times v1.5.0
github.com/docker/docker v20.10.17+incompatible
github.com/docker/go-connections v0.4.0
github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60
github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0
github.com/eclipse/paho.mqtt.golang v1.3.5
Expand All @@ -62,8 +63,7 @@ require (
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-redis/redis/v8 v8.11.5
github.com/go-sql-driver/mysql v1.6.0
github.com/goburrow/modbus v0.1.0 // indirect
github.com/goburrow/serial v0.1.0 // indirect
github.com/go-stomp/stomp v2.1.4+incompatible
github.com/gobwas/glob v0.2.3
github.com/gofrs/uuid v4.2.0+incompatible
github.com/golang-jwt/jwt/v4 v4.4.2
Expand Down Expand Up @@ -233,7 +233,6 @@ require (
github.com/devigned/tab v0.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
Expand All @@ -251,7 +250,8 @@ require (
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-stomp/stomp v2.1.4+incompatible
github.com/goburrow/modbus v0.1.0 // indirect
github.com/goburrow/serial v0.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect
Expand Down
7 changes: 4 additions & 3 deletions plugins/outputs/stomp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ It also support Amazon MQ <https://aws.amazon.com/amazon-mq/>
## Configuration

```toml @sample.conf
## Host of Active MQ broker
# Configuration for active mq with stomp protocol to send metrics to
[[outputs.stomp]]
host = "localhost:61613"

## Queue name for producer messages
# queueName = "telegraf"
queueName = "telegraf"

## Username and password if required by the Active MQ server.
# username = ""
Expand All @@ -24,5 +25,5 @@ It also support Amazon MQ <https://aws.amazon.com/amazon-mq/>
# tls_key = "/etc/telegraf/key.pem"

## Data format to output.
# data_format = "json"
data_format = "json"
```
12 changes: 6 additions & 6 deletions plugins/outputs/stomp/sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
queueName = "telegraf"

## Username and password if required by the Active MQ server.
username = ""
password = ""
# username = ""
# password = ""

## Optional TLS Config
tls_ca = "/etc/telegraf/ca.pem"
tls_cert = "/etc/telegraf/cert.pem"
tls_key = "/etc/telegraf/key.pem"
# tls_ca = "/etc/telegraf/ca.pem"
# tls_cert = "/etc/telegraf/cert.pem"
# tls_key = "/etc/telegraf/key.pem"

## Data format to output.
data_format = "json"
data_format = "json"

0 comments on commit 5802df7

Please sign in to comment.