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.

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

Add tengine inputs #4160

Merged
merged 15 commits into from
May 23, 2018
Merged

Add tengine inputs #4160

merged 15 commits into from
May 23, 2018

Conversation

huoarter
Copy link
Contributor

@huoarter huoarter commented May 17, 2018

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

.idea/vcs.xml Outdated
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this file

if err != nil {
return err
}
tenginestatus.bytes_in, err = strconv.ParseUint(line_split[1], 10, 64)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to fix this in the nginx plugin, but ensure that the line is split as expected by checking the length first.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I have fixed it

tenginestatus.http_ups_5xx, err = strconv.ParseUint(line_split[29], 10, 64)
if err != nil {
return err
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional: maybe we can use encoding/csv from the standard library for this?

Copy link
Contributor Author

@huoarter huoarter May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fell that is not need to use csv

}

func (n *Tengine) Description() string {
return "Read Nginx's basic status information (ngx_http_stub_status_module)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update for the new plugin


var sampleConfig = `
# An array of Nginx stub_status URI to gather stats.
urls = ["http://localhost/server_status"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use "http://127.0.0.1/us" as the default since it matches the example here and may help confusion with ngx_http_stub_status_module

@huoarter
Copy link
Contributor Author

This is not successful that let me not understand.
Can you help me check it and point it for me to fix it

.gitignore Outdated
@@ -2,3 +2,4 @@
/telegraf
/telegraf.exe
/telegraf.gz
/.idea
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this, but you can put it in your global excludes file. If you don't have one just do something like this:

git config --global core.excludesfile /home/ertaoxu/.gitignore
cat "/.idea" >> /home/ertaoxu/.gitignore

@danielnelson danielnelson added this to the 1.7.0 milestone May 19, 2018
@danielnelson
Copy link
Contributor

@ertaoxu To fix the formatting test failure you just need to run make fmt

@huoarter
Copy link
Contributor Author

Done. Thank you.

@danielnelson danielnelson merged commit 697d8ce into influxdata:master May 23, 2018
danielnelson added a commit that referenced this pull request May 23, 2018
@danielnelson
Copy link
Contributor

@ertaoxu Can you sign the CLA? This is the only thing we need before merging (in the meantime I reverted this PR since I accidentally merged it to soon).

@danielnelson
Copy link
Contributor

@ertaoxu The deadline for 1.7 is end of month, any chance you have been able to review the CLA? Hoping to include this plugin!

@huoarter
Copy link
Contributor Author

huoarter commented Jun 6, 2018

Sorry, a bit late.

@danielnelson
Copy link
Contributor

@ertaoxu I see you signed the CLA, but your github username doesn't quite match. Could you sign it again and make sure to use ertaoxu as your github username. Sorry to be so strict but it will help avoid any confusion in the future.

@huoarter
Copy link
Contributor Author

huoarter commented Jun 7, 2018

@danielnelson I have done what you said and thank you for your patience and help.

@danielnelson danielnelson modified the milestones: 1.7.0, 1.8.0 Jun 7, 2018
danielnelson added a commit that referenced this pull request Jun 7, 2018
@danielnelson
Copy link
Contributor

danielnelson commented Jun 7, 2018

I have added the plugin back to master but we did miss the window for 1.7 so it will need to be included in 1.8. Thanks for the great contribution!

mkboudreau added a commit to mkboudreau/telegraf that referenced this pull request Jun 22, 2018
* master: (329 commits)
  Fix panic with unicode counter names in win_perf_counters  (influxdata#4255)
  Update go-syslog version
  Update changelog
  Update tengine docs
  Restore tengine input plugin (influxdata#4160)
  Fix TLS and SSL config option parsing (influxdata#4247)
  Update changelog
  Use same flags for all bsd family ping varients (influxdata#4241)
  Ignore more boring filesystems from disk plugin (influxdata#4244)
  Update changelog
  Add SSL/TLS support to Redis input (influxdata#4236)
  Don't skip metrics during startup in aggregate phase (influxdata#4230)
  Set 1.6.4 release date
  Update master version to 1.8
  Update sample config
  Add go-syslog to dependencies licenses list
  Update changelog
  Revert "Update aerospike-client-go version to latest release (influxdata#4128)"
  Update changelog
  Fix misnamed option in varnish sample config
  ...
maxunt pushed a commit that referenced this pull request Jun 26, 2018
maxunt pushed a commit that referenced this pull request Jun 26, 2018
maxunt pushed a commit that referenced this pull request Jun 26, 2018
rgitzel pushed a commit to rgitzel/telegraf that referenced this pull request Oct 17, 2018
otherpirate pushed a commit to otherpirate/telegraf that referenced this pull request Mar 15, 2019
otherpirate pushed a commit to otherpirate/telegraf that referenced this pull request Mar 15, 2019
otherpirate pushed a commit to otherpirate/telegraf that referenced this pull request Mar 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants