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

fix #166 #192

Merged
merged 5 commits into from
Jun 5, 2019
Merged

fix #166 #192

merged 5 commits into from
Jun 5, 2019

Conversation

GordonWang
Copy link
Contributor

No description provided.

@li-wu li-wu self-requested a review May 5, 2019 07:34
li-wu
li-wu previously approved these changes May 5, 2019
@GordonWang
Copy link
Contributor Author

Branch is rebased. PR is updated.

  • make queue size configurable
  • block timer when queue is full

@li-wu li-wu self-requested a review May 14, 2019 06:23

def _output_end(self):
pass
Copy link
Contributor

Choose a reason for hiding this comment

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

what is the purpose of this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this callback hook is added as a exit hook point for output plugin.
This hook is used in the counter output plugin to collect information.
The counter plugin is used for debug and issue triaging scenario.

from outputplugin import OutputPlugin


class CounterOutputPlugin(OutputPlugin):
Copy link
Contributor

Choose a reason for hiding this comment

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

How do we use this good stuff?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if we want to use this dummy counter plugin, we can set outputMode=counter in eventgen conf stanza.
I did not update the readme doc because I think this is only used for debugging purpose. Do we have any place to hold the docs for developers? I can add some content to that place.

Copy link
Contributor

Choose a reason for hiding this comment

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

What's wrong with exposing this option to customers?

CounterOutputPlugin.dataSizeHistogram[day] = CounterOutputPlugin.dataSizeHistogram.get(day, 0) + len(text)
CounterOutputPlugin.eventCountHistogram[day] = CounterOutputPlugin.eventCountHistogram.get(day, 0) + 1

def _output_end(self):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is where the output_end hook is used.

@li-wu li-wu merged commit cba971c into develop Jun 5, 2019
li-wu added a commit that referenced this pull request Jun 5, 2019
* Fix jinja template bug under SA-Eventgen app

* Feature timeMultiple (#141)

* Adjusting interval with timeMultiple

* Update issue templates

add the bug report and feature request issue templates

* changing the stanzas to produce data

* Windbag generator/count + end=0 edge cases (#145)

* Generator handling for count = -1, end = 0 working properly

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* [Docs] update contribute docs (#148)

* [Docs] update contribute docs

* [Docs] update the contribute

* Fix make docs bug and summary anchor link error

* init unittest

* [Build] add ut for timeparser functions

* Add more UT for config module

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* Update docs

* Post-PEP8 Fixes (#157)

* skip sort, gitignore 3rd party libs

* fixed yapf ignore, ran format across repo

* Issue 160 (#163)

* Fixed timer and token

* Added a conditional for end=-1

* Update eventgentimer.py

* Fixed timer and token (#162)

* add extendIndexes feature (#154)

* add extendIndexes feature

* set extendIndexes as a list value

* correct log level

* upate doc, change num to weight

* Test fix (#168)

* Add sample functional test for replay mode

* Add token replacement functional tests

* skip failed case

* Added a timeout

* created a results dir

* Update version.json

* Fix previous pep8 format regression bug (#171)

* Fix merge conflict bug

* Delete tool orca related part (#178)

* add test for jinja template test (#177)

* clean up the logic about sampleDir and jinja_template_dir setting
Add functional test for jinja template generator
Fixes #174
Fixes #167

* revert the change about token, sample mode test cases

* merge the change from develop branch

* merge test conf from develop branch

* use urllib 1.24.2

* format with pep8

* fix bug in template dir resolution

* update test case to address multiline event

* fix a issue that when setup eventgen with 200+ indexers, any exceptions will terminate setup and re-writing default configure files

* Fix bug #179 urlparams is not set (#181)

* fix issue-183

* add modinput ft (#185)

* Issue 159 (#186)

* Fixed timer and token

* Added a conditional for end=-1

* Added timeMultiple logic

* Time Multiple Fix

* Add default pull request reviewers (#190)

* Default to -1 (#189)

* Changed verbose -> verbosity (#191)

* Update README.md (#195)

Like other Splunk products - Splunk Enterprise Security, Splunk Business Workflow ... - Splunk Event Generator does not need a definitive article "The" before the product name.

* update doc for friendly reading and add backward capability section. (#193)

* Update index.md (#194)

Update index.md

* change the sampleDir setting in test cases (#196)

* return status=2 when all tasks finished. (#182)

* return status=2 when all tasks finished.

* Change release verion to 6.3.6 (#200)

* Change release verion to 6.3.6

* Fix flaky tests (#204)

* Fix flaky tests

* Rename modinput to mod_input to avoid functional test fail

* when hit an exception, make sure egx logs it to files

* Fix circleci status badges (#208)

* Clean up and interval error (#211)

* Fix generatorWorks not work issue (#207)

* Fix navigation error with installed with splunk stream (#214)

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* Add 3rd lib in app (#210)

* Add 3rd lib in app

* Bugfix/197 multiprocess not working (#218)

* Fix issue 197 multiprocess not working

* fix issue 219 (#220)

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* Add license credits (#222)

* Feature/multi indexes (#224)

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* add extendIndexes feature

* set extendIndexes as a list value

* upate doc, change num to weight

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* add python code style lint and format

* Add more unit tests for config module

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* fix no len dict out of range

* clean duplicate code

* Revert "Metrics output plugin" (#226)

* [issue 217]disable logging queue in multiprocess mode (#223)

* disable logging queue in multiprocess mode

* Fixed fileName (#229)

* Issue 201 (#221)

* Removing unavailable servers

* Removed nonresponding httpserver

* Added a counter

* fixed a bug

* Added docs and spec

* Addressing unused var

* fixing url reference

* fixed currentreadsize

* Httpevent str formatting

* fix #166 (#192)
li-wu added a commit that referenced this pull request Jun 5, 2019
* Fix jinja template bug under SA-Eventgen app

* Feature timeMultiple (#141)

* Adjusting interval with timeMultiple

* Update issue templates

add the bug report and feature request issue templates

* changing the stanzas to produce data

* Windbag generator/count + end=0 edge cases (#145)

* Generator handling for count = -1, end = 0 working properly

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* [Docs] update contribute docs (#148)

* [Docs] update contribute docs

* [Docs] update the contribute

* Fix make docs bug and summary anchor link error

* init unittest

* [Build] add ut for timeparser functions

* Add more UT for config module

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* Update docs

* Post-PEP8 Fixes (#157)

* skip sort, gitignore 3rd party libs

* fixed yapf ignore, ran format across repo

* Issue 160 (#163)

* Fixed timer and token

* Added a conditional for end=-1

* Update eventgentimer.py

* Fixed timer and token (#162)

* add extendIndexes feature (#154)

* add extendIndexes feature

* set extendIndexes as a list value

* correct log level

* upate doc, change num to weight

* Test fix (#168)

* Add sample functional test for replay mode

* Add token replacement functional tests

* skip failed case

* Added a timeout

* created a results dir

* Update version.json

* Fix previous pep8 format regression bug (#171)

* Fix merge conflict bug

* Delete tool orca related part (#178)

* add test for jinja template test (#177)

* clean up the logic about sampleDir and jinja_template_dir setting
Add functional test for jinja template generator
Fixes #174
Fixes #167

* revert the change about token, sample mode test cases

* merge the change from develop branch

* merge test conf from develop branch

* use urllib 1.24.2

* format with pep8

* fix bug in template dir resolution

* update test case to address multiline event

* fix a issue that when setup eventgen with 200+ indexers, any exceptions will terminate setup and re-writing default configure files

* Fix bug #179 urlparams is not set (#181)

* fix issue-183

* add modinput ft (#185)

* Issue 159 (#186)

* Fixed timer and token

* Added a conditional for end=-1

* Added timeMultiple logic

* Time Multiple Fix

* Add default pull request reviewers (#190)

* Default to -1 (#189)

* Changed verbose -> verbosity (#191)

* Update README.md (#195)

Like other Splunk products - Splunk Enterprise Security, Splunk Business Workflow ... - Splunk Event Generator does not need a definitive article "The" before the product name.

* update doc for friendly reading and add backward capability section. (#193)

* Update index.md (#194)

Update index.md

* change the sampleDir setting in test cases (#196)

* return status=2 when all tasks finished. (#182)

* return status=2 when all tasks finished.

* Change release verion to 6.3.6 (#200)

* Change release verion to 6.3.6

* Fix flaky tests (#204)

* Fix flaky tests

* Rename modinput to mod_input to avoid functional test fail

* when hit an exception, make sure egx logs it to files

* Fix circleci status badges (#208)

* Clean up and interval error (#211)

* Fix generatorWorks not work issue (#207)

* Fix navigation error with installed with splunk stream (#214)

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* Add 3rd lib in app (#210)

* Add 3rd lib in app

* Bugfix/197 multiprocess not working (#218)

* Fix issue 197 multiprocess not working

* fix issue 219 (#220)

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* Add license credits (#222)

* Feature/multi indexes (#224)

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* add extendIndexes feature

* set extendIndexes as a list value

* upate doc, change num to weight

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* add python code style lint and format

* Add more unit tests for config module

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* fix no len dict out of range

* clean duplicate code

* Revert "Metrics output plugin" (#226)

* [issue 217]disable logging queue in multiprocess mode (#223)

* disable logging queue in multiprocess mode

* Fixed fileName (#229)

* Issue 201 (#221)

* Removing unavailable servers

* Removed nonresponding httpserver

* Added a counter

* fixed a bug

* Added docs and spec

* Addressing unused var

* fixing url reference

* fixed currentreadsize

* Httpevent str formatting

* fix #166 (#192)

* Change release version to 6.4.0 and add release notes (#232)
li-wu added a commit that referenced this pull request Jun 5, 2019
* Fix jinja template bug under SA-Eventgen app

* Feature timeMultiple (#141)

* Adjusting interval with timeMultiple

* Update issue templates

add the bug report and feature request issue templates

* changing the stanzas to produce data

* Windbag generator/count + end=0 edge cases (#145)

* Generator handling for count = -1, end = 0 working properly

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* [Docs] update contribute docs (#148)

* [Docs] update contribute docs

* [Docs] update the contribute

* Fix make docs bug and summary anchor link error

* init unittest

* [Build] add ut for timeparser functions

* Add more UT for config module

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* Update docs

* Post-PEP8 Fixes (#157)

* skip sort, gitignore 3rd party libs

* fixed yapf ignore, ran format across repo

* Issue 160 (#163)

* Fixed timer and token

* Added a conditional for end=-1

* Update eventgentimer.py

* Fixed timer and token (#162)

* add extendIndexes feature (#154)

* add extendIndexes feature

* set extendIndexes as a list value

* correct log level

* upate doc, change num to weight

* Test fix (#168)

* Add sample functional test for replay mode

* Add token replacement functional tests

* skip failed case

* Added a timeout

* created a results dir

* Update version.json

* Fix previous pep8 format regression bug (#171)

* Fix merge conflict bug

* Delete tool orca related part (#178)

* add test for jinja template test (#177)

* clean up the logic about sampleDir and jinja_template_dir setting
Add functional test for jinja template generator
Fixes #174
Fixes #167

* revert the change about token, sample mode test cases

* merge the change from develop branch

* merge test conf from develop branch

* use urllib 1.24.2

* format with pep8

* fix bug in template dir resolution

* update test case to address multiline event

* fix a issue that when setup eventgen with 200+ indexers, any exceptions will terminate setup and re-writing default configure files

* Fix bug #179 urlparams is not set (#181)

* fix issue-183

* add modinput ft (#185)

* Issue 159 (#186)

* Fixed timer and token

* Added a conditional for end=-1

* Added timeMultiple logic

* Time Multiple Fix

* Add default pull request reviewers (#190)

* Default to -1 (#189)

* Changed verbose -> verbosity (#191)

* Update README.md (#195)

Like other Splunk products - Splunk Enterprise Security, Splunk Business Workflow ... - Splunk Event Generator does not need a definitive article "The" before the product name.

* update doc for friendly reading and add backward capability section. (#193)

* Update index.md (#194)

Update index.md

* change the sampleDir setting in test cases (#196)

* return status=2 when all tasks finished. (#182)

* return status=2 when all tasks finished.

* Change release verion to 6.3.6 (#200)

* Change release verion to 6.3.6

* Fix flaky tests (#204)

* Fix flaky tests

* Rename modinput to mod_input to avoid functional test fail

* when hit an exception, make sure egx logs it to files

* Fix circleci status badges (#208)

* Clean up and interval error (#211)

* Fix generatorWorks not work issue (#207)

* Fix navigation error with installed with splunk stream (#214)

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* Add 3rd lib in app (#210)

* Add 3rd lib in app

* Bugfix/197 multiprocess not working (#218)

* Fix issue 197 multiprocess not working

* fix issue 219 (#220)

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* add metric_httpevent plugin

* update log content in metric_httpevent

* add doc for metric_httpevent

* define httpevent_core and add fix eventgen-httpeventout log handler

* restore samples file

* restore unit test file

* Add license credits (#222)

* Feature/multi indexes (#224)

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* Bump version

* add python code style lint and format

* Add more unit tests for config module

* Pep8 (#151)

* Format to code standards, addressed linter errors/warnings

* add extendIndexes feature

* set extendIndexes as a list value

* upate doc, change num to weight

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* Fix jinja template bug under SA-Eventgen app

* Update docs (#146)

* Updated docs, added release notes to changelog

* add python code style lint and format

* Add more unit tests for config module

* calculate generate rate and use sequential index replacement

* update dockerfile

* randomize index replacement in each batch

* fix no len dict out of range

* clean duplicate code

* Revert "Metrics output plugin" (#226)

* [issue 217]disable logging queue in multiprocess mode (#223)

* disable logging queue in multiprocess mode

* Fixed fileName (#229)

* Issue 201 (#221)

* Removing unavailable servers

* Removed nonresponding httpserver

* Added a counter

* fixed a bug

* Added docs and spec

* Addressing unused var

* fixing url reference

* fixed currentreadsize

* Httpevent str formatting

* fix #166 (#192)

* Change release version to 6.4.0 and add release notes (#232)

* fix modinput init error (#234)
@li-wu li-wu deleted the bug/backfill-perdayvolume branch July 22, 2019 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants