CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix output name to match directory name for sensu output plugin (#8960) 

Signed-off-by: Todd Campbell <todd@sensu.io>
This commit is contained in:
Todd Campbell 2021-03-09 17:39:57 -05:00 committed by GitHub
parent 60e86a914b
commit ed468f4aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -445,7 +445,7 @@ For documentation on the latest development code see the [documentation index][d
* [prometheus](./plugins/outputs/prometheus_client) * [prometheus](./plugins/outputs/prometheus_client)
* [riemann](./plugins/outputs/riemann) * [riemann](./plugins/outputs/riemann)
* [riemann_legacy](./plugins/outputs/riemann_legacy) * [riemann_legacy](./plugins/outputs/riemann_legacy)
* [sensu-go](./plugins/outputs/sensu) * [sensu](./plugins/outputs/sensu)
* [signalfx](./plugins/outputs/signalfx) * [signalfx](./plugins/outputs/signalfx)
* [socket_writer](./plugins/outputs/socket_writer) * [socket_writer](./plugins/outputs/socket_writer)
* [stackdriver](./plugins/outputs/stackdriver) (Google Cloud Monitoring) * [stackdriver](./plugins/outputs/stackdriver) (Google Cloud Monitoring)

10
etc/telegraf.conf
View File

@ -1328,7 +1328,7 @@
# # Send aggregate metrics to Sensu Monitor # # Send aggregate metrics to Sensu Monitor
# [[outputs.sensu-go]] # [[outputs.sensu]]
# ## BACKEND API URL is the Sensu Backend API root URL to send metrics to # ## BACKEND API URL is the Sensu Backend API root URL to send metrics to
# ## (protocol, host, and port only). The output plugin will automatically # ## (protocol, host, and port only). The output plugin will automatically
# ## append the corresponding backend API path # ## append the corresponding backend API path
@ -1393,7 +1393,7 @@
# ## Check specification # ## Check specification
# ## The check name is the name to give the Sensu check associated with the event # ## The check name is the name to give the Sensu check associated with the event
# ## created. This maps to check.metatadata.name in the event. # ## created. This maps to check.metatadata.name in the event.
# [outputs.sensu-go.check] # [outputs.sensu.check]
# name = "telegraf" # name = "telegraf"
# #
# ## Entity specification # ## Entity specification
@ -1404,17 +1404,17 @@
# ## backend_api_url and entity_name is not set, the value returned by # ## backend_api_url and entity_name is not set, the value returned by
# ## os.Hostname() will be used; if the output plugin is configured to send # ## os.Hostname() will be used; if the output plugin is configured to send
# ## events to an agent_api_url, entity_name and entity_namespace are not used. # ## events to an agent_api_url, entity_name and entity_namespace are not used.
# # [outputs.sensu-go.entity] # # [outputs.sensu.entity]
# # name = "server-01" # # name = "server-01"
# # namespace = "default" # # namespace = "default"
# #
# ## Metrics specification # ## Metrics specification
# ## Configure the tags for the metrics that are sent as part of the Sensu event # ## Configure the tags for the metrics that are sent as part of the Sensu event
# # [outputs.sensu-go.tags] # # [outputs.sensu.tags]
# # source = "telegraf" # # source = "telegraf"
# #
# ## Configure the handler(s) for processing the provided metrics # ## Configure the handler(s) for processing the provided metrics
# # [outputs.sensu-go.metrics] # # [outputs.sensu.metrics]
# # handlers = ["influxdb","elasticsearch"] # # handlers = ["influxdb","elasticsearch"]

10
plugins/outputs/sensu/README.md
View File

@ -6,7 +6,7 @@ HTTP events API.
### Configuration: ### Configuration:
```toml ```toml
[[outputs.sensu-go]] [[outputs.sensu]]
## BACKEND API URL is the Sensu Backend API root URL to send metrics to ## BACKEND API URL is the Sensu Backend API root URL to send metrics to
## (protocol, host, and port only). The output plugin will automatically ## (protocol, host, and port only). The output plugin will automatically
## append the corresponding backend API path ## append the corresponding backend API path
@ -71,7 +71,7 @@ HTTP events API.
## Check specification ## Check specification
## The check name is the name to give the Sensu check associated with the event ## The check name is the name to give the Sensu check associated with the event
## created. This maps to check.metatadata.name in the event. ## created. This maps to check.metatadata.name in the event.
[outputs.sensu-go.check] [outputs.sensu.check]
name = "telegraf" name = "telegraf"
## Entity specification ## Entity specification
@ -82,16 +82,16 @@ HTTP events API.
## backend_api_url and entity_name is not set, the value returned by ## backend_api_url and entity_name is not set, the value returned by
## os.Hostname() will be used; if the output plugin is configured to send ## os.Hostname() will be used; if the output plugin is configured to send
## events to an agent_api_url, entity_name and entity_namespace are not used. ## events to an agent_api_url, entity_name and entity_namespace are not used.
# [outputs.sensu-go.entity] # [outputs.sensu.entity]
# name = "server-01" # name = "server-01"
# namespace = "default" # namespace = "default"
## Metrics specification ## Metrics specification
## Configure the tags for the metrics that are sent as part of the Sensu event ## Configure the tags for the metrics that are sent as part of the Sensu event
# [outputs.sensu-go.tags] # [outputs.sensu.tags]
# source = "telegraf" # source = "telegraf"
## Configure the handler(s) for processing the provided metrics ## Configure the handler(s) for processing the provided metrics
# [outputs.sensu-go.metrics] # [outputs.sensu.metrics]
# handlers = ["influxdb","elasticsearch"] # handlers = ["influxdb","elasticsearch"]
``` ```

10
plugins/outputs/sensu/sensu.go
View File

@ -167,7 +167,7 @@ var sampleConfig = `
## Check specification ## Check specification
## The check name is the name to give the Sensu check associated with the event ## The check name is the name to give the Sensu check associated with the event
## created. This maps to check.metatadata.name in the event. ## created. This maps to check.metatadata.name in the event.
[outputs.sensu-go.check] [outputs.sensu.check]
name = "telegraf" name = "telegraf"
## Entity specification ## Entity specification
@ -178,17 +178,17 @@ var sampleConfig = `
## backend_api_url and entity_name is not set, the value returned by ## backend_api_url and entity_name is not set, the value returned by
## os.Hostname() will be used; if the output plugin is configured to send ## os.Hostname() will be used; if the output plugin is configured to send
## events to an agent_api_url, entity_name and entity_namespace are not used. ## events to an agent_api_url, entity_name and entity_namespace are not used.
# [outputs.sensu-go.entity] # [outputs.sensu.entity]
# name = "server-01" # name = "server-01"
# namespace = "default" # namespace = "default"
## Metrics specification ## Metrics specification
## Configure the tags for the metrics that are sent as part of the Sensu event ## Configure the tags for the metrics that are sent as part of the Sensu event
# [outputs.sensu-go.tags] # [outputs.sensu.tags]
# source = "telegraf" # source = "telegraf"
## Configure the handler(s) for processing the provided metrics ## Configure the handler(s) for processing the provided metrics
# [outputs.sensu-go.metrics] # [outputs.sensu.metrics]
# handlers = ["influxdb","elasticsearch"] # handlers = ["influxdb","elasticsearch"]
` `
@ -401,7 +401,7 @@ func (s *Sensu) Init() error {
} }
func init() { func init() {
outputs.Add("sensu-go", func() telegraf.Output { outputs.Add("sensu", func() telegraf.Output {
// Default configuration values // Default configuration values
// make a string from the defaultUrl const // make a string from the defaultUrl const